feat 杭果甄选商品

dengwei
1 parent 7e151eff
Showing 16 changed files with 152 additions and 103 deletions
etrade-core/src/main/java/com/diligrp/etrade/core/type/SaleUnitType.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/ShopCartImpl.java
etrade-sentinel/src/main/java/com/diligrp/etrade/sentinel/constant/Constant.java
etrade-shared/src/main/java/com/diligrp/etrade/shared/SharedConfiguration.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/constant/ProductMQConstant.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/dao/ProductPresetMapper.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/domain/request/ProductCo.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/domain/request/ProductPresetCo.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/domain/request/ProductUpdateCo.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/domain/response/ProductDetailVo.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/domain/response/ProductPresetVo.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/model/ProductDo.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/model/ProductPresetDo.java
etrade-shop/src/main/java/com/diligrp/etrade/shop/mq/CategorySyncMqListener.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
 package com.diligrp.etrade.core.type;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 /**
  * 销售单位
+ * 件-、箱-、斤-、袋-、盒-、份-、组-、瓶-、只
  */
-public enum SaleUnitType implements IEnumType {
+public enum SaleUnitType implements IEnumType, EnumArrayValuableEnums {
     CATTY("斤", 0),
-    PIECE("件", 1);
+    PIECE("件", 1),
+    INDIVIDUAL("个", 2),
+    BOX("盒", 3),
+    CHEST("箱", 4),
+    BAG("袋", 5),
+    PART("份", 6),
+    GROUP("组", 7),
+    BOTTLE("瓶", 8),
+    ZHI("只", 9),
+    ;
     private String name;
     private int code;
+    private final static Map<Integer, String> DATA = Stream.of(SaleUnitType.values())
+            .collect(Collectors.toMap(SaleUnitType::getCode, SaleUnitType::getName));
+
     private SaleUnitType(String name, int code) {
         this.name = name;
         this.code = code;
@@ -25,4 +42,15 @@ public enum SaleUnitType implements IEnumType {
     public String getName() {
         return name;
     }
+
+    /**
+     * 自定义序列化
+     *
+     * @return {@link Map}<{@link String}, {@link String}>
+     */
+    @Override
+    public Map<String, String> keyValue() {
+        return DATA.entrySet().stream()
+                .collect(Collectors.toMap(vo -> vo.getKey().toString(), Map.Entry::getValue));
+    }
 }
@@ -100,7 +100,7 @@ public class ShopCartImpl implements IShopCartService {
             Map<Integer, ProductPresetVo> map = new HashMap<>();
             List<ProductPresetVo> presets = productListVo.getPresets();
             for (ProductPresetVo preset : presets) {
-                map.put(preset.getSaleUnit().getCode(), preset);
+                map.put(preset.getSaleUnit(), preset);
             }
             //封装商品预设信息productPresetMap
             productPresetMap.put(productListVo.getId(), map);
@@ -36,32 +36,32 @@ public interface Constant {
     /**
      * PRODUCT_EXPIRY_EXCHANGE
      */
-    String MQ_PRODUCT_EXPIRY_EXCHANGE = "dili.product.expiry.exchange";
+    String MQ_PRODUCT_EXPIRY_EXCHANGE = "dili.product.expiry.exchange.xtrade";
     /**
      * MQ_ORDER_EXCHANGE
      */
-    String MQ_ORDER_EXCHANGE = "dili.order.exchange";
+    String MQ_ORDER_EXCHANGE = "dili.order.exchange.xtrade";
     /**
      * MQ_STOCK_EXCHANGE
      */
-    String MQ_STOCK_EXCHANGE = "dili.stock.exchange";
+    String MQ_STOCK_EXCHANGE = "dili.stock.exchange.xtrade";
     /**
      * MQ_PRODUCT_EXPIRY_EXCHANGE_QUEUE
      */
-    String MQ_PRODUCT_EXPIRY_EXCHANGE_QUEUE = "dili.product.expiry.sentinel.queue";
+    String MQ_PRODUCT_EXPIRY_EXCHANGE_QUEUE = "dili.product.expiry.sentinel.queue.xtrade";
     /**
      * MQ_ORDER_EXCHANGE_QUEUE
      */
-    String MQ_ORDER_EXCHANGE_QUEUE = "dili.order.sentinel.queue";
+    String MQ_ORDER_EXCHANGE_QUEUE = "dili.order.sentinel.queue.xtrade";
     /**
      * MQ_STOCK_EXCHANGE_QUEUE
      */
-    String MQ_STOCK_EXCHANGE_QUEUE = "dili.stock.sentinel.queue";
+    String MQ_STOCK_EXCHANGE_QUEUE = "dili.stock.sentinel.queue.xtrade";
     /**
      * 单价预警信息模版
@@ -14,12 +14,12 @@ public class SharedConfiguration {
     /**
      * MQ_STOCK_EXCHANGE
      */
-    public static final String MQ_STOCK_EXCHANGE = "dili.stock.exchange";
+    public static final String MQ_STOCK_EXCHANGE = "dili.stock.exchange.xtrade";
     /**
      * MQ_ORDER_EXCHANGE
      */
-    public static final String MQ_ORDER_EXCHANGE = "dili.order.exchange";
+    public static final String MQ_ORDER_EXCHANGE = "dili.order.exchange.xtrade";
     /**
      * stockExchange
@@ -4,5 +4,5 @@ public interface ProductMQConstant {
     String EXCHANGE_NAME_CATEGORY = "category.exchange";
-    String QUEUE_NAME_CATEGORY = "category.queue.product";
+    String QUEUE_NAME_CATEGORY = "category.queue.product.xtrade";
 }
@@ -12,7 +12,6 @@ public interface ProductPresetMapper extends MybatisMapperSupport {
     int removeByProductId(ProductPresetDo entity);
     /**
-     * 用于标识是否由页面删除的数据，因为查询已删除列表时关联该表时会有历史删除记录
      * @param entity
      * @return
      */
@@ -59,6 +59,11 @@ public class ProductCo implements Serializable {
     private String articleCode;
     /**
+     * 标签 数据字典ddCode=xtrade_product_label
+     */
+    private List<Integer> label;
+
+    /**
      * 店铺主键
      */
     @NotNull(message = "店铺主键不能为空")
@@ -67,7 +72,7 @@ public class ProductCo implements Serializable {
     /**
      * 备注(最大140个字符)
      */
-    @Length(max = 140,message = "备注最多只能包含140个字符")
+    @Length(max = 140, message = "备注最多只能包含140个字符")
     private String remark;
     /**
@@ -91,6 +96,7 @@ public class ProductCo implements Serializable {
     /**
      * 允许重复
+     *
      * @see YesOrNoState
      */
     private Integer allowRepeat = YesOrNoState.否.getCode();
@@ -221,4 +227,12 @@ public class ProductCo implements Serializable {
     public void setAllowRepeat(Integer allowRepeat) {
         this.allowRepeat = allowRepeat;
     }
+
+    public List<Integer> getLabel() {
+        return label;
+    }
+
+    public void setLabel(List<Integer> label) {
+        this.label = label;
+    }
 }
@@ -2,7 +2,6 @@ package com.diligrp.etrade.shop.domain.request;
 import com.diligrp.etrade.core.jackson.deserializer.MoneyY2FDeserializer;
 import com.diligrp.etrade.core.jackson.deserializer.WeightJ2KDeserializer;
-import com.diligrp.etrade.core.type.SaleUnitType;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import jakarta.validation.constraints.NotNull;
 import org.hibernate.validator.constraints.Range;
@@ -12,31 +11,32 @@ import java.io.Serializable;
 public class ProductPresetCo implements Serializable {
     /**
-     * 销售单位(0-斤,1-件)
+     * 数据字典ddCode=xtrade_product_sale_unit
+     * @see com.diligrp.etrade.core.type.SaleUnitType
      */
     @NotNull(message = "销售单位不能为空")
-    private SaleUnitType saleUnit;
+    private Integer saleUnit;
     /**
      * 预设价格（单位:元）
      */
     @JsonDeserialize(using = MoneyY2FDeserializer.class)
     @NotNull(message = "预设价格")
-    @Range(max = 99999999,message = "预设价格 0 - 999999.99 元")
+    @Range(max = 99999999, message = "预设价格 0 - 999999.99 元")
     private Long prePrice;
     /**
      * 件重(单位:斤)
      */
     @JsonDeserialize(using = WeightJ2KDeserializer.class)
-    @Range(max = 499999995,message = "件重 0 - 999999.99 斤")
+    @Range(max = 499999995, message = "件重 0 - 999999.99 斤")
     private Long pieceWeight;
-    public SaleUnitType getSaleUnit() {
+    public Integer getSaleUnit() {
         return saleUnit;
     }
-    public void setSaleUnit(SaleUnitType saleUnit) {
+    public void setSaleUnit(Integer saleUnit) {
         this.saleUnit = saleUnit;
     }
@@ -52,10 +52,21 @@ public class ProductUpdateCo implements Serializable {
     @Length(max = 15, message = "自定义商品码不能超过{max}")
     private String articleCode;
+    /**
+     * 标签
+     */
+    private List<Integer> label;
+
     @Valid
     @NotEmpty(message = "预设信息不能为空")
     private List<ProductPresetCo> presets;
+    /**
+     * 图片信息
+     */
+    @Valid
+    private List<ProductImageCo> images;
+
     public Long getId() {
         return id;
     }
@@ -119,4 +130,20 @@ public class ProductUpdateCo implements Serializable {
     public void setAlias(String alias) {
         this.alias = alias;
     }
+
+    public List<ProductImageCo> getImages() {
+        return images;
+    }
+
+    public void setImages(List<ProductImageCo> images) {
+        this.images = images;
+    }
+
+    public List<Integer> getLabel() {
+        return label;
+    }
+
+    public void setLabel(List<Integer> label) {
+        this.label = label;
+    }
 }
@@ -55,6 +55,11 @@ public class ProductDetailVo implements Serializable {
     private String articleCode;
     /**
+     * 标签
+     */
+    private List<Integer> label;
+
+    /**
      * 店铺主键
      */
     private Long shopId;
@@ -287,4 +292,12 @@ public class ProductDetailVo implements Serializable {
     public void setArticleCode(String articleCode) {
         this.articleCode = articleCode;
     }
+
+    public List<Integer> getLabel() {
+        return label;
+    }
+
+    public void setLabel(List<Integer> label) {
+        this.label = label;
+    }
 }
@@ -2,7 +2,6 @@ package com.diligrp.etrade.shop.domain.response;
 import com.diligrp.etrade.core.jackson.serializer.MoneyF2YRetain2AndRetainZeroSerializer;
 import com.diligrp.etrade.core.jackson.serializer.WeightK2JRetain2AndRetainZeroSerializer;
-import com.diligrp.etrade.core.type.SaleUnitType;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.io.Serializable;
@@ -20,7 +19,7 @@ public class ProductPresetVo implements Serializable {
     /**
      * 销售单位
      */
-    private SaleUnitType saleUnit;
+    private Integer saleUnit;
     /**
      * 预设价格(单位:元)
@@ -42,14 +41,6 @@ public class ProductPresetVo implements Serializable {
         this.id = id;
     }
-    public SaleUnitType getSaleUnit() {
-        return saleUnit;
-    }
-
-    public void setSaleUnit(SaleUnitType saleUnit) {
-        this.saleUnit = saleUnit;
-    }
-
     public Long getPrePrice() {
         return prePrice;
     }
@@ -65,4 +56,12 @@ public class ProductPresetVo implements Serializable {
     public void setPieceWeight(Long pieceWeight) {
         this.pieceWeight = pieceWeight;
     }
+
+    public Integer getSaleUnit() {
+        return saleUnit;
+    }
+
+    public void setSaleUnit(Integer saleUnit) {
+        this.saleUnit = saleUnit;
+    }
 }
@@ -53,11 +53,16 @@ public class ProductDo extends BaseHasUserDo {
     /**
      * 自定义商品码
-     * 中瑞市场：英文,数字,限制10位,必填;同店铺内商品码不可重复
+     * 英文,数字,限制10位,必填;同店铺内商品码不可重复
      */
     private String articleCode;
     /**
+     * 商品标签 来源：数据字典【ddcode=xtrade_product_label】
+     */
+    private List<Integer> label;
+
+    /**
      * 店铺主键
      */
     private Long shopId;
@@ -248,4 +253,12 @@ public class ProductDo extends BaseHasUserDo {
     public void setAllowRepeat(Integer allowRepeat) {
         this.allowRepeat = allowRepeat;
     }
+
+    public List<Integer> getLabel() {
+        return label;
+    }
+
+    public void setLabel(List<Integer> label) {
+        this.label = label;
+    }
 }
@@ -14,9 +14,11 @@ public class ProductPresetDo extends BaseHasUserDo {
     private Long productId;
     /**
-     * 销售单位
+     * 销售单位 数据字典配置
+     *
+     * @see SaleUnitType
      */
-    private SaleUnitType saleUnit;
+    private Integer saleUnit;
     /**
      * 预设价格
@@ -36,14 +38,6 @@ public class ProductPresetDo extends BaseHasUserDo {
         this.productId = productId;
     }
-    public SaleUnitType getSaleUnit() {
-        return saleUnit;
-    }
-
-    public void setSaleUnit(SaleUnitType saleUnit) {
-        this.saleUnit = saleUnit;
-    }
-
     public Long getPrePrice() {
         return prePrice;
     }
@@ -59,4 +53,12 @@ public class ProductPresetDo extends BaseHasUserDo {
     public void setPieceWeight(Long pieceWeight) {
         this.pieceWeight = pieceWeight;
     }
+
+    public Integer getSaleUnit() {
+        return saleUnit;
+    }
+
+    public void setSaleUnit(Integer saleUnit) {
+        this.saleUnit = saleUnit;
+    }
 }
@@ -45,12 +45,6 @@ public class CategorySyncMqListener {
             if (StringUtils.isNotBlank(data)) {
                 ProductCategorySyncCo co = JsonUtils.fromJsonString(data, ProductCategorySyncCo.class);
                 ValidatorUtil.validate(co);
-                // 2024/6/14 一品多商商品别名不修改
-                Integer allowRepeat = propertiesConfig.getAllowRepeat();
-                log.info("customerUpdateToCreateShop allowRepeat：{}", allowRepeat);
-                if (Objects.equals(allowRepeat, YesOrNoState.是.getCode())) {
-                    co.setAlias(null);
-                }
                 productService.productCategorySync(co);
             }
         } catch (Exception e) {
 package com.diligrp.etrade.shop.service.impl;
-import com.diligrp.etrade.admin.type.YesOrNoState;
 import com.diligrp.etrade.core.domain.Message;
 import com.diligrp.etrade.core.domain.PageMessage;
 import com.diligrp.etrade.core.type.YnType;
@@ -98,28 +97,11 @@ public class ProductServiceImpl implements ProductService {
             productPresetService.insertBatch(entity.getPresets());
         }
-        /*
-         * 初始化信息审核信息
-         * 2023/11/7 审核逻辑变更
-         *  商品对应品类在对应预设价格内 OR 备注不为空才需要审核
-         */
-        productAuditService.audit(entity);
-        // productAuditService.reSubmit(entity.getId(), ProductAuditState.AUDITING);
+        productAuditService.reSubmit(entity.getId(), ProductAuditState.AUDITING);
         return Message.success();
     }
     private int insert(ProductDo entity) {
-        // 2024/6/14 是否允许一品多商
-        if (!Objects.equals(propertiesConfig.getAllowRepeat(), YesOrNoState.是.getCode())) {
-            // 2024/6/14 后台一套逻辑 可能存在测试环境下 建了一品多商数据 再切换一品一商
-            // Long id = mapper.findId(entity.getShopId(), entity.getCategoryId());
-            List<Long> ids = mapper.findIdV1(entity.getShopId(), entity.getCategoryId());
-            if (CollectionUtils.isNotEmpty(ids)) {
-                logger.warn("商品已存在:{}", entity);
-                throw new ProductException(String.format("商品已存在:%s", entity.getAlias()));
-            }
-        }
-
         if (StringUtils.isNotBlank(entity.getCategoryIdPath())) {
             //去掉空格
             entity.setCategoryIdPath(entity.getCategoryIdPath().replaceAll(" ", ""));
@@ -139,10 +121,8 @@ public class ProductServiceImpl implements ProductService {
         int ans = mapper.insert(entity);
         if (ans > 0) {
-            // 2023/11/7 审核逻辑变更
-            ProductAuditState productAuditState = ProductSourceType.DISPENSE.equals(entity.getSource()) ?
-                    ProductAuditState.PASSED :
-                    productAuditService.getAuditState(entity);
+            // 2024/7/17 杭果商品默认不审核
+            ProductAuditState productAuditState = ProductAuditState.PASSED;
             productAuditService.init(entity.getId(), productAuditState);
             if (CollectionUtils.isNotEmpty(entity.getImages())) {
@@ -410,35 +390,8 @@ public class ProductServiceImpl implements ProductService {
          *  注意:品类的基础信息是一致的，但是对应不同市场其图片是不一样的
          */
         //同步信息
+        co.setAlias(null);
         mapper.productCategorySync(co);
-
-        //同步图片
-        //1.删除图片
-        productImageService.removeByMarketIdAndCategoryId(co.getMarketId(), co.getCategoryId());
-        if (StringUtils.isNotBlank(co.getUrl())) {
-            //2.查找商品
-            List<Long> productIds = mapper.listByMarketIdAndCategoryId(co.getMarketId(), co.getCategoryId());
-            if (!productIds.isEmpty()) {
-                //3.新增图片,分批次新增，保证数据量过大情况下sql过长导致的错误
-                long mod = 200;
-                long n = (productIds.size() / mod) + (productIds.size() % mod == 0 ? 0 : 1);
-                long k = 0;
-                while (k < n) {
-                    List<ProductImageDo> images = productIds.stream()
-                            .skip(k++ * mod)
-                            .limit(mod)
-                            .map(e -> {
-                                ProductImageDo image = new ProductImageDo();
-                                image.setProductId(e);
-                                image.setUrl(co.getUrl());
-                                return image;
-                            }).collect(Collectors.toList());
-                    productImageService.insertBatch(images);
-                }
-
-
-            }
-        }
     }
     @Override
@@ -52,6 +52,7 @@
         <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"/>
@@ -119,6 +120,7 @@
                             name_path_json,
                             alias,
                             article_code,
+                            label,
                             shop_id,
                             source,
                             remark,
@@ -135,6 +137,7 @@
                 #{namePathJson,typeHandler=com.diligrp.etrade.core.mybatis.JsonArrayTypeHandler},
                 #{alias},
                 #{articleCode},
+                #{label,typeHandler=com.diligrp.etrade.core.mybatis.JsonArrayTypeHandler},
                 #{shopId},
                 #{source},
                 #{remark},
@@ -150,6 +153,9 @@
         <if test="articleCode != null and articleCode != ''">
             article_code = #{articleCode},
         </if>
+        <if test="label !=null and label.size() > 0">
+            label = #{label,typeHandler=com.diligrp.etrade.core.mybatis.JsonArrayTypeHandler},
+        </if>
         remark = #{remark},
         operater_id = #{operaterId},
         operater_name = #{operaterName},
@@ -379,7 +385,7 @@
         ,s.id AS "s.id"
         ,s.name AS "s.name"
         ,s.customer_id AS "s.customer_id"
-        ,st.stock * 500 AS "st.stock"
+        ,st.stock AS "st.stock"
         FROM product p
         LEFT JOIN product_preset pp ON pp.product_id = p.id AND pp.deleted = 1
         LEFT JOIN product_image pi ON pi.product_id = p.id AND pi.deleted = 1
@@ -422,7 +428,7 @@
         ,s.id AS "s.id"
         ,s.name AS "s.name"
         ,s.customer_id AS "s.customer_id"
-        ,st.stock * 500 AS "st.stock"
+        ,st.stock AS "st.stock"
         FROM product p
         LEFT JOIN product_preset pp ON pp.product_id = p.id AND pp.deleted = 0 AND pp.page_deleted = 1
         LEFT JOIN product_image pi ON pi.product_id = p.id AND pi.deleted = 0 AND pi.page_deleted = 1
@@ -473,6 +479,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"
@@ -496,7 +503,7 @@
              , s.id            AS "s.id"
              , s.name          AS "s.name"
              , s.customer_id   AS "s.customer_id"
-             , st.stock * 500  AS "st.stock"
+             , st.stock        AS "st.stock"
         FROM product p
                  LEFT JOIN product_preset pp ON pp.product_id = p.id AND pp.deleted = 1
                  LEFT JOIN product_image pi ON pi.product_id = p.id AND pi.deleted = 1
@@ -540,7 +547,7 @@
              , s.id            AS "s.id"
              , s.name          AS "s.name"
              , s.customer_id   AS "s.customer_id"
-             , st.stock * 500  AS "st.stock"
+             , st.stock        AS "st.stock"
         FROM product p
                  LEFT JOIN product_preset pp ON pp.product_id = p.id AND pp.deleted = 0 AND pp.page_deleted = 1
                  LEFT JOIN product_image pi ON pi.product_id = p.id AND pi.deleted = 0 AND pi.page_deleted = 1