104模块

platform-rest/src/main/java/com/platform/rest/controller/yongyou/YongyouController.java

@@ -1,5 +1,6 @@
 package com.platform.rest.controller.yongyou;
 
+import com.alibaba.fastjson.JSONObject;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.util.BeanConverterUtil;
 import com.platform.common.util.R;
@@ -87,14 +88,14 @@ public class YongyouController {
      * 用友回调领用出库单
      * 推送实际出库数量和状态
      *
-     * @param jsonStr 用友返回的json数据
+     * @param jsonObject 用友返回的json数据
      * @return R
      */
     @SysLog("用友回调领用出库单")
     @PostMapping("/outstore")
-    public R BackSparePickForm(String jsonStr) {
-        log.info("用友回调出库单:，返回数据：" + jsonStr);
-        yongyouService.backOutForm(jsonStr);
+    public R BackSparePickForm(@RequestBody JSONObject jsonObject) {
+        log.info("用友回调出库单:，返回数据：" + jsonObject.toJSONString());
+        yongyouService.backOutForm(jsonObject);
         return new R<>();
     }
 
@@ -116,14 +117,14 @@ public class YongyouController {
      * 用友回调退库单
      * 推送实际退库数量和状态
      *
-     * @param jsonStr 用友返回的json数据
+     * @param jsonObject 用友返回的json数据
      * @return R
      */
     @SysLog("用友回调退库单")
     @PostMapping("/restore")
-    public R updateSpareRestoreForm(String jsonStr) {
-        log.info("用友回调退库单:，返回数据：" + jsonStr);
-        yongyouService.backOutForm(jsonStr);
+    public R updateSpareRestoreForm(@RequestBody JSONObject jsonObject) {
+        log.info("用友回调退库单:，返回数据：" + jsonObject.toJSONString());
+        yongyouService.backOutForm(jsonObject);
         return new R<>();
     }
 

platform-service/src/main/java/com/platform/service/yongyou/YongyouService.java

@@ -1,5 +1,6 @@
 package com.platform.service.yongyou;
 
+import com.alibaba.fastjson.JSONObject;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.dao.dto.sqarepartmanage.SparePartInfoDTO;
 import com.platform.dao.dto.store.SparePickFormDTO;
@@ -55,6 +56,6 @@ public interface YongyouService {
      * @param jsonStr
      * @return
      */
-    void backOutForm(String jsonStr);
+    void backOutForm(JSONObject jsonObject);
 
 }

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -50,6 +50,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -282,22 +283,19 @@ public class YongyouServiceImpl implements YongyouService {
     /**
      * 领用单用友回调，回写实际数量和状态
      *
-     * @param jsonStr
+     * @param jsonObject
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void backOutForm(String jsonStr) {
-        JSONObject jsonObject = JSON.parseObject(jsonStr);
+    public void backOutForm(JSONObject jsonObject) {
         String id = (String) jsonObject.get("id");
-        String status = (String) jsonObject.get("status");
+        Integer status = (Integer) jsonObject.get("status");
         String time = (String) jsonObject.get("time");
-        JSONArray detailList = (JSONArray) jsonObject.get("detailList");
-
-        for (Iterator<Object> iterator = detailList.iterator(); iterator.hasNext(); ) {
-            JSONObject next = (JSONObject) iterator.next();
+        List<Map<String, String>> detailList =  jsonObject.getObject("detailList", List.class);
+        for (Map<String, String> next: detailList ) {
             // spareId = next.getString("spareId");
-            String spareNum = next.getString("spareNum");
-            String detailId = next.getString("detailId");
+            String spareNum = next.get("spareNum");
+            String detailId = next.get("detailId");
             // String spareGGXH = next.getString("spareGGXH");
             OutStoreDetail sparePickDetail = new OutStoreDetail();
             sparePickDetail.setId(detailId);