完善代码

src/main/java/zs/payment/entity/mysql/ImsEweiShopGoods.java

@@ -51,7 +51,7 @@ public class ImsEweiShopGoods {
     private String goodssn;
     // 商品条码
     private String productsn;
-    // 商品原价
+    // 商品原价，价格要高，因为要打折
     private BigDecimal productprice;
     // 普通商品现价/拍卖保证金
     private BigDecimal marketprice;
@@ -178,7 +178,7 @@ public class ImsEweiShopGoods {
     // 短名称 打印需要
     private String shorttitle;
     // 虚拟商品模板ID 0 多规格虚拟商品
-    @TableField("virtual")
+    @TableField("`virtual`")
     private Integer virtualVar;
     // 一级多重分类
     private String ccates;

src/main/java/zs/payment/entity/mysql/ImsEweiShopGoodsOption.java

@@ -111,10 +111,10 @@ public class ImsEweiShopGoodsOption {
     //天数
     private Integer day;
 
-    //全返总价
+    //全返总价 必填
     private BigDecimal allfullbackprice;
 
-    //全返价
+    //全返价 必填
     private BigDecimal fullbackprice;
 
     //全返总比例

src/main/java/zs/payment/entity/mysql/ImsEweiShopGoodsSpecItem.java

@@ -1,6 +1,7 @@
 package zs.payment.entity.mysql;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Getter;
@@ -44,12 +45,14 @@ public class ImsEweiShopGoodsSpecItem {
     //缩略图
     private String thumb;
     //是否显示，默认1
-    private Integer show;
+    @TableField("`show`")
+    private Integer showVar;
     //排序 ，默认0
     private Integer displayorder;
     private String valueId;
     //是否虚拟
-    private Integer virtual;
+    @TableField("`virtual`")
+    private Integer virtualVar;
     private String cycelbuy_periodic;
     // 云商城id
     private Integer yunspecitemid;

src/main/java/zs/payment/messages/KafkaConsumer.java

@@ -10,6 +10,7 @@ import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.stereotype.Component;
 
+import org.springframework.transaction.annotation.Transactional;
 import zs.payment.dto.OrderDetailDTO;
 import zs.payment.dto.SkuDTO;
 import zs.payment.entity.mysql.*;
@@ -91,6 +92,7 @@ public class KafkaConsumer {
         topics = "goods.alter",
         groupId = "pay2-group"
     )
+    @Transactional(rollbackFor =  Exception.class)
     public void goodsAlter(String messsage) {
 
         log.info("---准备开始商品入库---");
@@ -124,38 +126,40 @@ public class KafkaConsumer {
                     Long tcate=0L;
 
                     //未同步，则判断商品分类
-                    ImsEweiShopCategory category1 = imsEweiShopCategoryService.selectByName(dto.getCategory_1().getName(), dto.getCategory_1().getLevel(),0L);
+                    ImsEweiShopCategory category1 = imsEweiShopCategoryService.selectByName(dto.getCategory_1().getName(), dto.getCategory_1().getLevel(),0L,uniacid);
                     if (!Optional.ofNullable(category1).isPresent()){
                         //创建新的商品分类
                         category1=new ImsEweiShopCategory();
                         category1.setLevel(1);
                         category1.setName(dto.getCategory_1().getName());
+                        category1.setParentId(0);
                         imsEweiShopCategoryService.save(category1);
                     }
                     pcate=category1.getId();
                     // 存在，再查询商品分类第二级
-                    ImsEweiShopCategory category2 = imsEweiShopCategoryService.selectByName(dto.getCategory_2().getName(), dto.getCategory_2().getLevel(),pcate);
+                    ImsEweiShopCategory category2 = imsEweiShopCategoryService.selectByName(dto.getCategory_2().getName(), dto.getCategory_2().getLevel(),pcate,uniacid);
                     if (!Optional.ofNullable(category2).isPresent()){
                         category2=new ImsEweiShopCategory();
                         category2.setLevel(2);
                         category2.setName(dto.getCategory_2().getName());
+                        category2.setParentId(pcate.intValue());
                         imsEweiShopCategoryService.save(category2);
                     }
                     ccate=category2.getId();
 
                     // 再查询商品分类第三级
-                    ImsEweiShopCategory category3 = imsEweiShopCategoryService.selectByName(dto.getCategory_3().getName(), dto.getCategory_3().getLevel(),ccate);
+                    ImsEweiShopCategory category3 = imsEweiShopCategoryService.selectByName(dto.getCategory_3().getName(), dto.getCategory_3().getLevel(),ccate,uniacid);
                     if (!Optional.ofNullable(category3).isPresent()){
                         category3 = new ImsEweiShopCategory();
                         category3.setLevel(3);
                         category3.setName(dto.getCategory_3().getName());
+                        category3.setParentId(ccate.intValue());
                         imsEweiShopCategoryService.save(category3);
                     }
                     tcate=category3.getId();
 
 
                     //todo 创建商品
-
                     ImsEweiShopGoods goods=new  ImsEweiShopGoods();
                     goods.setPcate(pcate);
                     goods.setCcate(ccate);
@@ -175,6 +179,7 @@ public class KafkaConsumer {
                     goods.setMarketprice(new BigDecimal(dto.getMarket_price()/100));
                     goods.setCostprice(new BigDecimal(0));
                     goods.setCost_of_price(new BigDecimal(dto.getCost_price()/100));
+                    goods.setOriginalprice(new BigDecimal(dto.getOrigin_price()/100));
 
                     goods.setTotal(dto.getStock());
                     // 0 拍下减库存 1 付款减库存 2 永久不减
@@ -197,7 +202,7 @@ public class KafkaConsumer {
                     //多商户id
                     goods.setMerchid(0);
                     // merchid==0?0:1
-                    goods.setMerchsale(1);
+                    goods.setMerchsale(0);
 //                    goods.setShorttitle();
                     //商品编号
                     goods.setGoodssn(dto.getSn());
@@ -225,14 +230,14 @@ public class KafkaConsumer {
                     for (int i = 0; i < dto.getSkus().size(); i++) {
                         SkuDTO sku = dto.getSkus().get(i);
                         ImsEweiShopGoodsSpecItem goodsSpecItem = new ImsEweiShopGoodsSpecItem();
-                        goodsSpecItem.setShow(1);
+                        goodsSpecItem.setShowVar(1);
                         goodsSpecItem.setUniacid(uniacid);
                         goodsSpecItem.setSpecid(goodsSpec.getId().intValue());
                         goodsSpecItem.setTitle(sku.getTitle());
                         goodsSpecItem.setDisplayorder(i);
 
                         //创建规格项目
-                        imsEweiShopGoodsSpecItemService.save(goodsSpecItem);
+                        boolean b4 = imsEweiShopGoodsSpecItemService.save(goodsSpecItem);
 
                         //创建规格项目的价格
                         ImsEweiShopGoodsOption goodsOption=new  ImsEweiShopGoodsOption();
@@ -240,23 +245,33 @@ public class KafkaConsumer {
                         goodsOption.setUniacid(uniacid);
                         goodsOption.setGoodsid(goods.getId().intValue());
                         goodsOption.setSpecs(goodsSpecItem.getId().toString());
-                        //原价
-                        goodsOption.setProductprice(new BigDecimal(sku.getOrigin_price()/100));
-                        //指导价
+                        //原价，可用于打折，最大价格
+                        goodsOption.setProductprice(new BigDecimal(sku.getGuide_price()/100));
+                        //现价 不能大于原价
                         goodsOption.setMarketprice(new BigDecimal(sku.getGuide_price()/100));
                         //成本价
                         goodsOption.setCostprice(new BigDecimal(sku.getCost_price()/100));
+                        //预售价 = 售价
+                        goodsOption.setPresellprice(new BigDecimal(sku.getPrice()/100));
+
                         goodsOption.setStock(sku.getStock());
                         goodsOption.setWeight(new BigDecimal(sku.getWeight()));
                         //下单与获取运费验证是否可售等使用这个
                         goodsOption.setSkuId(sku.getId().toString());
                         goodsOption.setGoodssn(sku.getSn());
-                        //预售价 = 售价
-                        goodsOption.setPresellprice(new BigDecimal(sku.getPrice()/100));
-                        imsEweiShopGoodsOptionService.save(goodsOption);
+                        goodsOption.setDay(0);
+                        goodsOption.setAllfullbackprice(new BigDecimal(0));
+                        goodsOption.setFullbackprice(new BigDecimal(0));
+                        goodsOption.setExchange_postage(new BigDecimal(0));
+                        goodsOption.setIsfullback(0);
+                        goodsOption.setIslive(0);
+                        goodsOption.setLiveprice(new BigDecimal(0));
+
+                        boolean b5 = imsEweiShopGoodsOptionService.save(goodsOption);
                     }
                 }
 
+                redisUtils.sadd(ProductSupplyRedis.SYNC_SUPPLY_ID, dto.getId().toString());
             });
             log.info("=======productId:{} goodsAlter end=======",ids);
         }else {

src/main/java/zs/payment/service/imseweishopcategory/ImsEweiShopCategoryService.java

@@ -5,5 +5,5 @@ import zs.payment.entity.mysql.ImsEweiShopCategory;
 
 public interface ImsEweiShopCategoryService extends IService<ImsEweiShopCategory> {
 
-    ImsEweiShopCategory selectByName(String name,Integer level,Long parentId);
+    ImsEweiShopCategory selectByName(String name,Integer level,Long parentId,Integer uniacid);
 }

src/main/java/zs/payment/service/imseweishopcategory/impl/ImsEweiShopCategoryServiceImpl.java

@@ -18,11 +18,12 @@ public class ImsEweiShopCategoryServiceImpl extends ServiceImpl<ImsEweiShopCateg
 
 
     @Override
-    public ImsEweiShopCategory selectByName(String name, Integer level, Long parentId) {
+    public ImsEweiShopCategory selectByName(String name, Integer level, Long parentId,Integer uniacid) {
         LambdaQueryWrapper<ImsEweiShopCategory> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(ImsEweiShopCategory::getName, name);
         queryWrapper.eq(ImsEweiShopCategory::getLevel, level);
         queryWrapper.eq(ImsEweiShopCategory::getParentId, parentId);
+        queryWrapper.eq(ImsEweiShopCategory::getUniacId, uniacid);
         //已启用
         queryWrapper.eq(ImsEweiShopCategory::getEnabled, 1);
 

src/main/resources/application.yml

@@ -13,3 +13,7 @@ spring:
 
 
 
+# MyBatis-Plus 配置
+mybatis-plus:
+    configuration:
+        log-impl: org.apache.ibatis.logging.stdout.StdOutImpl