Merge remote-tracking branch 'origin/master'

liujie

2023-07-26 b68aa42d243a61ab31d3bb08e5ca7e588a5188de

Merge remote-tracking branch 'origin/master'

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

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

import java.math.BigDecimal;

@Data
public class ExchangeDetailsResponse {

@@ -13,8 +15,14 @@
    @ApiModelProperty(value = "商品名称")
    private String goodName;

    @ApiModelProperty(value = "支付类型（积分 / 积分+现金）")
    private String requiredType;
    @ApiModelProperty(value = "积分")
    private Integer integral;

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

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

    @ApiModelProperty(value = "有效期开始时间")
    private String startTime;

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

@@ -301,9 +301,12 @@
                detailsResponse.setDetailsId(pointsMerchandise.getId());
                detailsResponse.setGoodName(merchandise.getName());
                if (merchandise.getRedemptionMethod() == 1){
                    detailsResponse.setRequiredType(merchandise.getIntegral()+"积分");
                    detailsResponse.setExchangeType(1);
                    detailsResponse.setIntegral(merchandise.getIntegral());
                }else {
                    detailsResponse.setRequiredType(merchandise.getIntegral()+"积分 ￥"+merchandise.getCash());
                    detailsResponse.setExchangeType(2);
                    detailsResponse.setIntegral(merchandise.getIntegral());
                    detailsResponse.setCash(merchandise.getCash());
                }
                detailsResponse.setStartTime(simpleDateFormat.format(merchandise.getStartTime()));
                detailsResponse.setEndTime(simpleDateFormat.format(merchandise.getEndTime()));

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

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

import java.math.BigDecimal;

@Data
public class ExchangeDetailsResponse {

@@ -13,8 +15,14 @@
    @ApiModelProperty(value = "商品名称")
    private String goodName;

    @ApiModelProperty(value = "支付类型（积分 / 积分+现金）")
    private String requiredType;
    @ApiModelProperty(value = "积分")
    private Integer integral;

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

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

    @ApiModelProperty(value = "有效期开始时间")
    private String startTime;