Merge branch 'master-order' into dev

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

@@ -2,7 +2,6 @@ package com.xxfc.platform.order.rest;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
-import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.order.biz.OrderActivityDetailBiz;
@@ -15,6 +14,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 @RestController
 @RequestMapping(value = "/order/activity")
 public class OrderActivityController extends BaseController<OrderActivityDetailBiz, OrderActiveDetail> {
@@ -28,9 +29,9 @@ public class OrderActivityController extends BaseController<OrderActivityDetailB
 	@RequestMapping(value = "add", method = RequestMethod.POST)
 	@ResponseBody
 	@ApiOperation(value = "确认活动订单")
-	public ObjectRestResponse<BaseOrder> add(@RequestBody OrderActivityDto dto) {
+	public ObjectRestResponse<BaseOrder> add(@RequestBody OrderActivityDto dto, HttpServletRequest request) {
 		ActivityOrderBO bo = BeanUtil.toBean(dto, ActivityOrderBO.class);
-		bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
+		bo.setAppUserDTO(userFeign.userDetailByToken(request.getHeader("Authorization")).getData());
 		//查询优惠券
 		orderActivityService.createOrder(bo);
 		return ObjectRestResponse.succ(bo.getOrder());