From 671bb459a3b954b258245ba136ad1262d175ea4c Mon Sep 17 00:00:00 2001
From: "602090531@qq.com" <a602090>
Date: Thu, 17 Mar 2022 15:42:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=AA=E5=88=B0=E7=94=9F?=
 =?UTF-8?q?=E6=95=88=E6=97=B6=E9=97=B4=E4=BC=98=E6=83=A0=E5=88=B8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../royalcanin/good/OrderController.java      | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

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 444ee293..36da1352 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
@@ -13,6 +13,7 @@ import net.lab1024.smartadmin.module.system.alipay.AliPayService;
 import net.lab1024.smartadmin.module.system.alipay.alipayModel.AliPayEntity;
 import net.lab1024.smartadmin.module.system.alipay.conf.AlipayConfig;
 import net.lab1024.smartadmin.module.system.royalcanin.CouponService;
+import net.lab1024.smartadmin.module.system.royalcanin.coupon.CouponCosumeEntity;
 import net.lab1024.smartadmin.module.system.royalcanin.coupon.CouponGetAllEntity;
 import net.lab1024.smartadmin.module.system.royalcanin.good.constant.OrderResponseCodeConst;
 import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderAddress;
@@ -137,6 +138,14 @@ public class OrderController {
                 ordersEntity.setCouponName(jsonObjectData.getString("couponName"));
                 ordersEntity.setCouponId(jsonObjectData.getString("couponId"));
                 ordersEntity.setCouponTypeId(jsonObjectData.getString("couponTypeId"));
+                //通过传优惠券码锁定优惠券
+                CouponCosumeEntity couponCosumeEntity = new CouponCosumeEntity();
+                couponCosumeEntity.setCouponCode(jsonObjectData.getString("couponCode"));
+                String result = couponService.couponCosume(couponCosumeEntity);
+                JSONObject couponJsonResult = JSONObject.parseObject(result);
+                if(!"0".equals(couponJsonResult.getString("code"))){
+                    return ResponseDTO.wrap(OrderResponseCodeConst.COUPON_USE_FAIL);
+                }
                 total_fee =  orderService.couponTotal(ordersEntity.getCouponTypeId(), Double.parseDouble(ordersEntity.getCouponAmount()), total_fee);
             }
             ordersEntity.setOrderAddress(orderAddress);
@@ -247,6 +256,14 @@ public class OrderController {
                 ordersEntity.setCouponName(jsonObjectData.getString("couponName"));
                 ordersEntity.setCouponId(jsonObjectData.getString("couponId"));
                 ordersEntity.setCouponTypeId(jsonObjectData.getString("couponTypeId"));
+                //通过传优惠券码锁定优惠券
+                CouponCosumeEntity couponCosumeEntity = new CouponCosumeEntity();
+                couponCosumeEntity.setCouponCode(jsonObjectData.getString("couponCode"));
+                String result = couponService.couponCosume(couponCosumeEntity);
+                JSONObject couponJsonResult = JSONObject.parseObject(result);
+                if(!"0".equals(couponJsonResult.getString("code"))){
+                    return ResponseDTO.wrap(OrderResponseCodeConst.COUPON_USE_FAIL);
+                }
                 total_fee =  orderService.couponTotal(ordersEntity.getCouponTypeId(), Double.parseDouble(ordersEntity.getCouponAmount()), total_fee);
             }
         ordersEntity.setOrderAddress(orderAddress);
@@ -356,6 +373,14 @@ public class OrderController {
                 ordersEntity.setCouponName(jsonObjectData.getString("couponName"));
                 ordersEntity.setCouponId(jsonObjectData.getString("couponId"));
                 ordersEntity.setCouponTypeId(jsonObjectData.getString("couponTypeId"));
+                //通过传优惠券码锁定优惠券
+                CouponCosumeEntity couponCosumeEntity = new CouponCosumeEntity();
+                couponCosumeEntity.setCouponCode(jsonObjectData.getString("couponCode"));
+                String result = couponService.couponCosume(couponCosumeEntity);
+                JSONObject couponJsonResult = JSONObject.parseObject(result);
+                if(!"0".equals(couponJsonResult.getString("code"))){
+                    return ResponseDTO.wrap(OrderResponseCodeConst.COUPON_USE_FAIL);
+                }
                 total_fee =  orderService.couponTotal(ordersEntity.getCouponTypeId(), Double.parseDouble(ordersEntity.getCouponAmount()), total_fee);
             }
             ordersEntity.setOrderAddress(orderAddress);