fix: 退款修改
This commit is contained in:
parent
c815a7b061
commit
b88509133c
|
|
@ -238,7 +238,7 @@ public class PayController {
|
|||
}
|
||||
|
||||
@RequestMapping("returnOrder")
|
||||
// @LimitSubmit(key = "returnOrder:%s", limit = 10)
|
||||
@LimitSubmit(key = "returnOrder:%s", limit = 10)
|
||||
public Result returnOrder(@RequestHeader("token") String token,
|
||||
@RequestHeader("loginName") String loginName,
|
||||
@RequestHeader("clientType") String clientType,
|
||||
|
|
|
|||
|
|
@ -1253,7 +1253,7 @@ public class PayService {
|
|||
hasNormalReturn = true;
|
||||
saleAmount = saleAmount.add(orderDetail.getPrice());
|
||||
if (remainNum.compareTo(BigDecimal.ZERO) <= 0) {
|
||||
returnAmount = orderDetail.getPriceAmount();
|
||||
returnAmount = returnAmount.add(orderDetail.getPriceAmount());
|
||||
packAMount = orderDetail.getPackAmount();
|
||||
} else {
|
||||
currentDetailAMount = orderDetail.getPriceAmount()
|
||||
|
|
@ -1326,6 +1326,9 @@ public class PayService {
|
|||
returnOrder.setPayAmount(returnAmount);
|
||||
mPOrderInfoMapper.insert(returnOrder);
|
||||
|
||||
for (TbOrderDetail orderDetail : detailList) {
|
||||
orderDetail.setOrderId(returnOrder.getId());
|
||||
}
|
||||
|
||||
updateStockAndRecord(detailList);
|
||||
mpOrderDetailService.updateBatchById(detailList);
|
||||
|
|
|
|||
Loading…
Reference in New Issue