From fc878707a0de94c18646e820bd64d6eb4b1c0525 Mon Sep 17 00:00:00 2001
From: "376654749@qq.com" <bobbin262246>
Date: Thu, 10 Mar 2022 12:01:13 +0800
Subject: [PATCH] adding generateOrder error msg logic

---
 .../royalcanin/good/OrderController.java      | 19 ++++++++++++++++---
 .../royalcanin/good/service/OrderService.java | 12 +++++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
index 5f8a9545..a4ff8f95 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
@@ -141,8 +141,12 @@ public class OrderController {
                 returnMap.put("orderNumber", ordersEntity.getOrderNo());
                 returnMap.put("orderAmount", ordersEntity.getOrderAmount());
                 return ResponseDTO.succData(returnMap, wxpayService.generateQRCode(wxPayEntity));
-            }else if (resultMsg.get("code").equals("3")){
+            }else if (resultMsg.get("code").equals("0")){
                 return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_ORDER_ERROR,resultMsg.get("msg"));
+            }else if (resultMsg.get("code").equals("3")){
+                return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_FAIL_COUPONDED,resultMsg.get("msg"));
+            }else if (resultMsg.get("code").equals("4")){
+                return ResponseDTO.wrap(OrderResponseCodeConst.COUPON_USE_FAIL,resultMsg.get("msg"));
             }
         }catch (Exception e){
             System.out.println(e.getMessage());
@@ -234,8 +238,12 @@ public class OrderController {
                 returnMap.put("orderNumber", ordersEntity.getOrderNo());
                 returnMap.put("orderAmount", ordersEntity.getOrderAmount());
                 return ResponseDTO.succData(returnMap,wxpayService.dounifiedOrder(wxPayEntity));
-            }else if (resultMsg.get("code").equals("3")){
+            }else if (resultMsg.get("code").equals("0")){
                 return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_ORDER_ERROR,resultMsg.get("msg"));
+            }else if (resultMsg.get("code").equals("3")){
+                return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_FAIL_COUPONDED,resultMsg.get("msg"));
+            }else if (resultMsg.get("code").equals("4")){
+                return ResponseDTO.wrap(OrderResponseCodeConst.COUPON_USE_FAIL,resultMsg.get("msg"));
             }
         }catch (Exception e){
             System.out.println(e.getMessage());
@@ -317,6 +325,7 @@ public class OrderController {
         ordersEntity.setOrderStatus("0");
         ordersEntity.setBasePoint(basePoint);
         ordersEntity.setPayType("3");
+        resultMsg = orderService.generateOrder(ordersEntity, orderDatilListJson);
         //判断订单生成状况
             if (resultMsg.get("code").equals("1")) {
                 wxPayEntity.setProduct_id(ordersEntity.getProductCode());
@@ -326,8 +335,12 @@ public class OrderController {
                 returnMap.put("orderNumber", ordersEntity.getOrderNo());
                 returnMap.put("orderAmount", ordersEntity.getOrderAmount());
                 return ResponseDTO.succData(returnMap, wxpayService.generateQRCode(wxPayEntity));
-            }else if (resultMsg.get("code").equals("3")){
+            }else if (resultMsg.get("code").equals("0")){
                 return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_ORDER_ERROR,resultMsg.get("msg"));
+            }else if (resultMsg.get("code").equals("3")){
+                return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_FAIL_COUPONDED,resultMsg.get("msg"));
+            }else if (resultMsg.get("code").equals("4")){
+                return ResponseDTO.wrap(OrderResponseCodeConst.COUPON_USE_FAIL,resultMsg.get("msg"));
             }
         }catch (Exception e){
             System.out.println(e.getMessage());
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java
index 23afbcdb..be8f95a9 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java
@@ -65,7 +65,7 @@ public class OrderService {
                 couponCosumeEntity.setRealCouponAmount(realCouponAmount);
                 JSONObject jsonObject = JSONObject.parseObject(couponService.couponCosume(couponCosumeEntity));
                 if (!jsonObject.getString("code").equals("0")) {
-                    resultMap.put("code",jsonObject.getString("code"));
+                    resultMap.put("code","4");
                     resultMap.put("msg",jsonObject.getString("msg"));
                     return resultMap;
                 }
@@ -125,19 +125,21 @@ public class OrderService {
     }
 
     public int checkNotify(String orderNumber){
-        if(notifyService.findNotifyByOrderNumber(orderNumber) != null)
+        if(notifyService.findNotifyByOrderNumber(orderNumber) != null) {
             return 1;
-        else
+        } else {
             return 0;
+        }
     }
 
 
     public Boolean afterPaySucceedUpdateOrderStatus(String outTradeNo,String totalFee){
         int result = ordersDao.updateOrderStatus(outTradeNo,totalFee);
-        if(result == 1)
+        if(result == 1) {
             return true;
-        else
+        } else {
             return false;
+        }
     }
 
     @Transactional