From 0ddee9036632be24b8f307f104f456fdab1b7599 Mon Sep 17 00:00:00 2001 From: heyho Date: Mon, 2 Sep 2024 03:52:29 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=E5=90=8E=E5=90=8E=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=BA=E2=80=9C=E6=8C=87=E5=AE=9A=E5=88=86=E9=94=80=E2=80=9D?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=AE=A9=E6=99=AE=E9=80=9A=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=97=A0=E9=9C=80=E6=88=90=E4=B8=BA=E6=8E=A8=E5=B9=BF=E8=80=85?= =?UTF-8?q?=E4=B9=9F=E5=8F=AF=E4=BB=A5=E7=BB=91=E5=AE=9A=E6=88=90=E4=B8=BA?= =?UTF-8?q?=20=E6=8E=A8=E5=B9=BF=E8=80=85=E7=9A=84=E4=B8=8B=E7=BA=A7?= =?UTF-8?q?=E4=BB=A5=E4=BE=BF=E8=AE=A9=E6=8C=87=E5=AE=9A=E7=9A=84=E6=8E=A8?= =?UTF-8?q?=E5=B9=BF=E8=80=85=E8=B5=9A=E5=8F=96=E4=BD=A3=E9=87=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: heyho --- .../trade/service/brokerage/BrokerageUserServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java index c874f06ca..cf56a5bce 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java @@ -192,6 +192,8 @@ public class BrokerageUserServiceImpl implements BrokerageUserService { Integer enabledCondition = tradeConfigService.getTradeConfig().getBrokerageEnabledCondition(); if (BrokerageEnabledConditionEnum.ALL.getCondition().equals(enabledCondition)) { // 人人分销：用户默认就有分销资格 brokerageUser.setBrokerageEnabled(true).setBrokerageTime(LocalDateTime.now()); + } else { + brokerageUser.setBrokerageEnabled(false).setBrokerageTime(LocalDateTime.now()); } brokerageUserMapper.insert(fillBindUserData(bindUserId, brokerageUser)); } else { @@ -267,9 +269,9 @@ public class BrokerageUserServiceImpl implements BrokerageUserService { } // 校验分佣模式：仅可后台手动设置推广员 - if (BrokerageEnabledConditionEnum.ADMIN.getCondition().equals(tradeConfig.getBrokerageEnabledCondition())) { - throw exception(BROKERAGE_BIND_CONDITION_ADMIN); - } + // if (BrokerageEnabledConditionEnum.ADMIN.getCondition().equals(tradeConfig.getBrokerageEnabledCondition())) { + // throw exception(BROKERAGE_BIND_CONDITION_ADMIN); + // } // 校验分销关系绑定模式 if (BrokerageBindModeEnum.REGISTER.getMode().equals(tradeConfig.getBrokerageBindMode())) { From 98e6124c2f8add8e069d38a2dc4b8c0b941cab02 Mon Sep 17 00:00:00 2001 From: heyho Date: Mon, 2 Sep 2024 03:55:45 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=E4=B8=80=E4=BB=B6=E4=BB=A5=E4=B8=8A=E6=95=B0=E9=87=8F=E6=97=B6?= =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E8=80=85=E8=BF=94=E4=BD=A3=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E5=B0=B1=E5=87=BA=E9=94=99(=E7=BF=BB=E5=80=8D)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: heyho --- .../yudao/module/trade/convert/order/TradeOrderConvert.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java index d91969481..c8b68ebec 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java @@ -261,7 +261,7 @@ public interface TradeOrderConvert { default BrokerageAddReqBO convert(MemberUserRespDTO user, TradeOrderItemDO item, ProductSpuRespDTO spu, ProductSkuRespDTO sku) { BrokerageAddReqBO bo = new BrokerageAddReqBO().setBizId(String.valueOf(item.getId())).setSourceUserId(item.getUserId()) - .setBasePrice(item.getPayPrice() * item.getCount()) + .setBasePrice(item.getPrice() * item.getCount()) .setTitle(StrUtil.format("{}成功购买{}", user.getNickname(), item.getSpuName())) .setFirstFixedPrice(0).setSecondFixedPrice(0); if (BooleanUtil.isTrue(spu.getSubCommissionType())) { From ae26ca5d00f4f7a6ad34245b7054f6629ee8fe6d Mon Sep 17 00:00:00 2001 From: heyho Date: Mon, 2 Sep 2024 03:57:11 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=A9=B3=E5=9B=9E?= =?UTF-8?q?=E4=BD=A3=E9=87=91=E6=8F=90=E7=8E=B0=E6=97=B6,=E6=8A=A5"?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8F=82=E6=95=B0(reason)=E7=BC=BA=E5=A4=B1"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: heyho --- .../trade/service/brokerage/BrokerageWithdrawServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java index c735163a5..86814f8a5 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java @@ -96,7 +96,7 @@ public class BrokerageWithdrawServiceImpl implements BrokerageWithdrawService { Map templateParams = MapUtil.builder() .put("createTime", LocalDateTimeUtil.formatNormal(withdraw.getCreateTime())) .put("price", MoneyUtils.fenToYuanStr(withdraw.getPrice())) - .put("reason", withdraw.getAuditReason()) + .put("reason", auditReason) .build(); notifyMessageSendApi.sendSingleMessageToMember(new NotifySendSingleToUserReqDTO() .setUserId(withdraw.getUserId()).setTemplateCode(templateCode).setTemplateParams(templateParams)); From d1fc18a4098f290db2d1f778c78f49fac349742f Mon Sep 17 00:00:00 2001 From: heyho Date: Mon, 2 Sep 2024 05:08:17 +0000 Subject: [PATCH 4/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=E4=B8=80=E4=BB=B6=E4=BB=A5=E4=B8=8A=E6=95=B0=E9=87=8F=E6=97=B6?= =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E8=80=85=E8=BF=94=E4=BD=A3=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: heyho --- .../yudao/module/trade/convert/order/TradeOrderConvert.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java index c8b68ebec..60b81057f 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java @@ -261,7 +261,7 @@ public interface TradeOrderConvert { default BrokerageAddReqBO convert(MemberUserRespDTO user, TradeOrderItemDO item, ProductSpuRespDTO spu, ProductSkuRespDTO sku) { BrokerageAddReqBO bo = new BrokerageAddReqBO().setBizId(String.valueOf(item.getId())).setSourceUserId(item.getUserId()) - .setBasePrice(item.getPrice() * item.getCount()) + .setBasePrice(item.getPayPrice()) .setTitle(StrUtil.format("{}成功购买{}", user.getNickname(), item.getSpuName())) .setFirstFixedPrice(0).setSecondFixedPrice(0); if (BooleanUtil.isTrue(spu.getSubCommissionType())) { From 819323d3dba064772478a35b392724e3b987f6c2 Mon Sep 17 00:00:00 2001 From: heyho Date: Wed, 4 Sep 2024 05:24:04 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF?= =?UTF-8?q?=E9=87=87=E7=94=A8=E9=93=B6=E8=A1=8C=E5=8D=A1=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E4=BA=A4=E5=90=8E=E6=8A=A5=EF=BC=9A=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E5=8F=82=E6=95=B0bankName=E7=B1=BB=E5=9E=8B=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E3=80=82=20=E5=8E=9F=E5=9B=A0=EF=BC=9Ayudao-module-ma?= =?UTF-8?q?ll/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module?= =?UTF-8?q?/trade/controller/app/brokerage/vo/withdraw/AppBrokerageWithdra?= =?UTF-8?q?wCreateReqVO.java=E4=B8=AD=E7=9A=84=E5=AD=97=E6=AE=B5=EF=BC=9Ap?= =?UTF-8?q?rivate=20Integer=20bankName=E5=AE=9E=E9=99=85=E5=BA=94=E4=B8=BA?= =?UTF-8?q?String=E5=9E=8B=EF=BC=8C=E5=9B=A0=E4=B8=BA=E6=97=A0=E8=AE=BA?= =?UTF-8?q?=E6=98=AF=E7=94=A8=E6=88=B7=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E9=93=B6=E8=A1=8C=E5=90=8D=E5=AD=97=EF=BC=8C=E6=88=96=E6=98=AF?= =?UTF-8?q?=E9=87=87=E7=94=A8=E6=9F=A5=E8=AF=A2=E5=AD=97=E5=85=B8=E8=A1=A8?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B"brokerage=5Fbank=5Fname"=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=80=BC"value"=EF=BC=8C=E9=83=BD=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E6=98=AFString=E5=9E=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 经检查其相所有相关的DO，VO的属性bankName均为String，所以AppBrokerageWithdrawCreateReqVO的bankName改为String为宜。 Signed-off-by: heyho --- .../brokerage/vo/withdraw/AppBrokerageWithdrawCreateReqVO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/withdraw/AppBrokerageWithdrawCreateReqVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/withdraw/AppBrokerageWithdrawCreateReqVO.java index feb6eae89..83d473825 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/withdraw/AppBrokerageWithdrawCreateReqVO.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/vo/withdraw/AppBrokerageWithdrawCreateReqVO.java @@ -44,7 +44,7 @@ public class AppBrokerageWithdrawCreateReqVO { private String name; @Schema(description = "提现银行", example = "1") @NotNull(message = "提现银行不能为空", groups = {Bank.class}) - private Integer bankName; + private String bankName; @Schema(description = "开户地址", example = "海淀支行") private String bankAddress;