Merge remote-tracking branch 'origin/dev' into dev

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

@@ -3,6 +3,7 @@ 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.auth.client.annotation.IgnoreClientToken;
+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.OrderMemberDetailBiz;
@@ -45,6 +46,7 @@ public class OrderMemberController extends BaseController<OrderMemberDetailBiz,O
 
 //        bo.setMemberLevelId(bo.getBaseUserMemberLevel().getId());
 
+        bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
         //查询优惠券
         orderMemberService.createOrder(bo);
         return ObjectRestResponse.succ(bo.getOrder());

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

@@ -7,6 +7,7 @@ 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.auth.client.config.UserAuthConfig;
+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.OrderTourDetailBiz;
@@ -58,6 +59,7 @@ public class OrderTourController extends BaseController<OrderTourDetailBiz,Order
     @ApiOperation(value = "确认旅游订单")
     public ObjectRestResponse<BaseOrder> add(@RequestBody AddTourDTO vo){
         TourBO bo = BeanUtil.toBean(vo, TourBO.class);
+        bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
         bo.setTickerNo(StrUtil.isNotBlank(vo.getTickerNos())? Arrays.asList(vo.getTickerNos().split(",")):null);
         orderTourService.createOrder(bo);
         return ObjectRestResponse.succ(bo.getOrder());

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

@@ -2,6 +2,7 @@ package com.xxfc.platform.order.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.context.BaseContextHandler;
@@ -64,7 +65,7 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
      * 创建基础订单
      * @return
      */
-    public BaseOrder createBaseOrder(Integer orderOrigin, Integer appUserId) {
+    public BaseOrder createBaseOrder(Integer orderOrigin, AppUserDTO appUserDTO) {
         BaseOrder baseOrder = new BaseOrder();
 
         //设置下单来源
@@ -85,14 +86,14 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
         baseOrder.setVersion(VERSION_INITIAL);
 
         //设置用户id
-        baseOrder.setUserId(appUserId);
-        baseOrder.setMemberLevel(getAppUser().getMemberLevel());
+        baseOrder.setUserId(appUserDTO.getUserid());
+        baseOrder.setMemberLevel(appUserDTO.getMemberLevel());
         return baseOrder;
     }
 
     public void initDetail(Detail detail) {
-        Integer appUserId = (null == detail.getAppUserDTO())? Integer.valueOf(BaseContextHandler.getUserID()): detail.getAppUserDTO().getUserid();
-        BaseOrder order = createBaseOrder(detail.getOrderOrigin(), appUserId);
+//        Integer appUserId = (null == detail.getAppUserDTO())? Integer.valueOf(BaseContextHandler.getUserID()): detail.getAppUserDTO().getUserid();
+        BaseOrder order = createBaseOrder(detail.getOrderOrigin(), detail.getAppUserDTO());
         detail.setOrder(order);
     }