From 10bfbc9e6e61b302762a1e6240237cc93b19b31b Mon Sep 17 00:00:00 2001 From: liyujiang <1032694760@qq.com> Date: Thu, 21 Mar 2024 18:07:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(trade):=20=E5=8F=91=E8=B4=A7=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=89=A9=E6=B5=81=E5=85=AC=E5=8F=B8=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8F=82?= =?UTF-8?q?=E8=A7=81=20TradeOrderUpdateServiceImpl=20=E7=B1=BB=E4=B8=AD?= =?UTF-8?q?=E8=B0=83=E7=94=A8TradeOrderLogUtils.setOrderInfo=E4=BC=A0?= =?UTF-8?q?=E9=80=92=E7=9A=84=E5=8F=82=E6=95=B0=E2=80=9CexpressName?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/trade/enums/order/TradeOrderOperateTypeEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderOperateTypeEnum.java b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderOperateTypeEnum.java index 8973ff9731..b326e8e1ea 100644 --- a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderOperateTypeEnum.java +++ b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderOperateTypeEnum.java @@ -17,7 +17,7 @@ public enum TradeOrderOperateTypeEnum { ADMIN_UPDATE_PRICE(2, "订单价格 {oldPayPrice} 修改，实际支付金额为 {newPayPrice} 元"), MEMBER_PAY(10, "用户付款成功"), ADMIN_UPDATE_ADDRESS(11, "收货地址修改"), - ADMIN_DELIVERY(20, "已发货，快递公司：{deliveryName}，快递单号：{logisticsNo}"), + ADMIN_DELIVERY(20, "已发货，快递公司：{expressName}，快递单号：{logisticsNo}"), MEMBER_RECEIVE(30, "用户已收货"), SYSTEM_RECEIVE(31, "到期未收货，系统自动确认收货"), ADMIN_PICK_UP_RECEIVE(32, "管理员自提收货"), From 03e3dc01216a532799e39e86a53f1b0d1bf1e46a Mon Sep 17 00:00:00 2001 From: liyujiang <1032694760@qq.com> Date: Fri, 22 Mar 2024 08:19:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(pay):=E5=90=8E=E5=8F=B0=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E5=BA=94=E7=94=A8=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=9F=90=E4=B8=80=E6=B8=A0=E9=81=93=EF=BC=8C?= =?UTF-8?q?=E4=BD=86=E6=98=AF=E4=BB=BB=E7=84=B6=E6=98=BE=E7=A4=BA=E4=B8=BA?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/pay/controller/admin/app/PayAppController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/PayAppController.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/PayAppController.java index b0d80eac37..3fb89cadea 100644 --- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/PayAppController.java +++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/PayAppController.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.pay.controller.admin.app; import cn.hutool.core.collection.CollUtil; +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; @@ -92,6 +93,8 @@ public class PayAppController { // 得到所有的应用编号，查出所有的渠道 Collection appIds = convertList(pageResult.getList(), PayAppDO::getId); List channels = channelService.getChannelListByAppIds(appIds); + // 移除未启用的渠道 + channels.removeIf(channel -> !CommonStatusEnum.ENABLE.getStatus().equals(channel.getStatus())); // 拼接后返回 return success(PayAppConvert.INSTANCE.convertPage(pageResult, channels)); From 53f2d4cfd1594e1675411e0e7412f590508e7a2b Mon Sep 17 00:00:00 2001 From: liyujiang <1032694760@qq.com> Date: Sat, 23 Mar 2024 10:16:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(trade):=20=E5=8F=91=E8=B4=A7=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=97=A0=E9=9C=80=E5=8F=91=E8=B4=A7=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E6=94=B9=E4=B8=BA=E2=80=9C=E5=B7=B2=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=EF=BC=8C=E5=BF=AB=E9=80=92=E5=85=AC=E5=8F=B8=EF=BC=9A?= =?UTF-8?q?=E6=97=A0=EF=BC=8C=E5=BF=AB=E9=80=92=E5=8D=95=E5=8F=B7=EF=BC=9A?= =?UTF-8?q?=E6=97=A0=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trade/service/order/TradeOrderUpdateServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java index b9f9e2e42c..310727fd19 100644 --- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java +++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java @@ -361,8 +361,8 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { // 3. 记录订单日志 TradeOrderLogUtils.setOrderInfo(order.getId(), order.getStatus(), TradeOrderStatusEnum.DELIVERED.getStatus(), - MapUtil.builder().put("expressName", express != null ? express.getName() : "") - .put("logisticsNo", express != null ? deliveryReqVO.getLogisticsNo() : "").build()); + MapUtil.builder().put("expressName", express != null ? express.getName() : "无") + .put("logisticsNo", express != null ? deliveryReqVO.getLogisticsNo() : "无").build()); // 4. 发送站内信 tradeMessageService.sendMessageWhenDeliveryOrder(new TradeOrderMessageWhenDeliveryOrderReqBO()