123

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderActivityInfoController.java

 package com.xxfc.platform.order.rest;
 
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.order.biz.BaseOrderBiz;
 import com.xxfc.platform.order.biz.OrderActivityInfoDetailBiz;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.entity.BaseOrder;
@@ -38,11 +40,16 @@ public class OrderActivityInfoController extends BaseController<OrderActivityInf
     @Autowired
     UserFeign userFeign;
 
+    @Autowired
+    BaseOrderBiz baseOrderBiz;
+
     @RequestMapping(value = "add", method = RequestMethod.POST)
     @ApiOperation(value = "确认订单")
     @IgnoreClientToken
     public ObjectRestResponse<BaseOrder> add(@RequestBody ActivityInfoBO bo) {
-        bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
+        AppUserDTO appUserDTO = userFeign.userDetailByToken(BaseContextHandler.getToken()).getData();
+        bo.setAppUserDTO(appUserDTO);
+        baseOrderBiz.canelActivityOrder(appUserDTO.getUserid());
         activityInfoService.createOrder(bo);
         return ObjectRestResponse.succ(bo.getOrder());
     }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderActivityInfoService.java

@@ -114,7 +114,6 @@ public class OrderActivityInfoService extends AbstractOrderHandle<OrderActivityI
         if (appUserDTO != null && appUserDTO.getParentId() != null)
             bo.setParentUserId(appUserDTO.getParentId());
         super.handleDetail(bo);
-        baseOrderBiz.canelActivityOrder(appUserDTO.getUserid());
         //发送定时取消订单(30分钟)
         rabbitProduct.sendDelayMessage(bo.getOrder(), autoCancelTime);
     }