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

sckw-common/sckw-common-mongo/src/main/java/com/sckw/mongo/model/SckwLogisticsOrder.java

@@ -27,6 +27,11 @@ public class SckwLogisticsOrder {
      * 主键
      */
     @Id
+    private Long _id;
+
+    /**
+     * 物流订单ID
+     */
     private Long lOrderId;
 
     /**

sckw-common/sckw-common-mongo/src/main/java/com/sckw/mongo/model/SckwTradeOrder.java

@@ -22,9 +22,14 @@ import java.util.Date;
 public class SckwTradeOrder{
 
     /**
-     * 订单主键
+     * 主键
      */
     @Id
+    private Long _id;
+
+    /**
+     * 订单主键
+     */
     private Long tOrderId;
 
     /**

sckw-common/sckw-common-mongo/src/main/java/com/sckw/mongo/model/SckwWaybillOrder.java

@@ -25,6 +25,11 @@ public class SckwWaybillOrder{
      * 主键
      */
     @Id
+    private Long _id;
+
+    /**
+     * 主键
+     */
     private Long wOrderId;
 
     /**

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);

sckw-modules/sckw-report/src/main/java/com/sckw/report/consumer/SckwBusSumConsumer.java

@@ -64,6 +64,7 @@ public class SckwBusSumConsumer {
         /**业务存储**/
         if (busSum.getBusSumType().equals("tradeOrder")) {
             SckwTradeOrder order = JSONObject.parseObject(JSON.toJSONString(busSum.getObject()), SckwTradeOrder.class);
+            order.set_id(order.getTOrderId());
             if (busSum.getMethod() == 1) {
                 tradeOrderRepository.insert(order);
             } else {
@@ -73,6 +74,7 @@ public class SckwBusSumConsumer {
 
         if (busSum.getBusSumType().equals("logisticsOrder")) {
             SckwLogisticsOrder order = JSONObject.parseObject(JSON.toJSONString(busSum.getObject()), SckwLogisticsOrder.class);
+            order.set_id(order.getLOrderId());
             if (busSum.getMethod() == 1) {
                 logisticsOrderRepository.insert(order);
             } else {
@@ -82,6 +84,7 @@ public class SckwBusSumConsumer {
 
         if (busSum.getBusSumType().equals("waybillOrder")) {
             SckwWaybillOrder order = JSONObject.parseObject(JSON.toJSONString(busSum.getObject()), SckwWaybillOrder.class);
+            order.set_id(order.getWOrderId());
             if (busSum.getMethod() == 1) {
                 waybillOrderRepository.insert(order);
             } else {