mitao
2025-03-10 dc7ff84ed9bbb4432dc584d6a7720c4ecf832150
协议管理修改
3个文件已修改
20 ■■■■ 已修改文件
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/CustomConfigDTO.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/CustomConfigDTO.java
@@ -7,6 +7,7 @@
@Data
@ApiModel(value = "获取配置对象", description = "获取配置对象")
public class CustomConfigDTO {
    @ApiModelProperty(value = "1 客服电话,2 商城订单说明配置,3 退货周期,用户在收货后{}天可申请售后")
    @ApiModelProperty(value = "1 客服电话,2 商城订单说明配置,3 退货周期,用户在收货后{}天可申请售后 4:保证金如何退还文案")
   private Integer type;
}
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java
@@ -3,11 +3,10 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import lombok.Data;
@Data
public class AuctionSalesroomGoodsInfoVO {
@@ -147,5 +146,14 @@
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Integer isApply;
    @ApiModelProperty(value = "可中拍人数")
    private Integer bidNum;
    @ApiModelProperty(value = "最高出价金额")
    private BigDecimal maxAmount;
    @ApiModelProperty(value = "一次性每人成交数量")
    private Integer dealQuantity;
}
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.member.service.IMemberService;
import com.ruoyi.system.api.RemoteFileService;
import com.ruoyi.system.api.constants.ConfigEnum;
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
@@ -108,6 +109,10 @@
        if(customConfigDTO.getType()==3){
            string=sysUserClient.getconfig("RETURN_CYCLE").getData().getConfigValue();
        }
        if (customConfigDTO.getType() == 4) {
            string = sysUserClient.getconfig(ConfigEnum.REFUND_OF_DEPOSIT.getKey()).getData()
                    .getConfigValue();
        }
        return R.ok(string);
    }
}