Merge branch 'master-email' into dev

ace-common/src/main/resources/properties/systemconfig.properties

@@ -27,12 +27,12 @@ WINXIN_PARTNER_KEY=xxfcXXDfangche74upyuns3AD4334533
 WINXIN_PARTNER=1539689201
 
 #邮件配置
-mail.fromMail.addr=1367272022@qq.com
-spring.mail.host=smtp.qq.com
-spring.mail.password=ykfopfvlfpbyhccc // 授权密码，非登录密码
+mail.fromMail.addr=xinxinmanager@126.com
+spring.mail.host=smtp.126.com
+spring.mail.password=jrz5211314 // 授权密码，非登录密码
 spring.mail.properties.smtp.auth=true
 spring.mail.properties.smtp.timeout=25000
-spring.mail.username=1367272022@qq.com
+spring.mail.username=xinxinmanager@126.com
 
 #ios
 APP_ID_IOS=wx3f51779d49171d63

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java

 package com.github.wxiaoqi.security.admin.rest;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz;
 import com.github.wxiaoqi.security.admin.biz.AppUserLoginBiz;
@@ -9,14 +10,17 @@ import com.github.wxiaoqi.security.admin.dto.AppUserManageDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.entity.AppUserManage;
 import com.github.wxiaoqi.security.admin.entity.User;
+import com.github.wxiaoqi.security.admin.rpc.service.AppPermissionService;
 import com.github.wxiaoqi.security.admin.vo.AppUserManageVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
 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.SystemConfig;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +41,9 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
     @Autowired
     private AppUserLoginBiz appUserLoginBiz;
 
+    @Autowired
+    private AppPermissionService appPermissionService;
+
     @Autowired
     private AppUserDetailBiz appUserDetailBiz;
 
@@ -158,5 +165,28 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
         }
     }
 
+    /**
+     * 注册
+     * @param username
+     * @return
+     */
+    @RequestMapping(value = "app/unauth/register", method = RequestMethod.POST)
+    @IgnoreUserToken
+    public @ResponseBody
+    JSONObject register(
+            @RequestParam(value="username",defaultValue="")String  username
+    ){
+        //默认昵称
+        String nickname= SystemConfig.USER_NIKENAME_DEFAULT+(int)((Math.random()*9+1)*100000);
+        String headimgurl=SystemConfig.USER_HEADER_URL_DEFAULT;
+        try {
+        return appPermissionService.adminRegister(username,  username,headimgurl,
+                 nickname, null,-1);
+        } catch (Exception e) {
+            log.error("修改失败【{}】", e);
+            throw new BaseException("修改失败");
+        }
+    }
+
 }
 

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

@@ -258,6 +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(code)){
             //判断处理活动关键字
             String[] codes = code.split("_");
@@ -342,6 +345,8 @@ public class AppPermissionService {
             }
             //生成邀请码 长度改为8 不然重复率太高
             rsUserDetail.setCode(ReferralCodeUtil.encode(userid));
+            log.info("register------username====="+username+"----channel===="+channel);
+            channel=-1;
             rsUserDetail.setChannel(channel);
             appUserDetailBiz.insertSelective(rsUserDetail);
             log.info("注册：新增用户详情： " + userid+"---time===="+System.currentTimeMillis()/1000L);
@@ -1048,6 +1053,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, "服务升级中，暂不支持注册");
+//        }
         // 是否已存在
         AppUserLogin user = appUserLoginBiz.checkeUserLogin(username);
         if (null != user) {
@@ -1077,7 +1085,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);
@@ -1191,6 +1200,15 @@ public class AppPermissionService {
         }
     }
 
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public BaseUserMemberExportDTO  findUserMemberByUserIdAndPhone(String phone) throws Exception {
+        List<BaseUserMemberExportDTO> memberExportDTOS = baseUserMemberExportBiz.findUserMemberExportDataByPhoneAndHashEffective(phone);
+        if (CollectionUtils.isNotEmpty(memberExportDTOS)) {
+               return memberExportDTOS.get(0);
+        }
+        return  null;
+    }
+
 
     private void insertUserMemberByExistUserMemberExportData(Integer userId, List<BaseUserMemberExportDTO> userMemberExportDTOS) throws Exception {
         UserMemberDTO userMemberDTO;
@@ -1238,4 +1256,142 @@ public class AppPermissionService {
 
     }
 
+
+    /**
+     * 注册用户
+     *
+     * @param username
+     * @param password
+     * @param headimgurl
+     */
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public JSONObject adminRegister(String username, String password, String headimgurl,
+                               String nickname,String code,Integer channel)throws Exception {
+        log.info("register------code====="+code+"----开始进入方法---time===="+System.currentTimeMillis()/1000L);
+        String activityCode = null;
+        if (StringUtils.isNotBlank(code)){
+            //判断处理活动关键字
+            String[] codes = code.split("_");
+            if(codes.length > 0) {
+                String userCode = codes[0];
+                if(appUserDetailBiz.getUserByCode(userCode)==0) {
+                    return JsonResultUtil.createFailedResult(ResultCode.NOTEXIST_CODE, "邀请人不存在");
+                }
+            }
+        }
+        // 是否已存在
+        AppUserLogin user = appUserLoginBiz.checkeUserLogin(username);
+        if (null != user) {
+            return JsonResultUtil.createFailedResult(ResultCode.EXIST_CODE, "用户已存在");
+        }
+        BaseUserMemberExportDTO exportDTO=findUserMemberByUserIdAndPhone(username);
+        if (exportDTO == null){
+            return JsonResultUtil.createFailedResult(ResultCode.EXIST_CODE, "不是临时会员");
+        }
+        // 新增用户登录信息
+        try {
+            Long now=exportDTO.getCrtTime()/1000L;
+            AppUserLogin appUserLogin = new AppUserLogin();
+            appUserLogin.setUsername(username);
+            appUserLogin.setPassword(password);
+            appUserLogin.setIsdel(0);
+            appUserLogin.setStatus(0);
+            appUserLogin.setCreatetime(now);
+            appUserLogin.setUpdatetime(now);
+            appUserLoginBiz.insertSelective(appUserLogin);
+            Integer userid = appUserLogin.getId();
+            log.info("注册：新增登陆用户信息： " + userid+"---time===="+System.currentTimeMillis()/1000L);
+            // 新增用户详情
+            AppUserDetail rsUserDetail = new AppUserDetail();
+            rsUserDetail.setUserid(userid);
+            rsUserDetail.setNickname(nickname);
+            rsUserDetail.setHeadimgurl(headimgurl); // 默认路径，待写
+            rsUserDetail.setCreatetime(now);
+            rsUserDetail.setUpdatetime(now);
+            rsUserDetail.setIsdel(0);
+            rsUserDetail.setCrtHost(getIp());
+
+            //setCreateIPInfo(rsUserDetail);
+            log.info("注册：解析地址后： " + userid+"---time===="+System.currentTimeMillis()/1000L);
+            //邀请人id关系绑定
+            Integer parentId=0;
+            if (StringUtils.isNotBlank(code)){
+                //判断处理活动关键字
+                String[] codes = code.split("_");
+                if(codes.length > 1) {
+                    code = codes[0];
+                    activityCode = codes[1];
+                }
+                parentId=appUserDetailBiz.getUserByCode(code);
+            }
+            if(parentId!=null&&parentId>0){
+                rsUserDetail.setSource(1);
+                relationBiz.bindRelation(userid, parentId, 1);
+                if(StringUtils.isNotBlank(activityCode)){
+                    rsUserDetail.setInviterAccount(parentId);
+                }
+
+            }
+            //生成邀请码 长度改为8 不然重复率太高
+            rsUserDetail.setCode(ReferralCodeUtil.encode(userid));
+            rsUserDetail.setChannel(channel);
+            appUserDetailBiz.insertSelective(rsUserDetail);
+            log.info("注册：新增用户详情： " + userid+"---time===="+System.currentTimeMillis()/1000L);
+           /* //绑定上下线关系
+            if(parentId!=null&&parentId>0){
+                relationBiz.bindRelation(userid,parentId,1);
+            }*/
+            //临时会员绑定
+            insertUserMemberByUserIdAndPhone(userid, username);
+            log.info("注册：临时会员绑定： " + userid+"---time===="+System.currentTimeMillis()/1000L);
+            //参加新人活动
+            jionActivity(userid);
+            log.info("注册：参加新人活动： " + userid+"---time===="+System.currentTimeMillis()/1000L);
+            //创建钱包
+            walletBiz.createWalletByUserId(appUserLogin.getId());
+            log.info("注册：创建钱包： " + userid+"---time===="+System.currentTimeMillis()/1000L);
+            //临时身份绑定
+            positionTempBiz.setPostionIdByPhone(username);
+            // 登录结果要做做统一处理
+            JSONObject data = autoLogin(userid, username, headimgurl, nickname,code,activityCode,1);
+
+            log.info("注册：登录结果要做做统一处理： " + userid+"---time===="+System.currentTimeMillis()/1000L);
+            // 到im注册，获取返回结果
+            Map<String, Object> map = registerIm(username, appUserLogin.getPassword(), nickname);
+            log.info("注册：到im注册： " + userid+"---time===="+System.currentTimeMillis()/1000L);
+            if (map != null) {
+                Integer imUserId = Integer.parseInt(map.get("userId").toString());
+                //String access_token=map.get("access_token").toString();
+                String imPassword = map.get("password").toString();
+                if (imUserId != null && imUserId > 0 && StringUtils.isNotBlank(imPassword)) {
+                    AppUserLogin userLogin = new AppUserLogin();
+                    userLogin.setId(userid);
+                    userLogin.setImPassword(imPassword);
+                    userLogin.setImUserid(imUserId);
+                    userLogin.setUsername(username);
+                    appUserLoginBiz.updateSelectiveById(userLogin);
+                    log.info(username + "----userLogin updateSelectiveById---username=====" + username + "----imPassword====" + imPassword);
+                }
+                //data.put("imToken",access_token);
+                data.put("imUserId", imUserId);
+            }
+            log.info("注册：处理im账号： " + userid+"---time===="+System.currentTimeMillis()/1000L);
+            if (data != null) {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("userId", userid);
+                jsonObject.put("integralRuleCode", "REGISTER");
+                log.info("注册成功获取积分：发送消息 exchange = {}, routingKey = {}, json = {}", RabbitConstant.INTEGRAL_TOPIC, RabbitConstant.INTEGRAL_ROUTING_KEY, jsonObject.toJSONString());
+                mqSenderFeign.sendMessage(RabbitConstant.INTEGRAL_TOPIC, RabbitConstant.INTEGRAL_ROUTING_KEY, jsonObject.toJSONString());
+                sendQueue(username, password, headimgurl, nickname, null, null, null, 0, code, activityCode, userid,RegisterQueueDTO.SIGN_NEW);
+                log.info("注册：发消息队列： " + userid+"---time===="+System.currentTimeMillis()/1000L);
+                return JsonResultUtil.createSuccessResultWithObj(data);
+            } else {
+                return JsonResultUtil.createDefaultFail();
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return JsonResultUtil.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
+        }
+    }
+
 }

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -110,7 +110,7 @@
 	pl.username AS superiorMobileNumber
     FROM
 	app_user_login l
-    LEFT JOIN app_user_detail d ON d.userid = l.id
+    LEFT JOIN   app_user_detail  d ON d.userid = l.id
     LEFT JOIN app_user_login ul ON ul.id = d.inviter_account
     LEFT JOIN base_user_member m ON d.userid = m.user_id
     LEFT JOIN
@@ -137,6 +137,8 @@
     LEFT JOIN app_user_login pl ON r.parent_id = pl.id
     LEFT JOIN app_user_detail pd ON pl.id = pd.userid
     WHERE
+    d.channel>0
+    and
 	l.id = #{userId}
     </select>
 
@@ -185,9 +187,11 @@
         is_del = 0
         ) r ON l.id = r.user_id
         LEFT JOIN app_user_login pl ON r.parent_id = pl.id
-        LEFT JOIN app_user_detail pd ON pl.id = pd.userid
+        LEFT JOIN app_user_detail  pd ON pl.id = pd.userid
         WHERE
         l.isdel = 0
+        and
+        d.channel>0
         <if test="mobile !=null and mobile !='' ">
             and l.username like CONCAT('%',#{mobile},'%')
         </if>

ace-modules/ace-admin/src/main/resources/mapper/MyWaterMapper.xml

@@ -63,8 +63,8 @@ FROM
 	INNER JOIN ( SELECT `id`, `username` FROM `app_user_login` <if test="phone != null and phone != ''">
      WHERE `username`=#{phone}
 </if> ) AS `aul` ON aul.id = w.user_id
-	INNER JOIN ( SELECT `userid`, `nickname`, `realname` FROM `app_user_detail` <if test="username != null and username != ''">
+	INNER JOIN ( SELECT `userid`, `nickname`, `realname`,channel FROM `app_user_detail` <if test="username != null and username != ''">
     WHERE nickname =#{username}  OR realname =#{username}
-</if> ) AS `aud` ON aud.userid = aul.id ORDER BY `totalAmount` DESC
+</if> ) AS `aud` ON aud.userid = aul.id where aud.channel >0 ORDER BY `totalAmount` DESC
 </select>
 </mapper>
\ No newline at end of file

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;
     }