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

Merge branch 'refs/heads/dev-3.0.0' into dev

Browse Source 
# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
This commit is contained in:
张松
2024-12-17 15:00:06 +08:00
parent 255ce6a491 b88509133c
commit 21ae260976
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
View File

@@ -139,7 +139,6 @@ public class OrderController {
JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
String userId = jsonObject.getString("accountId");
orderVo.setMerchantId(Integer.valueOf(userId));
orderVo.setUserId(jsonObject.getString("staffId"));
return orderService.createOrder(orderVo, clientType, token, null, true);
}

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

@@ -941,6 +941,7 @@ public class PayService {
orderInfo.setStatus("closed");
orderInfo.setPayOrderNo("deposit".concat(SnowFlakeUtil.generateOrderNo()));
orderInfo.setMemberId(vipUserId.toString());
orderInfo.setUserId(shopUser.getUserId());
tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
//更新购物车状态
mpCashierCartService.updateStateByOrderId(TableConstant.OrderInfo.Status.CLOSED, orderInfo.getId());
@@ -1252,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()
@@ -1325,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);
@@ -1399,7 +1403,7 @@ public class PayService {
}
@Transactional
@Transactional(rollbackFor = Exception.class)
public Object returnOrder(ReturnOrderDTO returnOrderDTO) {
TbOrderInfo orderInfo = mPOrderInfoMapper.selectOne(new LambdaQueryWrapper<TbOrderInfo>()
.eq(TbOrderInfo::getId, returnOrderDTO.getOrderId())