Merge branch 'master' of csk/eccs into master

eccs-biz/src/main/java/com/emato/biz/controller/mall/InventoryDataController.java

@@ -6,6 +6,8 @@ import com.emato.biz.domain.mall.InventoryDataVo;
 import com.emato.biz.service.mall.ISalesDetaiServicel;
 import com.emato.common.annotation.AnonymousAccess;
 import com.emato.common.core.Result;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -14,15 +16,24 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 
+/**
+ * 接收oms推送到eccs的库存数据
+ * 接收外部商户系统请求所需要的库存数据
+ *
+ * @author Scott Chen
+ * @since 1.0.0
+ * @date 2023-03-21
+ */
 @RestController
 @RequestMapping("/inventory")
 public class InventoryDataController {
+    private static final Logger logger = LoggerFactory.getLogger(InventoryDataController.class);
 
     @Autowired
     private ISalesDetaiServicel salesDetaiServicel;
 
     /**
-     * 接收来自oms的库存数据
+     * 接收oms向eccs系统推送的库存数据
      * @param inventoryDataVo
      * @return
      */
@@ -30,11 +41,13 @@ public class InventoryDataController {
     @PostMapping("/pushinvent")
     public Result pushInventory(@RequestBody InventoryDataVo inventoryDataVo)
     {
+        // todo bug_2023-03-21 未完成开发，需要重新设计
+        logger.debug("---------- 接收OMS库存数据推送::开始 ----------");
         return salesDetaiServicel.inserInventory(inventoryDataVo);
     }
 
     /**
-     * 查询库存数据提供给外部系统
+     * 商户外部系统查询其所要同步的库存数据
      * @param msg
      * @param httpRequest
      * @return
@@ -43,6 +56,7 @@ public class InventoryDataController {
     @PostMapping("/getinvdata")
     public Result getpushinventMsg(@RequestBody JSONObject msg, HttpServletRequest httpRequest)
     {
+        logger.debug("---------- 接收商户获取库存数据请求::开始 ----------");
         return salesDetaiServicel.queryInventory(msg,httpRequest);
     }
 

eccs-biz/src/main/java/com/emato/biz/controller/mall/SalesDetailController.java

@@ -36,7 +36,7 @@ public class SalesDetailController {
 
 
     /**
-     * kmall向eccs系统推送销售明细数据
+     * 接收kmall向eccs系统推送的销售明细数据
      * @param newSystemFormatEntiy
      * @return
      */
@@ -57,7 +57,7 @@ public class SalesDetailController {
     @PostMapping("/salesdetail/getsalesdet")
     public Result getSalesDetaiData(@RequestBody JSONObject msg, HttpServletRequest httpRequest)
     {
-        logger.debug("---------- 接收商户获取销售明细::开始 ----------");
+        logger.debug("---------- 接收商户获取销售明细请求::开始 ----------");
         return salesDetaiServicel.getSalesDetaiData(msg,httpRequest);
     }
 

eccs-biz/src/main/java/com/emato/biz/service/impl/SalesDetaiServicelImpl.java

@@ -264,7 +264,10 @@ public class SalesDetaiServicelImpl implements ISalesDetaiServicel {
             pullQueryData(weChatMapMsg);
             //  数据查询
             //List<InventoryDataPushVo> list = inventoryDataMapper.getInventoryData(weChatMapMsg);
+            // todo bug_2023-03-21 此处直接拉取的oms库，需要重新设计
+            // todo bug_2023-03-21 虽然拉取数据存疑，但此处拉取出的数据向商户返回，其返回的字段与对外接口已经保持一致
             List<InventoryDataPushVo> list = getOmsData(weDtilMsg,weChatMapMsg);
+            // todo bug_2023-03-21 total不正确
             Integer total = inventoryDataMapper.getInventoryTotal();
             if(list.size()==0){
                 return Result.error("900004","该条件下无数据");