Merge remote-tracking branch 'origin/feature_hg_20240716' into feature_hg_20240716

fengliang
2 parents 2cbe13a7 6b590fd2
Showing 10 changed files with 293 additions and 19 deletions
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/basicdata/CategoryRpc.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/api/ProductApi.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/dao/ProductMapper.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/domain/request/ProductListCo.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/domain/request/ProductListStockCo.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/domain/response/ProductCategoryVo.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/domain/response/ProductListVo.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/service/ProductService.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/service/impl/ProductServiceImpl.java
etrade-shop/src/main/resources/com/diligrp/etrade/dao/mapper/ProductMapper.xml
@@ -36,6 +36,15 @@ public interface CategoryRpc {
     Message<CusCategoryDTO> getCusCategory(CusCategoryQuery query);
     /**
+     * 获取类别 getCategoryChildByXtrade
+     *
+     * @param query query
+     * @return {@link Message }<{@link CusCategoryDTO }>
+     */
+    @PostMapping(value = "/api/getCategoryChildByXtrade")
+    Message<List<CusCategoryDTO>> listCategoryChildByXtrade(CusCategoryQuery query);
+
+    /**
      * listCusCategoryData
      *
      * @param categoryId categoryId
@@ -58,4 +67,19 @@ public interface CategoryRpc {
         result.addAll(list);
         return result;
     }
+
+    /**
+     * listCusCategoryData
+     *
+     * @param categoryId categoryId
+     * @param marketId   marketId
+     * @return {@link List}<{@link CusCategoryDTO}>
+     */
+    default List<CusCategoryDTO> listCategoryChildByXtrade(Long categoryId, Long marketId) {
+        CusCategoryQuery query = new CusCategoryQuery();
+        query.setParent(categoryId);
+        query.setMarketId(marketId);
+        List<CusCategoryDTO> list = this.listCusCategory(query).getData();
+        return list;
+    }
 }
 package com.diligrp.etrade.shop.api;
+import com.diligrp.etrade.core.annotation.ParamLogPrint;
 import com.diligrp.etrade.core.domain.Message;
 import com.diligrp.etrade.core.domain.PageMessage;
 import com.diligrp.etrade.core.util.ValidatorUtil;
+import com.diligrp.etrade.rpc.dto.response.CusCategoryDTO;
 import com.diligrp.etrade.shop.domain.request.*;
 import com.diligrp.etrade.shop.domain.response.ProductCategoryVo;
 import com.diligrp.etrade.shop.domain.response.ProductDetailVo;
@@ -59,7 +61,7 @@ public class ProductApi {
      */
     @PostMapping("/saveDispense")
     public Message<Void> saveDispense(@RequestBody @Validated List<ProductDispenseCo> coList) {
-        Assert.notEmpty(coList,"分货数据不能为空");
+        Assert.notEmpty(coList, "分货数据不能为空");
         //手动校验
         ValidatorUtil.validateCollection(coList);
         return productService.saveDispense(coList);
@@ -165,6 +167,17 @@ public class ProductApi {
     }
     /**
+     * 分页查询 - 商品库存列表
+     *
+     * @param co
+     * @return
+     */
+    @PostMapping("/v2/stock/page")
+    public PageMessage<ProductListVo> pageStockV2(@RequestBody @Validated ProductListStockCo co) {
+        return productService.pageStockV2(co);
+    }
+
+    /**
      * 查找二级品类
      *
      * @param shopId
@@ -176,6 +189,18 @@ public class ProductApi {
     }
     /**
+     * 存在商品的子品类
+     *
+     * @param co co
+     * @return
+     */
+    @PostMapping("/category/child")
+    @ParamLogPrint
+    public Message<List<CusCategoryDTO>> listCategoryChild(@RequestBody @Validated ProductListStockCo co) {
+        return productService.listCategoryChild(co);
+    }
+
+    /**
      * 详情
      *
      * @param id
@@ -188,20 +213,22 @@ public class ProductApi {
     /**
      * 获取审核状态
+     *
      * @return
      */
     @PostMapping("/findAuditStates")
-    public Message<List<ProductAuditState>> findAuditStates(){
+    public Message<List<ProductAuditState>> findAuditStates() {
         return Message.success(Arrays.asList(ProductAuditState.values()));
     }
     /**
      * 删除
+     *
      * @param co
      * @return
      */
     @PostMapping("/remove")
-    public Message<Void> remove(@RequestBody @Validated ProductRemovedCo co){
+    public Message<Void> remove(@RequestBody @Validated ProductRemovedCo co) {
         return productService.remove(co);
     }
@@ -218,6 +245,7 @@ public class ProductApi {
     /**
      * 分页查询 - 已删除
+     *
      * @param co
      * @return
      */
@@ -24,6 +24,7 @@ public interface ProductMapper extends MybatisMapperSupport {
     /**
      * 分页查询 - 待审核
+     *
      * @param co
      * @return
      */
@@ -32,6 +33,7 @@ public interface ProductMapper extends MybatisMapperSupport {
     /**
      * 分页查询 - 已审核 (已通过/已拒绝)
+     *
      * @param co
      * @return
      */
@@ -39,6 +41,7 @@ public interface ProductMapper extends MybatisMapperSupport {
     /**
      * 分页查询 - 未通过 (待审核/已拒绝)
+     *
      * @param co
      * @return
      */
@@ -46,6 +49,7 @@ public interface ProductMapper extends MybatisMapperSupport {
     /**
      * 分页查询 - 无预设价格优先
+     *
      * @param co
      * @return
      */
@@ -53,6 +57,7 @@ public interface ProductMapper extends MybatisMapperSupport {
     /**
      * 分页查询 - 在售商品 - 最新上市
+     *
      * @param co
      * @return
      */
@@ -60,6 +65,7 @@ public interface ProductMapper extends MybatisMapperSupport {
     /**
      * 分页查询 - 在售商品 - 月销量
+     *
      * @param co
      * @return
      */
@@ -68,15 +74,25 @@ public interface ProductMapper extends MybatisMapperSupport {
     /**
      * 分页查询 - 商品库存列表 - 按库存排序
+     *
      * @param co
      * @return
      */
     Page<Long> pageIdStock(ProductListStockCo co);
+    /**
+     * 分页查询 - 商品库存列表 - 按商品更新时间排序
+     *
+     * @param co 一氧化碳
+     * @return {@link Page }<{@link Long }>
+     */
+    Page<Long> pageIdStockV2(ProductListStockCo co);
+
     List<ProductListVo> list(List<Long> ids);
     /**
      * 查询 - 已删除
+     *
      * @param ids
      * @return
      */
@@ -85,16 +101,18 @@ public interface ProductMapper extends MybatisMapperSupport {
     /**
      * 获取列表详情 by 店铺主键
-     *
+     * <p>
      * 注:只查询每个店铺前6条数据
+     *
      * @param shopIds
      * @param productName
      * @return
      */
-    List<ProductListVo> listIdAndShopIdByShopIdsAndProductName(@Param("shopIds") List<Long> shopIds,@Nullable @Param("productName") String productName);
+    List<ProductListVo> listIdAndShopIdByShopIdsAndProductName(@Param("shopIds") List<Long> shopIds, @Nullable @Param("productName") String productName);
     /**
      * 详情
+     *
      * @param id
      * @return
      */
@@ -102,44 +120,54 @@ public interface ProductMapper extends MybatisMapperSupport {
     /**
      * 详情 - 已删除
+     *
      * @param id
      * @return
      */
     ProductDetailVo detailRemoved(Long id);
     /**
-     *
-     * @param shopId 店铺主键
+     * @param shopId     店铺主键
      * @param categoryId 品类主键
      * @return
      */
-    Long findId(Long shopId,Long categoryId);
+    Long findId(Long shopId, Long categoryId);
     /**
-     *
-     * @param shopId 店铺主键
+     * @param shopId     店铺主键
      * @param categoryId 品类主键
      * @return
      */
-    List<Long> findIdV1(Long shopId,Long categoryId);
+    List<Long> findIdV1(Long shopId, Long categoryId);
     /**
      * 查找二级品类
+     *
      * @param shopId
      * @return
      */
-     List<ProductCategoryVo> findAllCategoryLevel2ByShopId(Long shopId);
+    List<ProductCategoryVo> findAllCategoryLevel2ByShopId(Long shopId);
+
+    /**
+     * listCategoryChild
+     *
+     * @param co co
+     * @return {@link List }<{@link ProductCategoryVo }>
+     */
+    List<ProductCategoryVo> listCategoryChild(ProductListStockCo co);
     /**
      * 更新版本号
+     *
      * @param entity
      * @return
      */
-     int updateVersion(ProductDo entity);
+    int updateVersion(ProductDo entity);
     /**
      * 品类信息同步
+     *
      * @param co
      * @return
      */
@@ -147,11 +175,12 @@ public interface ProductMapper extends MybatisMapperSupport {
     /**
      * 查找商品主键
+     *
      * @param marketId
      * @param categoryId
      * @return
      */
-    List<Long> listByMarketIdAndCategoryId(Long marketId,Long categoryId);
+    List<Long> listByMarketIdAndCategoryId(Long marketId, Long categoryId);
     /**
      * 获取市场id
@@ -163,8 +192,10 @@ public interface ProductMapper extends MybatisMapperSupport {
     /**
      * 分页查询 - 已删除
+     *
      * @param co
      * @return
      */
     Page<Long> pageIdRemoved(ProductListRemovedCo co);
+
 }
@@ -30,6 +30,11 @@ public class ProductListCo extends BasePageQueryDecorator {
     private Long categoryId;
     /**
+     * 上级品类主键
+     */
+    private Long parentCategoryId;
+
+    /**
      * 商品名称
      */
     private String name;
@@ -39,6 +44,11 @@ public class ProductListCo extends BasePageQueryDecorator {
      */
     private ProductAuditState auditState;
+    /**
+     * 标签code
+     */
+    private Integer labelCode;
+
     public Long getShopId() {
         return shopId;
@@ -87,4 +97,20 @@ public class ProductListCo extends BasePageQueryDecorator {
     public void setShopName(String shopName) {
         this.shopName = shopName;
     }
+
+    public Long getParentCategoryId() {
+        return parentCategoryId;
+    }
+
+    public void setParentCategoryId(Long parentCategoryId) {
+        this.parentCategoryId = parentCategoryId;
+    }
+
+    public Integer getLabelCode() {
+        return labelCode;
+    }
+
+    public void setLabelCode(Integer labelCode) {
+        this.labelCode = labelCode;
+    }
 }
@@ -26,6 +26,11 @@ public class ProductListStockCo extends BasePageQueryDecorator {
     private String shopName;
     /**
+     * 商品名称
+     */
+    private String name;
+
+    /**
      * 品类主键
      */
     private Long categoryId;
@@ -41,6 +46,11 @@ public class ProductListStockCo extends BasePageQueryDecorator {
     private String productName;
     /**
+     * 标签code
+     */
+    private Integer labelCode;
+
+    /**
      * 商品审核状态（0:未通过,1:已通过,2:已拒绝）
      */
     private ProductAuditState auditState;
@@ -114,4 +124,20 @@ public class ProductListStockCo extends BasePageQueryDecorator {
     public void setAuditState(ProductAuditState auditState) {
         this.auditState = auditState;
     }
+
+    public Integer getLabelCode() {
+        return labelCode;
+    }
+
+    public void setLabelCode(Integer labelCode) {
+        this.labelCode = labelCode;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
 }
@@ -17,6 +17,11 @@ public class ProductCategoryVo implements Serializable {
      */
     private String categoryName;
+    /**
+     * 品类主键全路径
+     */
+    private String categoryIdPath;
+
     public Long getCategoryId() {
         return categoryId;
     }
@@ -32,4 +37,12 @@ public class ProductCategoryVo implements Serializable {
     public void setCategoryName(String categoryName) {
         this.categoryName = categoryName;
     }
+
+    public String getCategoryIdPath() {
+        return categoryIdPath;
+    }
+
+    public void setCategoryIdPath(String categoryIdPath) {
+        this.categoryIdPath = categoryIdPath;
+    }
 }
@@ -49,6 +49,11 @@ public class ProductListVo implements Serializable {
     private String alias;
     /**
+     * 自定义商品码
+     */
+    private String articleCode;
+
+    /**
      * 店铺主键
      */
     private Long shopId;
@@ -99,6 +104,11 @@ public class ProductListVo implements Serializable {
      */
     private ProductAuditVo audit;
+    /**
+     * 标签
+     */
+    private List<Integer> label;
+
     public Long getId() {
         return id;
     }
@@ -234,4 +244,20 @@ public class ProductListVo implements Serializable {
     public void setCode(String code) {
         this.code = code;
     }
+
+    public String getArticleCode() {
+        return articleCode;
+    }
+
+    public void setArticleCode(String articleCode) {
+        this.articleCode = articleCode;
+    }
+
+    public List<Integer> getLabel() {
+        return label;
+    }
+
+    public void setLabel(List<Integer> label) {
+        this.label = label;
+    }
 }
@@ -2,6 +2,7 @@ package com.diligrp.etrade.shop.service;
 import com.diligrp.etrade.core.domain.Message;
 import com.diligrp.etrade.core.domain.PageMessage;
+import com.diligrp.etrade.rpc.dto.response.CusCategoryDTO;
 import com.diligrp.etrade.shop.domain.request.*;
 import com.diligrp.etrade.shop.domain.response.ProductCategoryVo;
 import com.diligrp.etrade.shop.domain.response.ProductDetailVo;
@@ -41,6 +42,7 @@ public interface ProductService {
     /**
      * 删除
+     *
      * @param co
      * @return
      */
@@ -49,6 +51,7 @@ public interface ProductService {
     /**
      * 分页查询
+     *
      * @param co
      * @return
      */
@@ -88,7 +91,6 @@ public interface ProductService {
     PageMessage<ProductListVo> pageNonPrePricePriority(ProductListNonAuditStateCo co);
-
     /**
      * 分页查询 - 在售商品 - 最新上市
      *
@@ -123,6 +125,14 @@ public interface ProductService {
     PageMessage<ProductListVo> pageStock(ProductListStockCo co);
     /**
+     * 分页查询 - 商品库存列表v2
+     *
+     * @param co co
+     * @return {@link PageMessage }<{@link ProductListVo }>
+     */
+    PageMessage<ProductListVo> pageStockV2(ProductListStockCo co);
+
+    /**
      * 详情
      *
      * @param id
@@ -146,9 +156,18 @@ public interface ProductService {
      */
     Message<List<ProductCategoryVo>> findAllCategoryLevel2ByShopId(Long shopId);
+    /**
+     * 存在商品的子品类
+     *
+     * @param co co
+     * @return {@link Message }<{@link List }<{@link ProductCategoryVo }>>
+     */
+    Message<List<CusCategoryDTO>> listCategoryChild(ProductListStockCo co);
+
     /**
      * 品类信息同步
+     *
      * @param co
      * @return
      */
@@ -156,6 +175,7 @@ public interface ProductService {
     /**
      * 详情 - 已删除
+     *
      * @param id
      * @return
      */
@@ -4,6 +4,8 @@ import com.diligrp.etrade.core.domain.Message;
 import com.diligrp.etrade.core.domain.PageMessage;
 import com.diligrp.etrade.core.type.YnType;
 import com.diligrp.etrade.core.util.JsonUtils;
+import com.diligrp.etrade.rpc.basicdata.CategoryRpc;
+import com.diligrp.etrade.rpc.dto.response.CusCategoryDTO;
 import com.diligrp.etrade.shared.service.OrderSharedService;
 import com.diligrp.etrade.shop.config.PropertiesConfig;
 import com.diligrp.etrade.shop.dao.ProductMapper;
@@ -56,6 +58,8 @@ public class ProductServiceImpl implements ProductService {
     private OrderSharedService orderSharedService;
     @Resource
     private PropertiesConfig propertiesConfig;
+    @Resource
+    private CategoryRpc categoryRpc;
     private static final Pattern DIGIT_PATTERN = Pattern.compile("^\\d+(,\\d+)*,?$");
@@ -106,7 +110,7 @@ public class ProductServiceImpl implements ProductService {
             productImageService.insertBatch(entity.getImages());
         }
-        productAuditService.reSubmit(entity.getId(), ProductAuditState.AUDITING);
+        productAuditService.reSubmit(entity.getId(), ProductAuditState.PASSED);
         return Message.success();
     }
@@ -370,6 +374,20 @@ public class ProductServiceImpl implements ProductService {
     }
     @Override
+    public PageMessage<ProductListVo> pageStockV2(ProductListStockCo co) {
+        logger.info("商品分页查询 - 商品库存列表V2:{}", co);
+        PageHelper.startPage(ObjectUtils.defaultIfNull(co.getPageNo(), 1),
+                ObjectUtils.defaultIfNull(co.getPageSize(), 10));
+        Page<Long> idPage = mapper.pageIdStockV2(co);
+        if (CollectionUtils.isEmpty(idPage)) {
+            return PageMessage.success(null == idPage ? 0 : idPage.getTotal(), new ArrayList<>());
+        }
+        List<ProductListVo> vos = mapper.list(idPage);
+        vos = sort(idPage, vos);
+        return PageMessage.success(idPage.getTotal(), vos);
+    }
+
+    @Override
     public Message<ProductDetailVo> detail(Long id) {
         logger.info("商品详情:{}", id);
         Assert.notNull(id, "主键不能为空");
@@ -390,6 +408,34 @@ public class ProductServiceImpl implements ProductService {
         return Message.success(mapper.findAllCategoryLevel2ByShopId(shopId));
     }
+    /**
+     * 存在商品的子品类
+     *
+     * @param co co
+     * @return {@link Message }<{@link List }<{@link ProductCategoryVo }>>
+     */
+    @Override
+    public Message<List<CusCategoryDTO>> listCategoryChild(ProductListStockCo co) {
+        // category
+        List<CusCategoryDTO> cusCategoryDTOS = categoryRpc.listCategoryChildByXtrade(co.getParentCategoryId(), co.getMarketId());
+        if (CollectionUtils.isEmpty(cusCategoryDTOS)) {
+            return Message.success(Collections.emptyList());
+        }
+        // category product
+        Set<String> productCategoryIds = mapper.listCategoryChild(co)
+                .stream()
+                .filter(vo -> StringUtils.isNotBlank(vo.getCategoryIdPath()))
+                .flatMap(vo -> Arrays.stream(StringUtils.split(vo.getCategoryIdPath(), ",")))
+                .collect(Collectors.toSet());
+
+        // filter category
+        cusCategoryDTOS = cusCategoryDTOS
+                .stream()
+                .filter(vo -> productCategoryIds.contains(vo.getId().toString()))
+                .collect(Collectors.toList());
+        return Message.success(cusCategoryDTOS);
+    }
+
     @Transactional
     @Override
     public void productCategorySync(ProductCategorySyncCo co) {
@@ -9,6 +9,8 @@
         <result column="p.name" property="name"/>
         <result column="p.name_path" property="namePath"/>
         <result column="p.alias" property="alias"/>
+        <result column="p.article_code" property="articleCode"/>
+        <result column="p.label" property="label" typeHandler="com.diligrp.etrade.core.mybatis.JsonArrayTypeHandler"/>
         <result column="p.source" property="source"/>
         <result column="p.remark" property="remark"/>
         <result column="p.version" property="version"/>
@@ -105,6 +107,12 @@
         <if test="_parameter.containsField('categoryId') and null != categoryId">
             AND p.category_id = #{categoryId}
         </if>
+        <if test="_parameter.containsField('parentCategoryId') and parentCategoryId != null">
+            AND JSON_OVERLAPS(p.category_id_path_json,JSON_ARRAY(#{parentCategoryId}))
+        </if>
+        <if test="_parameter.containsField('labelCode') and labelCode != null">
+            AND JSON_OVERLAPS(p.label,JSON_ARRAY(#{labelCode}))
+        </if>
     </sql>
     <insert id="insert" keyColumn="id" keyProperty="id" useGeneratedKeys="true"
@@ -336,9 +344,6 @@
         LEFT JOIN stock st ON st.product_id = p.id
         WHERE p.deleted = 1
         <include refid="listWhere"/>
-        <if test="null != parentCategoryId">
-            AND JSON_OVERLAPS(p.category_id_path_json,JSON_ARRAY(#{parentCategoryId}))
-        </if>
         <if test="null != auditState">
             AND pa.state = #{auditState}
         </if>
@@ -356,6 +361,20 @@
         </choose>
     </select>
+    <!-- 查询商品主键集合 - 商品库存列表 取状态=待审核+审核通过的，且有库存的商品 -->
+    <select id="pageIdStockV2" resultType="java.lang.Long">
+        SELECT
+        DISTINCT p.id
+        FROM product p
+        INNER JOIN product_audit pa ON pa.product_id = p.id AND pa.deleted = 1
+        INNER JOIN shop s ON s.id = p.shop_Id AND s.state = 1 AND s.market_id = #{marketId}
+        INNER JOIN stock st ON st.product_id = p.id
+        WHERE p.deleted = 1
+        AND pa.state != 2
+        <include refid="listWhere"/>
+        ORDER BY p.modified_time DESC, id DESC
+    </select>
+
     <select id="list" resultMap="listMap">
         SELECT
         p.id AS "p.id"
@@ -407,6 +426,8 @@
         ,p.name AS "p.name"
         ,p.name_path AS "p.name_path"
         ,p.alias AS "p.alias"
+        ,p.article_code AS "p.article_code"
+        ,p.label AS "p.label"
         ,p.source AS "p.source"
         ,p.remark AS "p.remark"
         ,p.version AS "p.version"
@@ -524,6 +545,7 @@
              , p.name_path     AS "p.name_path"
              , p.alias         AS "p.alias"
              , p.article_code  AS "p.article_code"
+             , p.label         AS "p.label"
              , p.source        AS "p.source"
              , p.remark        AS "p.remark"
              , p.version       AS "p.version"
@@ -585,6 +607,18 @@
         ORDER BY categoryName
     </select>
+
+    <select id="listCategoryChild" resultType="com.diligrp.etrade.shop.domain.response.ProductCategoryVo">
+        SELECT
+        DISTINCT p.category_id_path
+        FROM product p
+        INNER JOIN product_audit pa ON pa.product_id = p.id AND pa.deleted = 1
+        INNER JOIN shop s ON s.id = p.shop_Id AND s.state = 1 AND s.market_id = #{marketId}
+        INNER JOIN stock st ON st.product_id = p.id
+        WHERE p.deleted = 1
+        <include refid="listWhere"/>
+    </select>
+
     <update id="updateVersion">
         update product
         SET modifier_id = #{modifierId},