yudao
/
spring-cloud
mirror of https://gitee.com/zhijiantianya/yudao-cloud.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

【修复】mall:订单-待支付订单 调整价格取值错误 

Signed-off-by: Evol郑天 <jpevol@163.com>
pull/75/head
Evol郑天 2023-12-02 03:27:04 +00:00 committed by Gitee
parent 86e3dba268
commit c83d9cabd1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/order/TradeOrderOperateTypeEnum.java
View File

@ -14,7 +14,7 @@ import lombok.RequiredArgsConstructor;
public enum TradeOrderOperateTypeEnum { public enum TradeOrderOperateTypeEnum {
MEMBER_CREATE(1, "用户下单"), MEMBER_CREATE(1, "用户下单"),
ADMIN_UPDATE_PRICE(2, "订单价格 {oldPayPrice} 修改，实际支付金额为 {newPayPrice} 元"), ADMIN_UPDATE_PRICE(2, "订单价格 {oldPayPrice} 修改，调整价格 {adjustPrice} ，实际支付金额为 {newPayPrice} 元"),
MEMBER_PAY(10, "用户付款成功"), MEMBER_PAY(10, "用户付款成功"),
ADMIN_UPDATE_ADDRESS(11, "收货地址修改"), ADMIN_UPDATE_ADDRESS(11, "收货地址修改"),
ADMIN_DELIVERY(20, "已发货，快递公司：{deliveryName}，快递单号：{logisticsNo}"), ADMIN_DELIVERY(20, "已发货，快递公司：{deliveryName}，快递单号：{logisticsNo}"),

5
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
View File

@ -622,14 +622,14 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
throw exception(ORDER_UPDATE_PRICE_FAIL_ALREADY); throw exception(ORDER_UPDATE_PRICE_FAIL_ALREADY);
} }
// 1.3 支付价格不能为 0 // 1.3 支付价格不能为 0
int newPayPrice = order.getPayPrice() + order.getAdjustPrice(); int newPayPrice = order.getPayPrice() + reqVO.getAdjustPrice();
if (newPayPrice <= 0) { if (newPayPrice <= 0) {
throw exception(ORDER_UPDATE_PRICE_FAIL_PRICE_ERROR); throw exception(ORDER_UPDATE_PRICE_FAIL_PRICE_ERROR);
} }
// 2. 更新订单 // 2. 更新订单
tradeOrderMapper.updateById(new TradeOrderDO().setId(order.getId()) tradeOrderMapper.updateById(new TradeOrderDO().setId(order.getId())
.setAdjustPrice(reqVO.getAdjustPrice()).setPayPrice(newPayPrice)); .setAdjustPrice((reqVO.getAdjustPrice()+order.getAdjustPrice())).setPayPrice(newPayPrice));
// 3. 更新 TradeOrderItem，需要做 adjustPrice 的分摊 // 3. 更新 TradeOrderItem，需要做 adjustPrice 的分摊
List<TradeOrderItemDO> orderOrderItems = tradeOrderItemMapper.selectListByOrderId(order.getId()); List<TradeOrderItemDO> orderOrderItems = tradeOrderItemMapper.selectListByOrderId(order.getId());
@ -648,6 +648,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
// 5. 记录订单日志 // 5. 记录订单日志
TradeOrderLogUtils.setOrderInfo(order.getId(), order.getStatus(), order.getStatus(), TradeOrderLogUtils.setOrderInfo(order.getId(), order.getStatus(), order.getStatus(),
MapUtil.<String, Object>builder().put("oldPayPrice", MoneyUtils.fenToYuanStr(order.getPayPrice())) MapUtil.<String, Object>builder().put("oldPayPrice", MoneyUtils.fenToYuanStr(order.getPayPrice()))
.put("adjustPrice", MoneyUtils.fenToYuanStr(reqVO.getAdjustPrice()))
.put("newPayPrice", MoneyUtils.fenToYuanStr(newPayPrice)).build()); .put("newPayPrice", MoneyUtils.fenToYuanStr(newPayPrice)).build());
} }