Selaa lähdekoodia

bug:订单商品售价设置错误

LuoDLeo 6 kuukautta sitten
vanhempi
commit
4bb293c93b

+ 1 - 1
src/main/java/org/springblade/modules/finance/service/impl/AfterSalesServiceImpl.java

@@ -387,7 +387,7 @@ public class AfterSalesServiceImpl extends ServiceImpl<AfterSalesMapper, AfterSa
 		}
 		}
 
 
 		BigDecimal refundPrice = orderGoods.getGoodsPrice().multiply(BigDecimal.valueOf(orderGoods.getGoodsNum()));
 		BigDecimal refundPrice = orderGoods.getGoodsPrice().multiply(BigDecimal.valueOf(orderGoods.getGoodsNum()));
-		orderService.commonRefund(order.getOrderNo(), order.getId(), refundPrice, order.getPaymentAmount(), afterSalesId);
+		orderService.commonRefund(order.getOrderNo(), order.getId(), refundPrice, order.getTotalAmount(), afterSalesId);
 
 
 		afterSales.setIsArrived(YesOrNoEnum.YES.getValue());
 		afterSales.setIsArrived(YesOrNoEnum.YES.getValue());
 		this.updateById(afterSales);
 		this.updateById(afterSales);

+ 1 - 1
src/main/java/org/springblade/modules/finance/service/impl/OrderGoodsServiceImpl.java

@@ -118,7 +118,7 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
 		orderGoods.setGoodsNo(goods.getGoodsNo());
 		orderGoods.setGoodsNo(goods.getGoodsNo());
 		orderGoods.setGoodsImage(goods.getGoodsCover());
 		orderGoods.setGoodsImage(goods.getGoodsCover());
 		orderGoods.setGoodsId(request.getGoodsInfoId());
 		orderGoods.setGoodsId(request.getGoodsInfoId());
-		orderGoods.setGoodsPrice(cargoWay.getSalePrice());
+		orderGoods.setGoodsPrice(cargoWay.getSalePrice().subtract(BigDecimal.valueOf(cargoWay.getDiscount())));
 		orderGoods.setMerchantId(shop.getMerchantId());
 		orderGoods.setMerchantId(shop.getMerchantId());
 		orderGoods.setShopId(request.getShopId());
 		orderGoods.setShopId(request.getShopId());
 		orderGoods.setUserId(request.getUserId());
 		orderGoods.setUserId(request.getUserId());