取消(驳回)订单接口,增加当前飞机类型可用数量 +1

api-merchant/src/main/java/com/jumeirah/api/merchant/controller/order/McStrokeController.java

 package com.jumeirah.api.merchant.controller.order;
 package com.jumeirah.api.merchant.controller.order;
 
 
-import com.jumeirah.common.param.StrokeCompleteParam;
+import com.jumeirah.api.merchant.entity.param.StrokeCancelParam;
 import com.jumeirah.api.merchant.entity.param.StrokeConfirmPaymentParam;
 import com.jumeirah.api.merchant.entity.param.StrokeConfirmPaymentParam;
 import com.jumeirah.api.merchant.entity.param.StrokeDiscountCheckParam;
 import com.jumeirah.api.merchant.entity.param.StrokeDiscountCheckParam;
 import com.jumeirah.common.entity.AppUser;
 import com.jumeirah.common.entity.AppUser;
@@ -9,6 +9,7 @@ import com.jumeirah.common.enums.StatePaymentStatusEnum;
 import com.jumeirah.common.enums.StrokeStatusEnum;
 import com.jumeirah.common.enums.StrokeStatusEnum;
 import com.jumeirah.common.factory.PushFactory;
 import com.jumeirah.common.factory.PushFactory;
 import com.jumeirah.common.param.McStrokePageParam;
 import com.jumeirah.common.param.McStrokePageParam;
+import com.jumeirah.common.param.StrokeCompleteParam;
 import com.jumeirah.common.param.StrokeQuotedPriceParam;
 import com.jumeirah.common.param.StrokeQuotedPriceParam;
 import com.jumeirah.common.service.AppUserService;
 import com.jumeirah.common.service.AppUserService;
 import com.jumeirah.common.service.StrokeService;
 import com.jumeirah.common.service.StrokeService;
@@ -149,11 +150,8 @@ public class McStrokeController extends BaseController {
     @ApiOperation(value = "取消(驳回)订单接口", response = ApiResult.class)
     @ApiOperation(value = "取消(驳回)订单接口", response = ApiResult.class)
     @RequiresPermissions("merchant:order:edit")
     @RequiresPermissions("merchant:order:edit")
     public ApiResult<Boolean> cancel(@Validated @RequestBody StrokeCancelParam strokeCancelParam) throws Exception {
     public ApiResult<Boolean> cancel(@Validated @RequestBody StrokeCancelParam strokeCancelParam) throws Exception {
-        Stroke stroke = new Stroke();
-        stroke.setId(strokeCancelParam.getId())
-                .setStatus(StrokeStatusEnum.CANCEL.getCode())
-                .setUpdateTime(new Timestamp(System.currentTimeMillis()));
-        boolean flag = strokeService.updateStroke(stroke);
+
+        boolean flag = strokeService.cancel(strokeCancelParam.getId());
         return ApiResult.result(flag);
         return ApiResult.result(flag);
     }
     }
 
 

common/src/main/java/com/jumeirah/common/service/StrokeService.java

@@ -40,6 +40,9 @@ public interface StrokeService extends BaseService<Stroke> {
      */
      */
     boolean updateStroke(Stroke stroke) throws Exception;
     boolean updateStroke(Stroke stroke) throws Exception;
 
 
+
+    boolean cancel(Long id) throws Exception;
+
     /**
     /**
      * 删除
      * 删除
      *
      *

common/src/main/java/com/jumeirah/common/service/impl/StrokeServiceImpl.java

@@ -68,6 +68,28 @@ public class StrokeServiceImpl extends BaseServiceImpl<StrokeMapper, Stroke> imp
         return super.updateById(stroke);
         return super.updateById(stroke);
     }
     }
 
 
+    @Override
+    public boolean cancel(Long id) throws Exception {
+
+        // 修改订单状态为取消
+        Stroke stroke = new Stroke();
+        stroke.setId(id)
+                .setStatus(StrokeStatusEnum.CANCEL.getCode())
+                .setUpdateTime(new Timestamp(System.currentTimeMillis()));
+        boolean b = super.updateById(stroke);
+        if (!b) {
+            return false;
+        }
+
+        // 增加当前飞机类型可用数量 +1
+        Stroke strokeById = this.getById(id);
+        McPlain mcPlain = mcPlainService.getOne(new QueryWrapper<McPlain>().lambda()
+                .eq(McPlain::getMcId, strokeById.getMcId())
+                .eq(McPlain::getPtId, strokeById.getPlainTypeId()));
+        mcPlain.setAmount(mcPlain.getAmount() + 1);
+        return mcPlainService.updateMcPlain(mcPlain);
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Override
     public boolean deleteStroke(Long id) throws Exception {
     public boolean deleteStroke(Long id) throws Exception {