1 year ago
parent
commit
23687f3dcf

+ 4 - 3
platform-service/src/main/java/handler/yongyou/PurchaseOrderModNoticeHandler.java

@@ -50,10 +50,11 @@ public class PurchaseOrderModNoticeHandler extends BaseRequestHandler {
         R r = new R();
         try {
 //        PurchaseOrderStatusModNoticeRequest request = (PurchaseOrderStatusModNoticeRequest)req;
-            List<PurchaseOrderStatusModNoticeRequest> requests = JSONArray.parseArray(reqStr, PurchaseOrderStatusModNoticeRequest.class);
+            PurchaseOrderStatusModNoticeRequest purchaseOrderStatusModNoticeRequest = JsonUtils.jsonToModel(reqStr,PurchaseOrderStatusModNoticeRequest.class);
+            List<ModRequest> requests = purchaseOrderStatusModNoticeRequest.getModRequests();
             List<LongYanPurchaseDetailDTO> updateDetails = new ArrayList<>();
             List<LongYanPurchaseOrder> updateOrders = new ArrayList<>();
-            for (PurchaseOrderStatusModNoticeRequest request : requests) {
+            for (ModRequest request : requests) {
                 List<PurchaseDetails> purchaseDetails = request.getPurchaseDetails();
                 List<String> spareNos = purchaseDetails.stream().map(PurchaseDetails::getSpareNo).collect(Collectors.toList());
                 LongYanPurchaseOrder order = new LongYanPurchaseOrder();
@@ -118,7 +119,7 @@ public class PurchaseOrderModNoticeHandler extends BaseRequestHandler {
         }
     }
 
-    private void addStatus(PurchaseOrderStatusModNoticeRequest request, LongYanPurchaseOrder udpOrder) {
+    private void addStatus(ModRequest request, LongYanPurchaseOrder udpOrder) {
         if ("锁定".equals(request.getOrderStatus())){
             udpOrder.setStatus(LongYanPurchaseOrderStatusEnum.locked.getValue());
         }else if ("开立".equals(request.getOrderStatus())){

+ 13 - 0
platform-service/src/main/java/handler/yongyou/request/ModRequest.java

@@ -0,0 +1,13 @@
+package handler.yongyou.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ModRequest {
+    String yongYouId;
+    String orderStatus;
+    List<PurchaseDetails> purchaseDetails;
+
+}

+ 1 - 3
platform-service/src/main/java/handler/yongyou/request/PurchaseOrderStatusModNoticeRequest.java

@@ -6,8 +6,6 @@ import java.util.List;
 
 @Data
 public class PurchaseOrderStatusModNoticeRequest extends FromYongYouBaseRequest {
-    private String orderStatus;
-    private String yongYouId;
-    private List<PurchaseDetails> purchaseDetails;
+    private List<ModRequest> modRequests;
 
 }