czg_team
/
cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 退款修改

This commit is contained in:
张松 2024-12-17 14:42:18 +08:00
parent c815a7b061
commit b88509133c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
View File

@ -238,7 +238,7 @@ public class PayController {
} }
@RequestMapping("returnOrder") @RequestMapping("returnOrder")
// @LimitSubmit(key = "returnOrder:%s", limit = 10) @LimitSubmit(key = "returnOrder:%s", limit = 10)
public Result returnOrder(@RequestHeader("token") String token, public Result returnOrder(@RequestHeader("token") String token,
@RequestHeader("loginName") String loginName, @RequestHeader("loginName") String loginName,
@RequestHeader("clientType") String clientType, @RequestHeader("clientType") String clientType,

5
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@ -1253,7 +1253,7 @@ public class PayService {
hasNormalReturn = true; hasNormalReturn = true;
saleAmount = saleAmount.add(orderDetail.getPrice()); saleAmount = saleAmount.add(orderDetail.getPrice());
if (remainNum.compareTo(BigDecimal.ZERO) <= 0) { if (remainNum.compareTo(BigDecimal.ZERO) <= 0) {
returnAmount = orderDetail.getPriceAmount(); returnAmount = returnAmount.add(orderDetail.getPriceAmount());
packAMount = orderDetail.getPackAmount(); packAMount = orderDetail.getPackAmount();
} else { } else {
currentDetailAMount = orderDetail.getPriceAmount() currentDetailAMount = orderDetail.getPriceAmount()
@ -1326,6 +1326,9 @@ public class PayService {
returnOrder.setPayAmount(returnAmount); returnOrder.setPayAmount(returnAmount);
mPOrderInfoMapper.insert(returnOrder); mPOrderInfoMapper.insert(returnOrder);
for (TbOrderDetail orderDetail : detailList) {
orderDetail.setOrderId(returnOrder.getId());
}
updateStockAndRecord(detailList); updateStockAndRecord(detailList);
mpOrderDetailService.updateBatchById(detailList); mpOrderDetailService.updateBatchById(detailList);