Merge remote-tracking branch 'origin/2.0' into 2.0

mitao

2025-11-04 270a3c0208001e2db9577cb6d7d4fd7ec646dfd8

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

@@ -754,8 +754,19 @@
                        coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
                        break;
                    case 2:
                        coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));
                        if (dataVo.getRequiredCash() != null){
                        coupon.setCash(dataVo.getRequiredCash());
                        }else{
                            coupon.setCash(BigDecimal.ZERO);

                        }
                        if (dataVo.getRequiredPoints() != null){
                            coupon.setIntegral(BigDecimal.valueOf(dataVo.getRequiredPoints()));

                        }else{
                            coupon.setIntegral(BigDecimal.ZERO);

                        }
                        break;
                    case 3:
                        coupon.setCash(dataVo.getRequiredCash());