From 57f05da254ad2492ac297c85e342a4f59dabdd34 Mon Sep 17 00:00:00 2001
From: "602090531@qq.com" <a602090>
Date: Thu, 17 Mar 2022 15:26:05 +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

---
 .../system/royalcanin/CouponService.java      | 10 ++++++--
 .../royalcanin/good/OrderController.java      | 23 +++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java
index 9fda9f7b..f0ec9624 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java
@@ -56,13 +56,19 @@ public class CouponService {
         JSONObject jsonObjectResult = JSONObject.parseObject(result);
         com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(jsonObjectResult.getString("data"));
         com.alibaba.fastjson.JSONArray afterFilterArrary = new JSONArray();
+        Date nowDate =SmartDateUtil.parseYMD(SmartDateUtil.formatYMD(new Date()));
         for(int i = 0;i < jsonArray.size();i ++){
             JSONObject jsonResult = (JSONObject)jsonArray.get(i);
             if(jsonResult.getString("udf2") != null) {
+                //优惠券有效过期时间
                 Date compareDate = SmartDateUtil.parseYMD(jsonResult.get("fValidTo").toString());
-                if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)&&compareDate.compareTo(currentDate)!=-1) {
+                //优惠券有效开始时间
+                Date startDate = SmartDateUtil.parseYMD(jsonResult.get("fValidFrom").toString());
+                if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)&&compareDate.compareTo(currentDate)!=-1
+                           && startDate.compareTo(nowDate) != 1) {
                         afterFilterArrary.add(jsonResult);
-                }else if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(productCode)&&compareDate.compareTo(currentDate)!=-1){
+                }else if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(productCode)&&compareDate.compareTo(currentDate)!=-1
+                        && startDate.compareTo(nowDate) != 1){
                     for(int g = 0 ;g<productCode.length;g++) {
                         if ((jsonResult.get("productCodes") != null ? jsonResult.get("productCodes").toString().indexOf(productCode[g]) : "".indexOf(productCode[g])) != -1 || jsonResult.get("productCodes") == null) {
                             afterFilterArrary.add(jsonResult);
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 20a2d17a..a85035a8 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;
@@ -115,6 +116,13 @@ 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 = total_fee + orderService.couponTotal(ordersEntity.getCouponTypeId(), Double.parseDouble(ordersEntity.getCouponAmount()), Double.parseDouble(goodsObject.getString("ecPrice")), ordersEntitys.getBuyCount());
                 } else {
                     total_fee = total_fee + Double.parseDouble(goodsObject.getString("ecPrice")) * ordersEntitys.getBuyCount();
@@ -220,6 +228,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 = total_fee + orderService.couponTotal(ordersEntity.getCouponTypeId(), Double.parseDouble(ordersEntity.getCouponAmount()), Double.parseDouble(goodsObject.getString("ecPrice")), ordersEntitys.getBuyCount());
             } else {
                 total_fee = total_fee + Double.parseDouble(goodsObject.getString("ecPrice")) * ordersEntitys.getBuyCount();
@@ -323,6 +339,13 @@ 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 = total_fee + orderService.couponTotal(ordersEntity.getCouponTypeId(), Double.parseDouble(ordersEntity.getCouponAmount()), Double.parseDouble(goodsObject.getString("ecPrice")), ordersEntitys.getBuyCount());
             } else {
                 total_fee = total_fee + Double.parseDouble(goodsObject.getString("ecPrice")) * ordersEntitys.getBuyCount();