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

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

 package com.xxfc.platform.order.rest;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 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.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.order.biz.OrderMemberDetailBiz;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderMemberDetail;
 import com.xxfc.platform.order.pojo.dto.MemberOrderFindDTO;
 import com.xxfc.platform.order.pojo.order.add.AddMemberDTO;
-import com.xxfc.platform.order.pojo.order.MemberBO;
 import com.xxfc.platform.order.pojo.vo.MemberOrderPageVo;
 import com.xxfc.platform.order.service.OrderMemberService;
 import io.swagger.annotations.Api;
@@ -25,10 +21,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-import java.net.URLEncoder;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Base64;
 
 @Controller
 @RequestMapping("orderMember")
@@ -46,20 +40,21 @@ public class OrderMemberController extends BaseController<OrderMemberDetailBiz,
     @ResponseBody
     @ApiOperation(value = "确认会员订单")
     public ObjectRestResponse<BaseOrder> add(@RequestBody AddMemberDTO dto) {
-        MemberBO bo = BeanUtil.toBean(dto, MemberBO.class);
-        bo.setTickerNo(StrUtil.isNotBlank(dto.getTickerNos())?
-                StrUtil.splitTrim(dto.getTickerNos(), ","):null);
-        //查询会员等级实体
-//        bo.setBaseUserMemberLevel(userFeign.memberEntityList(BeanUtil.beanToMap(new BaseUserMemberLevel(){{
-//            setId(dto.getMemberLevelId());
-//        }})).getData().get(0));
-
-//        bo.setMemberLevelId(bo.getBaseUserMemberLevel().getId());
-
-        bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
-        //查询优惠券
-        orderMemberService.createOrder(bo);
-        return ObjectRestResponse.succ(bo.getOrder());
+//        MemberBO bo = BeanUtil.toBean(dto, MemberBO.class);
+//        bo.setTickerNo(StrUtil.isNotBlank(dto.getTickerNos())?
+//                StrUtil.splitTrim(dto.getTickerNos(), ","):null);
+//        //查询会员等级实体
+////        bo.setBaseUserMemberLevel(userFeign.memberEntityList(BeanUtil.beanToMap(new BaseUserMemberLevel(){{
+////            setId(dto.getMemberLevelId());
+////        }})).getData().get(0));
+//
+////        bo.setMemberLevelId(bo.getBaseUserMemberLevel().getId());
+//
+//        bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
+//        //查询优惠券
+//        orderMemberService.createOrder(bo);
+//        return ObjectRestResponse.succ(bo.getOrder());
+        return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "为了更好地为您提供会员服务，请联系在线客服（或拨打客服电话：4000-369-369）");
     }
 
     /**