From 39a150df074efd7304385d65a579d8c99a816d01 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 01 十二月 2023 11:33:31 +0800
Subject: [PATCH] 平库二维码生成

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   57 +++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 93fe59d..cae3801 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -244,34 +244,55 @@
             return R.parse(BaseRes.PARAM);
         }
 
-        int MsgT = 0;
-        int MsgF = 0;
-        StringBuilder Msg= new StringBuilder("鍘熷洜锛�");
+        int msgU = 0;
+        int msgT = 0;
+        int msgF = 0;
+        StringBuilder msg= new StringBuilder("鍘熷洜锛�");
 
         List<MatInfoParam> matDetails = (List<MatInfoParam>) param.get("matDetails");
 
         for (Object matDetail : matDetails){
             MatInfoParam matInfoParam = JSONObject.parseObject(JSON.toJSONString(matDetail),MatInfoParam.class);
             if (Cools.isEmpty(matDetails)) {
-                MsgF++;
+                msgF++;
                 continue;
             }
             openService.syncMat(matInfoParam);
-            if(matInfoParam.isType()){
-                MsgT++;
-            }else {
-                MsgF++;
-                Msg.append(matInfoParam.getCinvcode()).append(":").append(matInfoParam.getMemo()).append(";");
+            if(matInfoParam.isUpdate()){
+                msgU++;
+            }else if(matInfoParam.isInsert()){
+                msgT++;
+            } else if(matInfoParam.isError()){
+                msgF++;
+                msg.append(matInfoParam.getCinvcode()).append(":").append(matInfoParam.getMemo()).append(";");
             }
         }
-
-        if (MsgF==0){
-            return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�");
-        }else if (MsgT==0){
-            return R.ok("鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
-        }else {
-            return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�;"+"鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
+        String message = "";
+        boolean success = false;
+        if(msgT != 0){
+            message += "鎴愬姛鎺ユ敹鐗╂枡锛�"+msgT+"涓�";
+            success = true;
         }
+        if(msgU != 0){
+            message += "鎴愬姛淇敼鐗╂枡锛�"+msgU+"涓�";
+            success = true;
+        }
+        if(msgF != 0){
+            message += "鎺ユ敹鐗╂枡澶辫触锛�"+msgF+"涓�;"+msg;
+        }
+        if(success){
+            return R.ok(message);
+        }else {
+            return R.error(message);
+        }
+
+//        if (MsgF==0){
+//            return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�");
+//        }else if (MsgT==0){
+//            return R.error("鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
+//        }else {
+//            return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�;"+"鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
+//        }
 
     }
 
@@ -285,7 +306,7 @@
             return R.parse(BaseRes.PARAM);
         }
 
-        openService.syncOrder(param);
+        openService.syncOrder(param,true);
 
         return R.ok("鍏ュ簱鍗曟嵁鎺ュ彈鎴愬姛");
 
@@ -302,7 +323,7 @@
             return R.parse(BaseRes.PARAM);
         }
 
-        openService.syncOrder(param);
+        openService.syncOrder(param,false);
 
         return R.ok("鍑哄簱鍗曟嵁鎺ュ彈鎴愬姛");
 

--
Gitblit v1.9.1