Merge remote-tracking branch 'origin/master'

luodangjia

2024-10-31 e25b31c6abf9b26f2b61768ad6039961574b10a1

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java

@@ -118,7 +118,12 @@
        for (ExchangeRecordVO record : data) {
            TCoupon byId = tCouponService.getById(record.getCouponId());
            if (byId!=null){
                if (byId.getDiscountAmount()!=null){
                    record.setDiscountAmount("￥"+byId.getDiscountAmount());

                }else{
                    record.setDiscountAmount("￥"+byId.getMaximumDiscountAmount());
                }
                if (Objects.equals(byId.getMeetTheConditions(), BigDecimal.ZERO)){
                    record.setMeetTheConditions("无门槛");
                }else{