商品管理代码优化

sckw-modules/sckw-product/src/main/java/com/sckw/product/model/vo/res/GoodsDetail.java

@@ -94,7 +94,7 @@ public class GoodsDetail {
     /**
      * 交易方式名称（lab）(合同采购、直接采购、预付款、货到付款、到款发货）
      */
-    private String tradingName;
+    private String tradingLabel;
 
     /**
      * 预付款最低限额

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -88,7 +88,7 @@ public class KwpGoodsService {
         Long entId = LoginUserHolder.getEntId();
         //添加商品信息
         KwpGoods goods = BeanUtils.copyProperties(addGoodsParam, KwpGoods.class);
-        goods.setEntId(entId).setShelfTime(new Date()).setStatus(GoodsStatusEnum.PUT_ON_SHELVES.getCode());
+        goods.setEntId(entId).setAddedTime(new Date()).setStatus(GoodsStatusEnum.PUT_ON_SHELVES.getCode());
         kwpGoodsMapper.insert(goods);
         addGoodsOtherInfo(goods.getId(), addGoodsParam);
     }
@@ -162,6 +162,7 @@ public class KwpGoodsService {
             detail.setManagerName(managerInfo.getName()).setManagerPhone(managerInfo.getPhone());
         }
         detail.setGoodsTypeLabel(DictEnum.getLabel(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), detail.getGoodsType()))
+                .setTradingLabel(DictEnum.getLabel(DictTypeEnum.TRADE_TYPE.getType(), detail.getTrading()))
                 .setStatusLabel(DictEnum.getLabel(DictTypeEnum.GOODS_STATUS.getType(), String.valueOf(detail.getStatus())));
         //商品图片信息
         List<KwpGoodsImage> goodsImages = kwpGoodsImageService.getByGoodsId(id);
@@ -203,7 +204,7 @@ public class KwpGoodsService {
         }
         KwpGoods goods = BeanUtils.copyProperties(param, KwpGoods.class);
         if (Objects.equals(param.getStatus(), GoodsStatusEnum.PUT_ON_SHELVES.getCode())) {
-            goods.setShelfTime(new Date());
+            goods.setAddedTime(new Date());
         }
         kwpGoodsMapper.updateById(goods);
         updateGoodsOtherInfo(param);