fix: 会员支付修改

src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java

@@ -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);
     }
 

src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java

@@ -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,

src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java

@@ -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());
@@ -1399,7 +1400,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())