diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayController.java index a70a6d0..432ffe4 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayController.java @@ -215,7 +215,7 @@ public class AliPayController extends BaseController { return R.fail(HttpStatus.SHOW_ERROR_MSG,"提现金额最小为0.1"); } - return aliPayService.fetch(amount.toString()); + return aliPayService.fetch(amount); } diff --git a/mcwl-common/src/main/java/com/mcwl/common/enums/CommissionRationEnum.java b/mcwl-common/src/main/java/com/mcwl/common/enums/CommissionRationEnum.java deleted file mode 100644 index f0c39df..0000000 --- a/mcwl-common/src/main/java/com/mcwl/common/enums/CommissionRationEnum.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.mcwl.common.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; - -/** - * @Author:ChenYan - * @Project:McWl - * @Package:com.mcwl.pay.domain - * @Filename:PaymentStatus - * @Description TODO - * @Date:2025/1/3 17:24 - */ - -@Getter -@AllArgsConstructor -@NoArgsConstructor -public enum CommissionRationEnum { - - /** - * 佣金配给邀请者用户 - */ - COMMISSION_RATION_INVITER_USER("CommissionRationInviterUser"), - /** - * 佣金配给商家用户 - */ - COMMISSION_RATION_MERCHANT("CommissionRationMerchant"); - - private String name; -} diff --git a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/impl/CommissionRatioServiceImpl.java b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/impl/CommissionRatioServiceImpl.java index 5bf8d15..3192e1f 100644 --- a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/impl/CommissionRatioServiceImpl.java +++ b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/impl/CommissionRatioServiceImpl.java @@ -2,11 +2,13 @@ package com.mcwl.myInvitation.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.mcwl.common.core.redis.RedisCache; import com.mcwl.myInvitation.domain.CommissionRatio; import com.mcwl.myInvitation.domain.vo.CommissionRatioVo; import com.mcwl.myInvitation.mapper.CommissionRatioMapper; import com.mcwl.myInvitation.service.CommissionRatioService; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -20,6 +22,8 @@ import java.util.Objects; public class CommissionRatioServiceImpl extends ServiceImpl implements CommissionRatioService { + private final RedisCache redisCache; + @Override public List ratioList() { List list = baseMapper.selectList(null); @@ -41,7 +45,10 @@ public class CommissionRatioServiceImpl extends ServiceImpl