10.27.2

nickchange

2023-10-27 b2573583e7c70827fa90111ff1d769f79603edd0

 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java

@@ -101,7 +101,7 @@
            if (type == 1) {//满减{"num1":1,"num2":1}
                JSONObject jsonObject = JSON.parseObject(content);
                Double num1 = jsonObject.getDouble("conditionalAmount");
                if(price.compareTo(num1) <= 0){
                if(price.compareTo(num1) < 0){
                    continue;
                }
                couponListVo.setUseCondition("满" + num1 + "元可用");
@@ -113,7 +113,7 @@
                if(num1==null){
                    num1=0d;
                }
                if(price.compareTo(num1) <= 0){
                if(price.compareTo(num1) < 0){
                    continue;
                }
                couponListVo.setUseCondition("");
@@ -157,7 +157,7 @@
            if (type == 1) {//满减{"num1":1,"num2":1}
                JSONObject jsonObject = JSON.parseObject(content);
                Double num1 = jsonObject.getDouble("conditionalAmount");
                if(price.compareTo(num1) <= 0){
                if(price.compareTo(num1) < 0){
                    continue;
                }
                couponListVo.setUseCondition("满" + num1 + "元可用");
@@ -169,7 +169,7 @@
                if(num1==null){
                    num1=0d;
                }
                if(price.compareTo(num1) <= 0){
                if(price.compareTo(num1) < 0){
                    continue;
                }
                couponListVo.setUseCondition("");