erp 相关测试接口提交

liquidnet-bus-common/liquident-common-erp/src/main/java/com/liquidnet/service/erp/vo/LogisticSyncAckBaseVo.java

+package com.liquidnet.service.erp.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class LogisticSyncAckBaseVo {
+    // 状态码:0表示成功,其他表示失败
+    private int code;
+    // 错误原因
+    private String message;
+    // 处理失败的错误列表,当code为0且有错误信息时才非空.只列出同一批内有错误的记录.如果code=0,errors为空说明全部成功
+    private List<LogisticsSyncAckVo> errors;
+}

liquidnet-bus-common/liquident-common-erp/src/main/java/com/liquidnet/service/erp/vo/LogisticSyncBaseVo.java

+package com.liquidnet.service.erp.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class LogisticSyncBaseVo {
+    // 状态码:0表示成功,其他表示失败
+    private int code;
+    // 错误原因
+    private String message;
+    // 只有，page_no = 0 时才返回的符合条件的数据总条数，用来分页
+    private int total_count;
+    // 响应参数的1级数据节点，包含当前页的订单待同步物流订单信息的数据节点,节点下数据字段详见下述“trades”
+    private List<StockQueryVo> stocks;
+}

liquidnet-bus-common/liquident-common-erp/src/main/java/com/liquidnet/service/erp/vo/StockQueryBaseVo.java

@@ -6,12 +6,12 @@ import java.util.List;
 
 @Data
 public class StockQueryBaseVo {
-    // 回写的记录id
+    // 状态码:0表示成功,其他表示失败
     private int code;
-    // 回写的记录id
+    // 错误原因
     private String message;
-    // 回写的记录id
+    // 只有，page_no = 0 时才返回的符合条件的数据总条数，用来分页
     private int total_count;
-    // 回写的记录id
+    // 响应参数的级数据节点，包含当前页的库存管理信息的数据节点，节点下数据字段详见下述“stocks”列表
     private List<StockQueryVo> stocks;
 }

liquidnet-bus-common/liquident-common-erp/src/main/java/com/liquidnet/service/erp/vo/TradePushVo.java

+package com.liquidnet.service.erp.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TradePushVo {
+    // 状态码:0表示成功,其他表示失败
+    private int code;
+    // 错误原因
+    private String message;
+    // 有单据新增时不为0(新建的原始单据)
+    private int new_count;
+    // 有单据更新时不为0(在已有的原始单据上进行修改)
+    private int chg_count;
+}

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/ErpTestController.java

@@ -8,7 +8,10 @@ import com.liquidnet.service.erp.config.ErpWdtClient;
 import com.liquidnet.service.erp.constant.ErpEnum;
 import com.liquidnet.service.erp.param.LogisticsListParam;
 import com.liquidnet.service.erp.param.TradeListParam;
+import com.liquidnet.service.erp.vo.LogisticSyncAckBaseVo;
+import com.liquidnet.service.erp.vo.LogisticSyncBaseVo;
 import com.liquidnet.service.erp.vo.StockQueryBaseVo;
+import com.liquidnet.service.erp.vo.TradePushVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -46,31 +49,33 @@ public class ErpTestController {
 
     @PostMapping("tradePush")
     @ApiOperation("创建原始单")
-    public ResponseDto<String> tradePush(@RequestParam("num") String num) {
+    public ResponseDto<TradePushVo> tradePush(@RequestParam("num") String num) {
         Map<String, String> param = CollectionUtil.linkMapStringString();
         param.put("shop_no", "mdtk2-test");
         List<Map<String, Object>> tradeList = new ArrayList<>();
         tradeList.add(TradeListParam.getNew().test(num));
         param.put("trade_list", JSON.toJSONString(tradeList));
         String json = erpWdtClient.execute(ErpEnum.WdtAPI.TRADE_PUSH.getUri(), param);
-        return ResponseDto.success(json);
+        TradePushVo data = JsonUtils.fromJson(json, TradePushVo.class);
+        return ResponseDto.success(data);
     }
 
 
     @PostMapping("syncQuery")
     @ApiOperation("查询物流同步")
-    public ResponseDto<String> syncQuery() {
+    public ResponseDto<LogisticSyncBaseVo> syncQuery() {
         Map<String, String> param = CollectionUtil.linkMapStringString();
         param.put("shop_no", "mdtk2-test");
         param.put("limit", "100");
         param.put("is_part_sync_able","1");
         String json = erpWdtClient.execute(ErpEnum.WdtAPI.LOGISTICS_SYNC_QUERY.getUri(), param);
-        return ResponseDto.success(json);
+        LogisticSyncBaseVo data = JsonUtils.fromJson(json, LogisticSyncBaseVo.class);
+        return ResponseDto.success(data);
     }
 
     @PostMapping("syncAck")
     @ApiOperation("物流同步回写")
-    public ResponseDto<String> syncAck(@RequestParam("recId") int recId,@RequestParam("status") int status) {
+    public ResponseDto<LogisticSyncAckBaseVo> syncAck(@RequestParam("recId") int recId,@RequestParam("status") int status) {
         Map<String, String> param = CollectionUtil.linkMapStringString();
         param.put("shop_no", "mdtk2-test");
         param.put("limit", "100");
@@ -79,6 +84,7 @@ public class ErpTestController {
         logisticsList.add(LogisticsListParam.getNew().test(recId,status));
         param.put("logistics_list", JSON.toJSONString(logisticsList));
         String json = erpWdtClient.execute(ErpEnum.WdtAPI.LOGISTICS_SYNC_ACK.getUri(), param);
-        return ResponseDto.success(json);
+        LogisticSyncAckBaseVo data = JsonUtils.fromJson(json, LogisticSyncAckBaseVo.class);
+        return ResponseDto.success(data);
     }
 }