cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
@@ -72,20 +72,21 @@
                couponListVo.setType(coupon.getType());
                couponListVo.setEffectiveTime(sdf.format(coupon.getStartTime()) + "-" + sdf.format(coupon.getEndTime()));
                String content = coupon.getContent();
                if (coupon.getType() == 1) {//满减{"num1":1,"num2":1}
                if (coupon.getType() == 1) {//满减
//                    {"conditionalAmount":50,"deductionAmount":10,"experienceName":""}
                    JSONObject jsonObject = JSON.parseObject(content);
                    couponListVo.setUseCondition("满" + jsonObject.getDouble("num1") + "元可用");
                    couponListVo.setFavorable(jsonObject.getString("num2"));
                    couponListVo.setUseCondition("满" + jsonObject.getDouble("conditionalAmount") + "元可用");
                    couponListVo.setFavorable(jsonObject.getString("deductionAmount"));
                }
                if (coupon.getType() == 2) {//代金券{"num1":1}
                    JSONObject jsonObject = JSON.parseObject(content);
                    couponListVo.setUseCondition("");
                    couponListVo.setFavorable(jsonObject.getString("num1"));
                    couponListVo.setFavorable(jsonObject.getString("conditionalAmount"));
                }
                if (coupon.getType() == 3) {//体验券{"num1":1}
                    JSONObject jsonObject = JSON.parseObject(content);
                    couponListVo.setUseCondition("");
                    couponListVo.setFavorable(jsonObject.getString("num1"));
                    couponListVo.setFavorable(jsonObject.getString("experienceName"));
                }
                listVos.add(couponListVo);
            }