修改bug

liujie

2023-10-26 e030255c23c7ba3e2cbad1036a810d6d72fa864f

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

@@ -105,16 +105,19 @@
                    continue;
                }
                couponListVo.setUseCondition("满" + num1 + "元可用");
                couponListVo.setFavorable(jsonObject.getDouble("deductionAmount") + "元");
                couponListVo.setFavorable(jsonObject.getString("deductionAmount"));
            }
            if (type == 2) {//代金券{"num1":1}
                JSONObject jsonObject = JSON.parseObject(content);
                Double num1 = jsonObject.getDouble("deductionAmount");
                if(num1==null){
                    num1=0d;
                }
                if(price.compareTo(num1) <= 0){
                    continue;
                }
                couponListVo.setUseCondition("");
                couponListVo.setFavorable(num1 + "元");
                couponListVo.setFavorable(num1 + "");
            }
            if (type == 3) {//体验券{"num1":1}
                JSONObject jsonObject = JSON.parseObject(content);
@@ -158,16 +161,19 @@
                    continue;
                }
                couponListVo.setUseCondition("满" + num1 + "元可用");
                couponListVo.setFavorable(jsonObject.getDouble("deductionAmount") + "元");
                couponListVo.setFavorable(jsonObject.getString("deductionAmount"));
            }
            if (type == 2) {//代金券{"num1":1}
                JSONObject jsonObject = JSON.parseObject(content);
                Double num1 = jsonObject.getDouble("deductionAmount");
                if(num1==null){
                    num1=0d;
                }
                if(price.compareTo(num1) <= 0){
                    continue;
                }
                couponListVo.setUseCondition("");
                couponListVo.setFavorable(num1 + "元");
                couponListVo.setFavorable(num1 + "");
            }
            if (type == 3) {//体验券{"num1":1}
                JSONObject jsonObject = JSON.parseObject(content);
@@ -218,16 +224,17 @@
                    JSONObject jsonObject = JSON.parseObject(coupon.getContent());
                    switch (coupon.getType()) {
                        case 1:
//                        {"conditionalAmount":50,"deductionAmount":10,"experienceName":""}
//                            满减券
                            Double num1 = jsonObject.getDouble("num1");
                            Double num2 = jsonObject.getDouble("num2");
                            Double num1 = jsonObject.getDouble("conditionalAmount");
                            Double num2 = jsonObject.getDouble("deductionAmount");
                            ruleModel.setConditionalAmount("满"+num1+"可用");
                            ruleModel.setDeductionAmount("¥ "+num2);
                            ruleModel.setExperienceName("");
                            break;
                        case 2:
//                            代金券
                            Double jsonObjectDouble = jsonObject.getDouble("num1");
                            Double jsonObjectDouble = jsonObject.getDouble("conditionalAmount");
                            ruleModel.setConditionalAmount("");
                            ruleModel.setDeductionAmount("¥ "+jsonObjectDouble);
                            ruleModel.setExperienceName("");
@@ -236,7 +243,7 @@
//                            体验券
                            ruleModel.setConditionalAmount("");
                            ruleModel.setDeductionAmount("");
                            ruleModel.setExperienceName(jsonObject.getString("num1"));
                            ruleModel.setExperienceName(jsonObject.getString("experienceName"));
                            break;
                        default:
                            break;