玩湃
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
nickchange
2023-11-09 c036557db88c6297b9a626a892dce35c14ab8ee5 
 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java


@@ -101,19 +101,19 @@


            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 + "元可用");


                couponListVo.setUseCondition("满￥" + num1 + "元可用");


                couponListVo.setFavorable(jsonObject.getString("deductionAmount"));


            }


            if (type == 2) {//代金券{"num1":1}


                JSONObject jsonObject = JSON.parseObject(content);


                Double num1 = jsonObject.getDouble("deductionAmount");


                Double num1 = jsonObject.getDouble("conditionalAmount");


                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 + "元可用");


@@ -165,11 +165,11 @@


            }


            if (type == 2) {//代金券{"num1":1}


                JSONObject jsonObject = JSON.parseObject(content);


                Double num1 = jsonObject.getDouble("deductionAmount");


                Double num1 = jsonObject.getDouble("conditionalAmount");


                if(num1==null){


                    num1=0d;


                }


                if(price.compareTo(num1) <= 0){


                if(price.compareTo(num1) < 0){


                    continue;


                }


                couponListVo.setUseCondition("");