BJ_ZTEITS-Developers / parking-cloud-yudao

Commit c8ebad91dd98daf7e241373ba7f152bf95ce881a

Authored by 芋道源码
Committed by Gitee
2 parents 73a7ccbd 819323d3

!1071 小程序端采用银行卡提现，提交后报：请求参数bankName类型错误。 

Merge pull request !1071 from heyho/master-jdk17
Inline Side-by-side
Showing 4 changed files with 8 additions and 6 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/withdraw/AppBrokerageWithdrawCreateReqVO.java
  View file @c8ebad9
@@ -44,7 +44,7 @@ public class AppBrokerageWithdrawCreateReqVO { @@ -44,7 +44,7 @@ public class AppBrokerageWithdrawCreateReqVO {
44 private String name; 44 private String name;
45 @Schema(description = "提现银行", example = "1") 45 @Schema(description = "提现银行", example = "1")
46 @NotNull(message = "提现银行不能为空", groups = {Bank.class}) 46 @NotNull(message = "提现银行不能为空", groups = {Bank.class})
47 - private Integer bankName; 47 + private String bankName;
48 @Schema(description = "开户地址", example = "海淀支行") 48 @Schema(description = "开户地址", example = "海淀支行")
49 private String bankAddress; 49 private String bankAddress;
50 50
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
  View file @c8ebad9
@@ -261,7 +261,7 @@ public interface TradeOrderConvert { @@ -261,7 +261,7 @@ public interface TradeOrderConvert {
261 default BrokerageAddReqBO convert(MemberUserRespDTO user, TradeOrderItemDO item, 261 default BrokerageAddReqBO convert(MemberUserRespDTO user, TradeOrderItemDO item,
262 ProductSpuRespDTO spu, ProductSkuRespDTO sku) { 262 ProductSpuRespDTO spu, ProductSkuRespDTO sku) {
263 BrokerageAddReqBO bo = new BrokerageAddReqBO().setBizId(String.valueOf(item.getId())).setSourceUserId(item.getUserId()) 263 BrokerageAddReqBO bo = new BrokerageAddReqBO().setBizId(String.valueOf(item.getId())).setSourceUserId(item.getUserId())
264 - .setBasePrice(item.getPayPrice() * item.getCount()) 264 + .setBasePrice(item.getPayPrice())
265 .setTitle(StrUtil.format("{}成功购买{}", user.getNickname(), item.getSpuName())) 265 .setTitle(StrUtil.format("{}成功购买{}", user.getNickname(), item.getSpuName()))
266 .setFirstFixedPrice(0).setSecondFixedPrice(0); 266 .setFirstFixedPrice(0).setSecondFixedPrice(0);
267 if (BooleanUtil.isTrue(spu.getSubCommissionType())) { 267 if (BooleanUtil.isTrue(spu.getSubCommissionType())) {
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java
  View file @c8ebad9
@@ -192,6 +192,8 @@ public class BrokerageUserServiceImpl implements BrokerageUserService { @@ -192,6 +192,8 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
192 Integer enabledCondition = tradeConfigService.getTradeConfig().getBrokerageEnabledCondition(); 192 Integer enabledCondition = tradeConfigService.getTradeConfig().getBrokerageEnabledCondition();
193 if (BrokerageEnabledConditionEnum.ALL.getCondition().equals(enabledCondition)) { // 人人分销：用户默认就有分销资格 193 if (BrokerageEnabledConditionEnum.ALL.getCondition().equals(enabledCondition)) { // 人人分销：用户默认就有分销资格
194 brokerageUser.setBrokerageEnabled(true).setBrokerageTime(LocalDateTime.now()); 194 brokerageUser.setBrokerageEnabled(true).setBrokerageTime(LocalDateTime.now());
  195 + } else {
  196 + brokerageUser.setBrokerageEnabled(false).setBrokerageTime(LocalDateTime.now());
195 } 197 }
196 brokerageUserMapper.insert(fillBindUserData(bindUserId, brokerageUser)); 198 brokerageUserMapper.insert(fillBindUserData(bindUserId, brokerageUser));
197 } else { 199 } else {
@@ -267,9 +269,9 @@ public class BrokerageUserServiceImpl implements BrokerageUserService { @@ -267,9 +269,9 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
267 } 269 }
268 270
269 // 校验分佣模式：仅可后台手动设置推广员 271 // 校验分佣模式：仅可后台手动设置推广员
270 - if (BrokerageEnabledConditionEnum.ADMIN.getCondition().equals(tradeConfig.getBrokerageEnabledCondition())) {  
271 - throw exception(BROKERAGE_BIND_CONDITION_ADMIN);  
272 - } 272 + // if (BrokerageEnabledConditionEnum.ADMIN.getCondition().equals(tradeConfig.getBrokerageEnabledCondition())) {
  273 + // throw exception(BROKERAGE_BIND_CONDITION_ADMIN);
  274 + // }
273 275
274 // 校验分销关系绑定模式 276 // 校验分销关系绑定模式
275 if (BrokerageBindModeEnum.REGISTER.getMode().equals(tradeConfig.getBrokerageBindMode())) { 277 if (BrokerageBindModeEnum.REGISTER.getMode().equals(tradeConfig.getBrokerageBindMode())) {
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java
  View file @c8ebad9
@@ -96,7 +96,7 @@ public class BrokerageWithdrawServiceImpl implements BrokerageWithdrawService { @@ -96,7 +96,7 @@ public class BrokerageWithdrawServiceImpl implements BrokerageWithdrawService {
96 Map<String, Object> templateParams = MapUtil.<String, Object>builder() 96 Map<String, Object> templateParams = MapUtil.<String, Object>builder()
97 .put("createTime", LocalDateTimeUtil.formatNormal(withdraw.getCreateTime())) 97 .put("createTime", LocalDateTimeUtil.formatNormal(withdraw.getCreateTime()))
98 .put("price", MoneyUtils.fenToYuanStr(withdraw.getPrice())) 98 .put("price", MoneyUtils.fenToYuanStr(withdraw.getPrice()))
99 - .put("reason", withdraw.getAuditReason()) 99 + .put("reason", auditReason)
100 .build(); 100 .build();
101 notifyMessageSendApi.sendSingleMessageToMember(new NotifySendSingleToUserReqDTO() 101 notifyMessageSendApi.sendSingleMessageToMember(new NotifySendSingleToUserReqDTO()
102 .setUserId(withdraw.getUserId()).setTemplateCode(templateCode).setTemplateParams(templateParams)); 102 .setUserId(withdraw.getUserId()).setTemplateCode(templateCode).setTemplateParams(templateParams));