使用福利：积分兑换记录todo

lisy

2023-07-12 d5b25673d8db7d40a8fd5bcfce6017c9bd921091

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

@@ -133,7 +133,11 @@
                detailsVo.setRedeemedNum(coursePackageNums);
                detailsVo.setResidueNum(merchandise.getQuantityIssued() - coursePackageNums);
                detailsVo.setPerLimit(merchandise.getPickUpQuantity());
                detailsVo.setIntegral(merchandise.getIntegral());
                if (merchandise.getRedemptionMethod() == 1){
                    detailsVo.setRequiredType(merchandise.getIntegral() + "积分");
                }else {
                    detailsVo.setRequiredType(merchandise.getIntegral() + "积分+￥"+merchandise.getCash());
                }
                detailsVo.setCost(merchandise.getPrice());
                if (merchandise.getUseScope() == 1){
                    detailsVo.setBelongs("全国通用");
@@ -173,7 +177,11 @@
                detailsVo.setRedeemedNum(count);
                detailsVo.setResidueNum(merchandise.getQuantityIssued()-count);
                detailsVo.setPerLimit(merchandise.getPickUpQuantity());
                detailsVo.setIntegral(merchandise.getIntegral());
                if (merchandise.getRedemptionMethod() == 1){
                    detailsVo.setRequiredType(merchandise.getIntegral() + "积分");
                }else {
                    detailsVo.setRequiredType(merchandise.getIntegral() + "积分+￥"+merchandise.getCash());
                }
                detailsVo.setCost(merchandise.getPrice());
                if (merchandise.getUseScope() == 1){
                    detailsVo.setBelongs("全国通用");
@@ -205,7 +213,11 @@
                detailsVo.setRedeemedNum(couponNums);
                detailsVo.setResidueNum(coupon.getQuantityIssued()-couponNums);
                detailsVo.setPerLimit(coupon.getPickUpQuantity());
                detailsVo.setIntegral(merchandise.getIntegral());
                if (merchandise.getRedemptionMethod() == 1){
                    detailsVo.setRequiredType(merchandise.getIntegral() + "积分");
                }else {
                    detailsVo.setRequiredType(merchandise.getIntegral() + "积分+￥"+merchandise.getCash());
                }
                if (coupon.getUseScope() == 1){
                    detailsVo.setBelongs("全国通用");
                }else if (coupon.getUseScope() == 2){