feat zr init

dengwei
1 parent c8a146df
Showing 18 changed files with 161 additions and 88 deletions
etrade-boss/build.gradle
etrade-ecap/lib/ECAP_3.0_20240708135028.jar
etrade-ecap/lib/lop-opensdk-support-1.0.28-SNAPSHOT.jar
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-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/ProductListVo.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/service/impl/ProductServiceImpl.java
etrade-shop/src/main/resources/com/diligrp/etrade/dao/mapper/ProductMapper.xml
settings.gradle
 group = 'com.diligrp'
-archivesBaseName = 'etrade-boss'
+archivesBaseName = 'zr-etrade'
 jar.enabled = false
 bootJar {
     enabled = true
-    archiveBaseName = 'etrade-boss'
+    archiveBaseName = 'zr-etrade'
 }
 dependencies {
@@ -100,7 +100,8 @@ 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);
+                // TODO: 2024/8/29 只有code
+                map.put(preset.getSaleUnit(), preset);
             }
             //封装商品预设信息productPresetMap
             productPresetMap.put(productListVo.getId(), map);
@@ -203,10 +204,10 @@ public class ShopCartImpl implements IShopCartService {
         ShopCart shopCartQuery = shopCarts.get(0);
         shopCart.setVersion(shopCartQuery.getVersion());
         shopCart.setId(shopCartQuery.getId());
-        if (shopCartDto.getBo()){
+        if (shopCartDto.getBo()) {
             int i = shopCartMapper.updateByPrimaryKeySelectiveCache(shopCart);
             Assert.isTrue(i > 0, "购物车更新失败");
-        }else {
+        } else {
             int i = shopCartMapper.updateByPrimaryKeySelective(shopCart);
             Assert.isTrue(i > 0, "购物车更新失败");
         }
@@ -226,7 +227,7 @@ public class ShopCartImpl implements IShopCartService {
         }
         //存在相同商品信息，对商品信息进行更新操作
         ShopCartMessage shopCartMessageOld = shopCartMessages.get(0);
-        shopCartMessageService.updateByOld(shopCartMessageOld, shopCartDto.getShopCartMessageDto(),shopCartDto.getBo());
+        shopCartMessageService.updateByOld(shopCartMessageOld, shopCartDto.getShopCartMessageDto(), shopCartDto.getBo());
     }
@@ -235,7 +236,7 @@ public class ShopCartImpl implements IShopCartService {
     public void updateShopcartList(List<ShopCartCacheDto> shopCartCacheDtoList) {
         shopCartCacheDtoList.forEach(shopCartCacheDto -> {
             List<ShopCartMessageDto> shopCartMessageDtos = shopCartCacheDto.getShopCartMessageDtos();
-            if (!CollectionUtils.isEmpty(shopCartMessageDtos)){
+            if (!CollectionUtils.isEmpty(shopCartMessageDtos)) {
                 List<ShopCartDto> shopCartDtos = shopCartMessageDtos.stream().map(shopCartMessageDto -> {
                     ShopCartDto shopCartDto = new ShopCartDto();
                     BeanUtils.copyProperties(shopCartCacheDto, shopCartDto);
@@ -300,7 +301,7 @@ public class ShopCartImpl implements IShopCartService {
 //            int i = shopCartMapper.deleteByPrimaryKey(shopCartId);
 //            Assert.isTrue(i > 0, "删除购物车信息失败");
 //        }
-        AssertUtils.isTrue(shopCartDto!=null, "参数异常，请刷新后重试");
+        AssertUtils.isTrue(shopCartDto != null, "参数异常，请刷新后重试");
         AssertUtils.isTrue(!CollectionUtils.isEmpty(shopCartDto.getIds()), "请传需要删除的购物车商品");
         List<Long> list = shopCartMessageService.findCartIdByMessageIds(shopCartDto);
         AssertUtils.isTrue(!CollectionUtils.isEmpty(list), "商品已被删除，请刷新");
@@ -36,32 +36,32 @@ public interface Constant {
     /**
      * PRODUCT_EXPIRY_EXCHANGE
      */
-    String MQ_PRODUCT_EXPIRY_EXCHANGE = "dili.product.expiry.exchange";
+    String MQ_PRODUCT_EXPIRY_EXCHANGE = "zr.product.expiry.exchange";
     /**
      * MQ_ORDER_EXCHANGE
      */
-    String MQ_ORDER_EXCHANGE = "dili.order.exchange";
+    String MQ_ORDER_EXCHANGE = "zr.order.exchange";
     /**
      * MQ_STOCK_EXCHANGE
      */
-    String MQ_STOCK_EXCHANGE = "dili.stock.exchange";
+    String MQ_STOCK_EXCHANGE = "zr.stock.exchange";
     /**
      * MQ_PRODUCT_EXPIRY_EXCHANGE_QUEUE
      */
-    String MQ_PRODUCT_EXPIRY_EXCHANGE_QUEUE = "dili.product.expiry.sentinel.queue";
+    String MQ_PRODUCT_EXPIRY_EXCHANGE_QUEUE = "zr.product.expiry.sentinel.queue";
     /**
      * MQ_ORDER_EXCHANGE_QUEUE
      */
-    String MQ_ORDER_EXCHANGE_QUEUE = "dili.order.sentinel.queue";
+    String MQ_ORDER_EXCHANGE_QUEUE = "zr.order.sentinel.queue";
     /**
      * MQ_STOCK_EXCHANGE_QUEUE
      */
-    String MQ_STOCK_EXCHANGE_QUEUE = "dili.stock.sentinel.queue";
+    String MQ_STOCK_EXCHANGE_QUEUE = "zr.stock.sentinel.queue";
     /**
      * 单价预警信息模版
@@ -4,5 +4,5 @@ public interface ProductMQConstant {
     String EXCHANGE_NAME_CATEGORY = "category.exchange";
-    String QUEUE_NAME_CATEGORY = "category.queue.product";
+    String QUEUE_NAME_CATEGORY = "zr.category.queue.product";
 }
@@ -12,7 +12,6 @@ public interface ProductPresetMapper extends MybatisMapperSupport {
     int removeByProductId(ProductPresetDo entity);
     /**
-     * 用于标识是否由页面删除的数据，因为查询已删除列表时关联该表时会有历史删除记录
      * @param entity
      * @return
      */
@@ -59,6 +59,12 @@ public class ProductCo implements Serializable {
     private String articleCode;
     /**
+     * 商品条码
+     */
+    @Length(max = 25, message = "商品条码长度不能超过{max}")
+    private String barCode;
+
+    /**
      * 店铺主键
      */
     @NotNull(message = "店铺主键不能为空")
@@ -67,7 +73,7 @@ public class ProductCo implements Serializable {
     /**
      * 备注(最大140个字符)
      */
-    @Length(max = 140,message = "备注最多只能包含140个字符")
+    @Length(max = 140, message = "备注最多只能包含140个字符")
     private String remark;
     /**
@@ -91,6 +97,7 @@ public class ProductCo implements Serializable {
     /**
      * 允许重复
+     *
      * @see YesOrNoState
      */
     private Integer allowRepeat = YesOrNoState.否.getCode();
@@ -221,4 +228,12 @@ public class ProductCo implements Serializable {
     public void setAllowRepeat(Integer allowRepeat) {
         this.allowRepeat = allowRepeat;
     }
+
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
 }
@@ -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;
@@ -15,28 +14,28 @@ public class ProductPresetCo implements Serializable {
      * 销售单位(0-斤,1-件)
      */
     @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,6 +52,12 @@ public class ProductUpdateCo implements Serializable {
     @Length(max = 15, message = "自定义商品码不能超过{max}")
     private String articleCode;
+    /**
+     * 商品条码
+     */
+    @Length(max = 25, message = "商品条码长度不能超过{max}")
+    private String barCode;
+
     @Valid
     @NotEmpty(message = "预设信息不能为空")
     private List<ProductPresetCo> presets;
@@ -133,4 +139,12 @@ public class ProductUpdateCo implements Serializable {
     public void setImages(List<ProductImageCo> images) {
         this.images = images;
     }
+
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
 }
@@ -55,6 +55,11 @@ public class ProductDetailVo implements Serializable {
     private String articleCode;
     /**
+     * 条形码
+     */
+    private String barCode;
+
+    /**
      * 店铺主键
      */
     private Long shopId;
@@ -287,4 +292,12 @@ public class ProductDetailVo implements Serializable {
     public void setArticleCode(String articleCode) {
         this.articleCode = articleCode;
     }
+
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
 }
@@ -49,6 +49,16 @@ public class ProductListVo implements Serializable {
     private String alias;
     /**
+     * 自定义商品码
+     */
+    private String articleCode;
+
+    /**
+     * 条形码
+     */
+    private String barCode;
+
+    /**
      * 店铺主键
      */
     private Long shopId;
@@ -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 String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
 }
@@ -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;
+    }
 }
@@ -58,6 +58,11 @@ public class ProductDo extends BaseHasUserDo {
     private String articleCode;
     /**
+     * 商品条码
+     */
+    private String barCode;
+
+    /**
      * 店铺主键
      */
     private Long shopId;
@@ -248,4 +253,12 @@ public class ProductDo extends BaseHasUserDo {
     public void setAllowRepeat(Integer allowRepeat) {
         this.allowRepeat = allowRepeat;
     }
+
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
 }
@@ -14,9 +14,11 @@ public class ProductPresetDo extends BaseHasUserDo {
     private Long productId;
     /**
-     * 销售单位
+     * 销售单位 数据字典配置ddCode=zrtrade_product_sale_unit
+     *
+     * @see SaleUnitType
      */
-    private SaleUnitType saleUnit;
+    private Integer saleUnit;
     /**
      * 预设价格
@@ -36,11 +38,11 @@ public class ProductPresetDo extends BaseHasUserDo {
         this.productId = productId;
     }
-    public SaleUnitType getSaleUnit() {
+    public Integer getSaleUnit() {
         return saleUnit;
     }
-    public void setSaleUnit(SaleUnitType saleUnit) {
+    public void setSaleUnit(Integer saleUnit) {
         this.saleUnit = saleUnit;
     }
@@ -99,14 +99,12 @@ public class ProductServiceImpl implements ProductService {
         }
         // 2024/7/11 自定义商品图片 先删除后新增
-        if (Objects.equals(propertiesConfig.getAllowRepeat(), YesOrNoState.是.getCode())) {
-            productImageService.removeByProductId(entity.getId());
-            if (CollectionUtils.isNotEmpty(entity.getImages())) {
-                for (ProductImageDo image : entity.getImages()) {
-                    image.setProductId(entity.getId());
-                }
-                productImageService.insertBatch(entity.getImages());
+        productImageService.removeByProductId(entity.getId());
+        if (CollectionUtils.isNotEmpty(entity.getImages())) {
+            for (ProductImageDo image : entity.getImages()) {
+                image.setProductId(entity.getId());
             }
+            productImageService.insertBatch(entity.getImages());
         }
         /*
@@ -120,17 +118,6 @@ public class ProductServiceImpl implements ProductService {
     }
     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(" ", ""));
@@ -424,43 +411,36 @@ public class ProductServiceImpl implements ProductService {
         // 2024/6/14 一品多商商品别名不修改
         Integer allowRepeat = propertiesConfig.getAllowRepeat();
         logger.info("customerUpdateToCreateShop allowRepeat：{}", allowRepeat);
-        if (Objects.equals(allowRepeat, YesOrNoState.是.getCode())) {
-            co.setAlias(null);
-        }
+        co.setAlias(null);
         mapper.productCategorySync(co);
-        // 2024/7/11   一品多商商品图片不同步 保留自定义图片
-        if (Objects.equals(allowRepeat, YesOrNoState.是.getCode())) {
-            return;
-        }
+        // 2024/8/29 中瑞取消商品照片更新
         //同步图片
         //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);
-                }
-
-
-            }
-        }
+//        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
@@ -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.bar_code" property="barCode"/>
         <result column="p.source" property="source"/>
         <result column="p.remark" property="remark"/>
         <result column="p.version" property="version"/>
@@ -52,6 +54,7 @@
         <result column="p.name_path" property="namePath"/>
         <result column="p.alias" property="alias"/>
         <result column="p.article_code" property="articleCode"/>
+        <result column="p.bar_code" property="barCode"/>
         <result column="p.source" property="source"/>
         <result column="p.remark" property="remark"/>
         <result column="p.version" property="version"/>
@@ -119,6 +122,7 @@
                             name_path_json,
                             alias,
                             article_code,
+                            bar_code,
                             shop_id,
                             source,
                             remark,
@@ -135,6 +139,7 @@
                 #{namePathJson,typeHandler=com.diligrp.etrade.core.mybatis.JsonArrayTypeHandler},
                 #{alias},
                 #{articleCode},
+                #{barCode},
                 #{shopId},
                 #{source},
                 #{remark},
@@ -150,6 +155,9 @@
         <if test="articleCode != null and articleCode != ''">
             article_code = #{articleCode},
         </if>
+        <if test="barCode != null">
+            bar_code = #{barCode},
+        </if>
         remark = #{remark},
         operater_id = #{operaterId},
         operater_name = #{operaterName},
@@ -358,6 +366,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.bar_code AS "p.bar_code"
         ,p.source AS "p.source"
         ,p.remark AS "p.remark"
         ,p.version AS "p.version"
@@ -473,6 +483,7 @@
              , p.name_path     AS "p.name_path"
              , p.alias         AS "p.alias"
              , p.article_code  AS "p.article_code"
+             , p.bar_code      AS "p.bar_code"
              , p.source        AS "p.source"
              , p.remark        AS "p.remark"
              , p.version       AS "p.version"
@@ -517,6 +528,7 @@
              , p.name_path     AS "p.name_path"
              , p.alias         AS "p.alias"
              , p.article_code  AS "p.article_code"
+             , p.bar_code      AS "p.bar_code"
              , p.source        AS "p.source"
              , p.remark        AS "p.remark"
              , p.version       AS "p.version"
-rootProject.name = 'dili-etrade'
+rootProject.name = 'zr-etrade'
 include 'etrade-core'
 include 'etrade-rpc'
 include 'etrade-shared'