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

puzhibing

2023-12-08 f88cfa02e36752e4acad7adc4b045155e8e50f21

 cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java

@@ -607,7 +607,7 @@
            coupon.setIllustrate(dataVo.getIllustrate());
            coupon.setDistributionMethod(dataVo.getDistributionMethod());
            coupon.setRedemptionMethod(dataVo.getExchangeMethod());
            if (dataVo.getExchangeMethod() != null) {
            if (dataVo.getExchangeMethod() != null&&dataVo.getDistributionMethod()!=4) {
                switch (dataVo.getExchangeMethod()) {
                    case 1:
                        coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
@@ -764,6 +764,7 @@
            }
            return true;
        } catch (Exception e) {
            e.printStackTrace();
            return false;
        }
    }