Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-10-27 3d8841f84c94d93349fb471d0435289e540d5143

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

@@ -165,7 +165,7 @@
            }
            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;
                }