From 39d26cc84db92da287c0b80650db0d043a8b0e00 Mon Sep 17 00:00:00 2001 From: yunlongn Date: Tue, 2 Jan 2024 15:32:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E6=9C=89=E7=AD=89=E7=BA=A7=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8B?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=9A=E6=8A=8A=E5=BD=93=E5=89=8D=E7=AD=89?= =?UTF-8?q?=E7=BA=A7=E6=B8=85=E7=A9=BA=E5=BE=97bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/member/service/level/MemberLevelServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java index c98dd4b97d..1111c7407e 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java @@ -27,6 +27,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.Optional; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*; @@ -259,7 +260,7 @@ public void addExperience(Long userId, Integer experience, MemberExperienceBizTy } // 3. 更新会员表上的等级编号、经验值 - memberUserService.updateUserLevel(user.getId(), levelRecord.getLevelId(), userExperience); + memberUserService.updateUserLevel(user.getId(), Optional.ofNullable(levelRecord.getLevelId()).orElse(user.getLevelId()), userExperience); } /** From 9e895c8af1eded8e1911160a25b99cf788a236a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=AE=87=E5=BA=86?= Date: Wed, 3 Jan 2024 18:50:23 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E4=B8=AD=E5=BF=AB=E9=80=92?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=90=8D=E7=A7=B0=E6=A8=A1=E6=9D=BF=E4=B8=8E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=B9=E4=B8=8D=E4=B8=8A=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20cn.iocoder.yudao.module.trade.enums.order.TradeOrde?= =?UTF-8?q?rOperateTypeEnum=E4=B8=ADADMIN=5FDELIVERY=E4=B8=BAdeliveryName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨宇庆 --- .../module/trade/service/order/TradeOrderUpdateServiceImpl.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/order/TradeOrderUpdateServiceImpl.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java index 1bac5c2830..49ddd21402 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 @@ -359,7 +359,7 @@ public void deliveryOrder(TradeOrderDeliveryReqVO deliveryReqVO) { // 3. 记录订单日志 TradeOrderLogUtils.setOrderInfo(order.getId(), order.getStatus(), TradeOrderStatusEnum.DELIVERED.getStatus(), - MapUtil.builder().put("expressName", express != null ? express.getName() : "") + MapUtil.builder().put("deliveryName", express != null ? express.getName() : "") .put("logisticsNo", express != null ? deliveryReqVO.getLogisticsNo() : "").build()); // 4. 发送站内信