Merge branch 'master' into wechat-pay

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

@@ -92,12 +92,14 @@ public class InnerController {
         if (user == null) {
             user = new User();
         }
+        if (org.apache.commons.lang.StringUtils.isEmpty(user.getUuid())) {
+            user.setUuid(uuid);
+        }
         user.setPhoneNo(phoneNo);
         user.setCreatedAt(new Timestamp(createdAt));
         user.setUpdatedAt(new Timestamp(updatedAt));
         user.setEnable(true);
         user.setRegisteredFrom(registeredFrom);
-        user.setUuid(uuid);
         user.setPassword(password);
         user = userService.saveUser(user);
         UserRet userRet = null;
@@ -232,6 +234,7 @@ public class InnerController {
         for (Contact c : contacts) {
             c.setId(null);
             c.setUserId(userId);
+            c.setRelation(c.getRelation() == null ? Relation.OTHER : c.getRelation());
             c.setCreatedAt(now);
             c.setUpdateAt(now);
         }

src/main/java/cn/quantgroup/xyqb/controller/external/user/WeChatController.java

@@ -399,7 +399,10 @@ public class WeChatController implements IBaseController {
             LOGGER.info("微信登录:redirect不为null,创建session跳到指定前端页面.");
             AuthBean authBean = sessionService.createSession(Constants.Channel.WECHAT, Constants.Channel.WECHAT, "", user, merchant);
             LOGGER.info("微信登录:跳转地址{}", url + "/weixin/callback?phoneNo=" + user.getPhoneNo() + "&token=" + authBean.getToken());
-            return url + "/weixin/callback?phoneNo=" + user.getPhoneNo() + "&token=" + authBean.getToken();
+            Long channelId = "baitiao".equals(merchant.getName()) ? 222L : 1L;
+            String target = "baitiao".equals(merchant.getName()) ? "cashTarget5" : "cashTarget4";
+            return url + "/landing?token=" + authBean.getToken() + "&registerFrom=" + registerFrom+
+              "&channelId=" + channelId +"&key=" + merchant.getName() +"&target=" + target + "&isWechat=true";
         }
         return null;
     }

src/main/java/cn/quantgroup/xyqb/entity/UserExtInfo.java

 package cn.quantgroup.xyqb.entity;
 
 import cn.quantgroup.xyqb.entity.enumerate.*;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import lombok.Data;
 
 import javax.persistence.*;