Merge branch 'master_0223' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -258,9 +258,9 @@ public class AppPermissionService {
         if (StringUtils.isBlank(username) || StringUtils.isBlank(password) || StringUtils.isBlank(mobilecode)) {
             return JsonResultUtil.createFailedResult(ResultCode.NULL_CODE, "参数为空");
         }
-        if (StringUtils.isNotBlank(username)){
-            return JsonResultUtil.createFailedResult(ResultCode.FAILED_CODE, "服务升级中，暂不支持注册");
-        }
+//        if (StringUtils.isNotBlank(username)){
+//            return JsonResultUtil.createFailedResult(ResultCode.FAILED_CODE, "服务升级中，暂不支持注册");
+//        }
         if (StringUtils.isNotBlank(code)){
             //判断处理活动关键字
             String[] codes = code.split("_");
@@ -345,6 +345,8 @@ public class AppPermissionService {
             }
             //生成邀请码 长度改为8 不然重复率太高
             rsUserDetail.setCode(ReferralCodeUtil.encode(userid));
+            log.info("register------username====="+username+"----channel===="+channel);
+            channel=-1;
             rsUserDetail.setChannel(channel);
             rsUserDetail.setRegisterSource(registerSource);
             appUserDetailBiz.insertSelective(rsUserDetail);
@@ -1053,9 +1055,9 @@ public class AppPermissionService {
         if (StringUtils.isBlank(username) || StringUtils.isBlank(password)) {
             return JsonResultUtil.createFailedResult(ResultCode.NULL_CODE, "参数为空");
         }
-        if (StringUtils.isNotBlank(username)){
-            return JsonResultUtil.createFailedResult(ResultCode.FAILED_CODE, "服务升级中，暂不支持注册");
-        }
+//        if (StringUtils.isNotBlank(username)){
+//            return JsonResultUtil.createFailedResult(ResultCode.FAILED_CODE, "服务升级中，暂不支持注册");
+//        }
         // 是否已存在
         AppUserLogin user = appUserLoginBiz.checkeUserLogin(username);
         if (null != user) {
@@ -1085,7 +1087,8 @@ public class AppPermissionService {
             //生成邀请码 长度改为8 不然重复率太高
             rsUserDetail.setCode(ReferralCodeUtil.encode(userid));
             //设置来源
-            rsUserDetail.setChannel(UserSourceEnum.APPLET.getCode());
+            log.info("register------username====="+username+"----channel===="+UserSourceEnum.APPLET.getCode());
+            rsUserDetail.setChannel(-1);
             rsUserDetail.setCrtHost(getIp());
             //setCreateIPInfo(rsUserDetail);
             rsUserDetail.setState(1);

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.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;
@@ -10,6 +13,7 @@ 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.MemberBO;
 import com.xxfc.platform.order.pojo.order.add.AddMemberDTO;
 import com.xxfc.platform.order.pojo.vo.MemberOrderPageVo;
 import com.xxfc.platform.order.service.OrderMemberService;
@@ -40,21 +44,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());
-        return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "为了更好地为您提供会员服务，请联系在线客服（或拨打客服电话：4000-369-369）");
+        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）");
     }
 
     /**

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/VehicleModelController.java

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @RestController
@@ -51,7 +52,11 @@ public class VehicleModelController extends CommonBaseController {
         ObjectRestResponse<VModelDetailVO> objectRestResponse = vehicleFeign.detailByParam(BeanUtil.beanToMap(new VehicleModel(){{
             setName(name);
         }}, false, true));
-        objectRestResponse.getData().setUccnCataList(initUccnCataCollect(objectRestResponse.getData().getConfig()));
+        VModelDetailVO data = objectRestResponse.getData();
+        if (Objects.isNull(data)) {
+            return ObjectRestResponse.succ();
+        }
+        objectRestResponse.getData().setUccnCataList(initUccnCataCollect(data.getConfig()));
         return objectRestResponse;
     }
 
@@ -63,7 +68,11 @@ public class VehicleModelController extends CommonBaseController {
         ObjectRestResponse<VModelDetailVO> objectRestResponse = vehicleFeign.detailByParam(BeanUtil.beanToMap(new VehicleModel(){{
             setId(id);
         }}, false, true));
-        objectRestResponse.getData().setUccnCataList(initUccnCataCollect(objectRestResponse.getData().getConfig()));
+        VModelDetailVO data = objectRestResponse.getData();
+        if (Objects.isNull(data)) {
+            return ObjectRestResponse.succ();
+        }
+        objectRestResponse.getData().setUccnCataList(initUccnCataCollect(data.getConfig()));
         return objectRestResponse;
     }