From 914d64f59724403082183c8ff6e58c6cbde5d8ca Mon Sep 17 00:00:00 2001
From: "602090531@qq.com" <a602090>
Date: Fri, 18 Mar 2022 10:35:06 +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      |  7 +++---
 .../royalcanin/good/OrderController.java      | 24 -------------------
 2 files changed, 4 insertions(+), 27 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 d90507c0..4bc3ae32 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
@@ -7,6 +7,7 @@ import net.lab1024.smartadmin.module.system.royalcanin.coupon.*;
 import net.lab1024.smartadmin.util.MapRemoveNullUtil;
 import net.lab1024.smartadmin.util.SmartDateUtil;
 import net.lab1024.smartadmin.util.SmartHttpUtil;
+import net.lab1024.smartadmin.util.SmartStringUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -64,10 +65,10 @@ public class CouponService {
                 Date compareDate = SmartDateUtil.parseYMD(jsonResult.get("fValidTo").toString());
                 //优惠券有效开始时间
                 Date startDate = SmartDateUtil.parseYMD(jsonResult.get("fValidFrom").toString());
-                if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)) {
+                if ("H5".equals(jsonResult.getString("udf2"))&& SmartStringUtil.isBlank(couponGetAllEntity.getProductCodes())) {
                         afterFilterArrary.add(jsonResult);
-                }else if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(productCode)&&compareDate.compareTo(currentDate)!=-1
-                        && startDate.compareTo(nowDate) != 1){
+                }else if ("H5".equals(jsonResult.getString("udf2"))&& SmartStringUtil.isNotBlank(couponGetAllEntity.getProductCodes()) &&compareDate.compareTo(currentDate)!=-1
+                        && startDate.compareTo(nowDate) != 1 && compareDate.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 36da1352..1145cac2 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
@@ -138,14 +138,6 @@ 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);
@@ -256,14 +248,6 @@ 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);
@@ -373,14 +357,6 @@ 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);