1.修改骑手接单

ruoyi-admin/src/main/java/com/ruoyi/app/order/PosOrderController.java

@@ -243,7 +243,8 @@ public class PosOrderController extends BaseController {
     }
 
     //骑手接单、取餐、送达
-    private AjaxResult setOrderQsState(PosOrder posOrder, String qsId, PayPush push) {
+    @Transactional(rollbackFor = Exception.class)
+    protected AjaxResult setOrderQsState(PosOrder posOrder, String qsId, PayPush push) {
         String lockKey = "order:qs:lock:" + posOrder.getId();
         RLock lock = redissonClient.getLock(lockKey);
         try {
@@ -352,7 +353,8 @@ public class PosOrderController extends BaseController {
 
 
     //商家接单
-    private AjaxResult setOrderState2(PosOrder posOrder, String id) {
+    @Transactional(rollbackFor = Exception.class)
+    protected AjaxResult setOrderState2(PosOrder posOrder, String id) {
         int zsou = userBillingMapper.gettypesum(Long.valueOf(id), 1L);
         int zcz = userBillingMapper.gettypesum(Long.valueOf(id), 2L);
         int xiaof = userBillingMapper.gettypesum(Long.valueOf(id), 3L);
@@ -383,7 +385,8 @@ public class PosOrderController extends BaseController {
     }
 
     //订单完成
-    private AjaxResult setOrderState5(PosOrder posOrder) {
+    @Transactional(rollbackFor = Exception.class)
+    protected AjaxResult setOrderState5(PosOrder posOrder) {
         boolean org = posOrderService.saveOrUpdate(posOrder);
         if (org) {
             PosOrder order = posOrderService.getById(posOrder.getId());
@@ -402,7 +405,8 @@ public class PosOrderController extends BaseController {
     }
 
     //同意退款
-    private AjaxResult setOrderState7(PosOrder posOrder) {
+    @Transactional(rollbackFor = Exception.class)
+    protected AjaxResult setOrderState7(PosOrder posOrder) {
         boolean org = posOrderService.saveOrUpdate(posOrder);
         PosOrder order = posOrderService.getById(posOrder.getId());
         if (order.getPoints() != null && order.getPoints() > 0) {