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

fix: 会员支付修改

Browse Source
This commit is contained in:
张松
2024-12-17 14:42:18 +08:00
parent 2c69dcc4d3
commit c815a7b061
3 changed files with 3 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); JSONObject jsonObject = TokenUtil.parseParamFromToken(token);
String userId = jsonObject.getString("accountId"); String userId = jsonObject.getString("accountId");
orderVo.setMerchantId(Integer.valueOf(userId)); orderVo.setMerchantId(Integer.valueOf(userId));
orderVo.setUserId(jsonObject.getString("staffId"));
return orderService.createOrder(orderVo, clientType, token, null); return orderService.createOrder(orderVo, clientType, token, null);
} }

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,

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

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