From f78f3cd1cbc8547896bb4e0956c895780d392c96 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期二, 27 八月 2024 14:05:50 +0800
Subject: [PATCH] 微信发货、确认收货

---
 src/main/java/com/mzl/flower/service/payment/OrderService.java |   55 ++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/mzl/flower/service/payment/OrderService.java b/src/main/java/com/mzl/flower/service/payment/OrderService.java
index 44149e3..8841099 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -519,7 +519,27 @@
      * 合伙人订单定时发货
      */
     public void setPartnerOrderSend() {
-        orderMapper.setPartnerOrderReceive();
+        List<Order> orders = orderMapper.getPartnerOrderReceive();
+        if(orders == null || orders.size() == 0){
+            return;
+        }
+        for (Order o : orders) {
+            //set status_backend = 'RECEIVE', status = 'RECEIVE'
+            o.setStatusBackend("RECEIVE");
+            o.setStatus("RECEIVE");
+            //发送微信发货请求
+            JSONObject jsonObject = sendWxDeliveryGood(o);
+            if (jsonObject != null && (int) jsonObject.get("errcode") == 0) {
+                o.setWxDeliveryGood(true);
+                o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
+            } else {
+                o.setWxDeliveryGood(false);
+                o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
+            }
+
+            orderMapper.updateById(o);
+        }
+        //orderMapper.setPartnerOrderReceive();
     }
 
     /**
@@ -539,6 +559,17 @@
         o.setStatus(Constants.ORDER_STATUS.RECEIVE.name());
         o.setStatusBackend(Constants.ORDER_STATUS_BACKEND.RECEIVE.name());
         o.update(SecurityUtils.getUserId());
+
+        //发送微信发货请求
+        JSONObject jsonObject = sendWxDeliveryGood(o);
+        if (jsonObject != null && (int) jsonObject.get("errcode") == 0) {
+            o.setWxDeliveryGood(true);
+            o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
+        } else {
+            o.setWxDeliveryGood(false);
+            o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
+        }
+
         orderMapper.updateById(o);
     }
 
@@ -787,17 +818,6 @@
             o.setStatusBackend(Constants.ORDER_STATUS_BACKEND.EVALUATE.name());
             o.setReceiveTime(LocalDateTime.now());
             o.update("sys");
-
-
-            //发送微信发货请求
-            JSONObject jsonObject = sendWxDeliveryGood(o);
-            if (jsonObject != null && (int) jsonObject.get("errcode") == 0) {
-                o.setWxDeliveryGood(true);
-                o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
-            } else {
-                o.setWxDeliveryGood(false);
-                o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
-            }
             orderMapper.updateById(o);
 
         }
@@ -860,17 +880,6 @@
         o.setStatusBackend(Constants.ORDER_STATUS_BACKEND.EVALUATE.name());
         o.setReceiveTime(LocalDateTime.now());
         o.update(userId);
-
-        //发送微信发货请求
-        JSONObject jsonObject = sendWxDeliveryGood(o);
-        if (jsonObject != null && (int) jsonObject.get("errcode") == 0) {
-            o.setWxDeliveryGood(true);
-            o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
-        } else {
-            o.setWxDeliveryGood(false);
-            o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
-        }
-
         orderMapper.updateById(o);
     }
 

--
Gitblit v1.9.3