兑换商品详情字段增加

lisy

2023-07-26 274ac0857d88bf72aabe9372dd4d2e1edca52ec4

兑换商品详情字段增加

 cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePackageClient.java

@@ -17,6 +17,6 @@
     * @param id
     * @return
     */
    @PostMapping("/coursePackage/queryCoursePackageById")
    @PostMapping("/base/coursePackage/queryCoursePackageById")
    CoursePackage queryCoursePackageById(Integer id);
}

 cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointDetailsVo.java

@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

@Data
@@ -42,4 +43,19 @@
    @ApiModelProperty(value = "兑换说明")
    private String contents;

    @ApiModelProperty(value = "课包课时数")
    private Integer classHours;

    @ApiModelProperty(value = "积分")
    private Integer integral;

    @ApiModelProperty(value = "现金")
    private BigDecimal cash;

    @ApiModelProperty(value = "商品类型  1实物 2课包 3门票 4优惠券")
    private Integer goodType;

    @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金)")
    private Integer exchangeType;

}

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

@@ -327,6 +327,14 @@
        UserPointsMerchandise byId = upmseService.getById(speMercharsId);
        if (ToolUtil.isNotEmpty(byId)){
            PointsMerchandise pmdsServiceById = pmdsService.getById(byId.getPointsMerchandiseId());
            detailsVo.setExchangeType(pmdsServiceById.getRedemptionMethod());
            detailsVo.setGoodType(pmdsServiceById.getType());
            if (pmdsServiceById.getRedemptionMethod() == 1){
                detailsVo.setIntegral(pmdsServiceById.getIntegral());
            }else {
                detailsVo.setCash(pmdsServiceById.getCash());
                detailsVo.setIntegral(pmdsServiceById.getIntegral());
            }
            detailsVo.setDetailsId(byId.getId());
            switch (pmdsServiceById.getType()){
                case 1:
@@ -349,6 +357,8 @@
                    List<String> list1 = Arrays.asList(StrUtils.splitStr2StrArr(coursePackage.getDetailDrawing(), ","));
                    list1.add(coursePackage.getCoverDrawing());
                    detailsVo.setPics(list1);
                    CoursePackagePaymentConfig coursePackagePaymentConfig = cpClient.queryConfigCoursePackData(pmdsServiceById.getCoursePackageConfigId());
                    detailsVo.setClassHours(coursePackagePaymentConfig.getClassHours());
                    Collections.sort(detailsVo.getPics(), (s1, s2) -> {
                        if (s1.equals(coursePackage.getCoverDrawing())) {
                            return -1; // s1排在前面

 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/course/CoursePackageClient.java

@@ -1,8 +1,10 @@
package com.dsh.activity.feignclient.course;

import com.dsh.activity.feignclient.course.model.CoursePackage;
import com.dsh.activity.feignclient.course.model.CoursePackagePaymentConfig;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * @author zhibing.pu
@@ -17,6 +19,9 @@
     * @param id
     * @return
     */
    @PostMapping("/coursePackage/queryCoursePackageById")
    CoursePackage queryCoursePackageById(Integer id);
    @PostMapping("/base/coursePackage/queryCoursePackageById")
    CoursePackage queryCoursePackageById(@RequestBody Integer id);

    @PostMapping("/base/coursePackage/queryConfigCoursePackData")
    CoursePackagePaymentConfig queryConfigCoursePackData(@RequestBody Integer coursePackConfigId);
}

 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/PointDetailsVo.java

@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

@Data
@@ -42,4 +43,20 @@
    @ApiModelProperty(value = "兑换说明")
    private String contents;


    @ApiModelProperty(value = "课包课时数")
    private Integer classHours;

    @ApiModelProperty(value = "积分")
    private Integer integral;

    @ApiModelProperty(value = "现金")
    private BigDecimal cash;

    @ApiModelProperty(value = "商品类型  1实物 2课包 3门票 4优惠券")
    private Integer goodType;

    @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金)")
    private Integer exchangeType;

}

 cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackageController.java

@@ -60,7 +60,7 @@
     * @return
     */
    @ResponseBody
    @PostMapping("/coursePackage/queryCoursePackageById")
    @PostMapping("/base/coursePackage/queryCoursePackageById")
    public TCoursePackage queryCoursePackageById(@RequestBody Integer id){
        try {
            TCoursePackage coursePackage = coursePackageService.getById(id);
@@ -152,4 +152,15 @@
        return courseVoList;
    }

    /**
     * 根据id获取课包
     * @param coursePackConfigId
     * @return
     */
    @ResponseBody
    @PostMapping("/base/coursePackage/queryConfigCoursePackData")
    public CoursePackagePaymentConfig queryConfigCoursePackData(@RequestBody Integer coursePackConfigId){
        return icppconfigService.getById(coursePackConfigId);
    }

}