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

Pre Merge pull request !77 from Evol郑天/N/A

pull/77/MERGE
Evol郑天 2024-04-14 14:07:14 +00:00 committed by Gitee
parent 36a314779a 7e0aeb4a0a
commit 3712bb7367
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 8 additions and 7 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}"),

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

@ -624,22 +624,22 @@ 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());
List<Integer> dividePrices = TradePriceCalculatorHelper.dividePrice2(orderOrderItems, newPayPrice); List<Integer> dividePrices = TradePriceCalculatorHelper.dividePrice2(orderOrderItems, reqVO.getAdjustPrice());
List<TradeOrderItemDO> updateItems = new ArrayList<>(); List<TradeOrderItemDO> updateItems = new ArrayList<>();
for (int i = 0; i < orderOrderItems.size(); i++) { for (int i = 0; i < orderOrderItems.size(); i++) {
TradeOrderItemDO item = orderOrderItems.get(i); TradeOrderItemDO item = orderOrderItems.get(i);
updateItems.add(new TradeOrderItemDO().setId(item.getId()).setAdjustPrice(dividePrices.get(i)) updateItems.add(new TradeOrderItemDO().setId(item.getId()).setAdjustPrice(item.getAdjustPrice()+dividePrices.get(i))
.setPayPrice(item.getPayPrice() + dividePrices.get(i))); .setPayPrice(item.getPayPrice() + dividePrices.get(i)));
} }
tradeOrderItemMapper.updateBatch(updateItems); tradeOrderItemMapper.updateBatch(updateItems);
@ -650,6 +650,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());
} }

4
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculatorHelper.java
View File

@ -245,7 +245,7 @@ public class TradePriceCalculatorHelper {
* @return 分摊金额数组，和传入的 orderItems 一一对应 * @return 分摊金额数组，和传入的 orderItems 一一对应
*/ */
public static List<Integer> dividePrice2(List<TradeOrderItemDO> items, Integer price) { public static List<Integer> dividePrice2(List<TradeOrderItemDO> items, Integer price) {
Integer total = getSumValue(items, TradeOrderItemDO::getPrice, Integer::sum); Integer total = getSumValue(items, TradeOrderItemDO::getPayPrice, Integer::sum);
assert total != null; assert total != null;
// 遍历每一个，进行分摊 // 遍历每一个，进行分摊
List<Integer> prices = new ArrayList<>(items.size()); List<Integer> prices = new ArrayList<>(items.size());
@ -254,12 +254,12 @@ public class TradePriceCalculatorHelper {
TradeOrderItemDO orderItem = items.get(i); TradeOrderItemDO orderItem = items.get(i);
int partPrice; int partPrice;
if (i < items.size() - 1) { // 减一的原因，是因为拆分时，如果按照比例，可能会出现.所以最后一个，使用反减 if (i < items.size() - 1) { // 减一的原因，是因为拆分时，如果按照比例，可能会出现.所以最后一个，使用反减
//在除不尽四舍五入的情况下 多次分摊相减后再重新加上调价金额会出现小数位
partPrice = (int) (price * (1.0D * orderItem.getPayPrice() / total)); partPrice = (int) (price * (1.0D * orderItem.getPayPrice() / total));
remainPrice -= partPrice; remainPrice -= partPrice;
} else { } else {
partPrice = remainPrice; partPrice = remainPrice;
} }
Assert.isTrue(partPrice >= 0, "分摊金额必须大于等于 0");
prices.add(partPrice); prices.add(partPrice);
} }
return prices; return prices;