修改用户二维码生成

src/main/java/com/pangding/web/authority/feign/WxFeign.java

 package com.pangding.web.authority.feign;
 
 import com.pangding.web.authority.vo.WxVo;
-import com.pangding.web.authority.vo.reqvo.QrCodeReqVo;
+import com.pangding.web.vo.wechat.req.code.QrCodeReqVo;
 import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;

src/main/java/com/pangding/web/authority/service/impl/CompanyServiceImpl.java

@@ -25,7 +25,6 @@ import com.pangding.web.util.RSAUtils;
 import com.pangding.web.vo.order.req.CapitalFlowReqVo;
 import com.pangding.web.vo.order.res.CapitalFlowResVo;
 import com.pangding.web.vo.product.pd.merchant.MerchantVo;
-import com.pangding.web.vo.product.req.merchant.MerchantRegVo;
 import com.pangding.web.vo.system.pd.CompanyMsgVo;
 import com.pangding.web.vo.system.pd.authority.RoleVo;
 import com.pangding.web.vo.system.pd.authority.UserRoleVo;
@@ -36,6 +35,9 @@ import com.pangding.web.vo.system.req.authority.RoleReqVo;
 import com.pangding.web.vo.system.req.authority.UserRoleReqVo;
 import com.pangding.web.vo.system.req.company.*;
 import com.pangding.web.vo.system.res.company.*;
+import com.pangding.web.vo.wechat.req.code.QrCodeReqVo;
+import com.pangding.web.vo.wechat.req.code.Scene;
+import com.pangding.web.vo.wechat.req.code.SceneInfo;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.DateHelper;
@@ -823,6 +825,7 @@ public class CompanyServiceImpl implements CompanyService {
         CompanyCodeReqVo companyCodeReqVo = new CompanyCodeReqVo();
         companyCodeReqVo.setCompanyId(reqVo.getCompanyId());
         companyCodeReqVo.setCodeType(reqVo.getCodeType());
+        companyCodeReqVo.setAppid(reqVo.getAppid());
         CompanyCodeVo companyCodeVo = companyCodeDao.load(companyCodeReqVo, CompanyCodeVo.class);
         if (StringHelper.isEmpty(companyCodeVo)) {
             companyCodeVo = new CompanyCodeVo();
@@ -832,6 +835,7 @@ public class CompanyServiceImpl implements CompanyService {
             companyCodeVo.setCreateTime(DateHelper.getNow());
             companyCodeVo.setMsgGroupId(msgGroupId);
             companyCodeVo.setCodeStatus(0);
+            companyCodeVo.setAppid(reqVo.getAppid());
             if (5 == codeType) {
                 companyCodeVo.setCodeLink(miniPayUrl.replace("COMPANYID", companyResVo.getId()));
             } else {
@@ -902,6 +906,7 @@ public class CompanyServiceImpl implements CompanyService {
 //                qrCodeReqVo.setAction_name("QR_STR_SCENE");
 //            } else {
         qrCodeReqVo.setAction_name("QR_LIMIT_STR_SCENE");
+        qrCodeReqVo.setAppid(companyCodeVo.getAppid());
 //            }
         ResponseResult result;
         try {

src/main/java/com/pangding/web/authority/service/impl/UserServiceImpl.java

@@ -211,7 +211,8 @@ public class UserServiceImpl implements UserService {
             String invitationCompanyName = "";
             int invitationCodeType = 0;
             // 分销客户端注册  不需要邀请码
-            if(CompanyConstant.REGISTER_FROM_SALE != saveUserReqVo.getRegisterFrom()){
+            if(StringHelper.isEmpty(saveUserReqVo.getRegisterFrom())
+                    || CompanyConstant.REGISTER_FROM_SALE != saveUserReqVo.getRegisterFrom()){
                 // 验证邀请码是否正确 todo 关联码怎么判断
                 CompanyResVo companyResVo = newCompanyService.checkInvitationCode(saveUserReqVo.getInvitationCode());
                 if(!StringHelper.isEmpty(companyResVo)){
@@ -267,7 +268,8 @@ public class UserServiceImpl implements UserService {
             companyExtendDao.create(companyExtendVo);
 
             // 分销客户端 需保存公司关联表
-            if(CompanyConstant.REGISTER_FROM_SALE == saveUserReqVo.getRegisterFrom()){
+            if(!StringHelper.isEmpty(saveUserReqVo.getRegisterFrom()) &&
+                    CompanyConstant.REGISTER_FROM_SALE == saveUserReqVo.getRegisterFrom()){
                 CompanyRelationVo companyRelationVo = new CompanyRelationVo();
                 companyRelationVo.setCompanyId(companyId);
                 companyRelationVo.setRelationId(saveUserReqVo.getRelationId());

src/main/java/com/pangding/web/authority/vo/Scene.java

-package com.pangding.web.authority.vo;
-
-import com.yanzuoguang.util.vo.BaseVo;
-
-/**
- * @Author zhangjinyao
- * @create 2019/6/6 17:09
- */
-public class Scene extends BaseVo {
-    /**
-     * 场景值ID，临时二维码时为32位非0整型，永久二维码时最大值为100000（目前参数只支持1--100000）
-     */
-    private String scene_id;
-    /**
-     * 场景值ID（字符串形式的ID），字符串类型，长度限制为1到64
-     */
-    private String scene_str;
-
-    public String getScene_id() {
-        return scene_id;
-    }
-
-    public void setScene_id(String scene_id) {
-        this.scene_id = scene_id;
-    }
-
-    public String getScene_str() {
-        return scene_str;
-    }
-
-    public void setScene_str(String scene_str) {
-        this.scene_str = scene_str;
-    }
-}

src/main/java/com/pangding/web/authority/vo/SceneInfo.java

-package com.pangding.web.authority.vo;
-
-import com.yanzuoguang.util.vo.BaseVo;
-
-/**
- * @Author zhangjinyao
- * @create 2019/6/6 16:31
- */
-public class SceneInfo extends BaseVo {
-    private Scene scene;
-
-    public Scene getScene() {
-        return scene;
-    }
-
-    public void setScene(Scene scene) {
-        this.scene = scene;
-    }
-}

src/main/java/com/pangding/web/authority/vo/reqvo/GenerateQrCodeUrlReqVo.java

@@ -21,6 +21,8 @@ public class GenerateQrCodeUrlReqVo {
 
     private int select;
 
+    private String appid;
+
     public String getReqId() {
         return reqId;
     }
@@ -76,4 +78,12 @@ public class GenerateQrCodeUrlReqVo {
     public void setMsgId(String msgId) {
         this.msgId = msgId;
     }
+
+    public String getAppid() {
+        return appid;
+    }
+
+    public void setAppid(String appid) {
+        this.appid = appid;
+    }
 }

src/main/java/com/pangding/web/authority/vo/reqvo/QrCodeReqVo.java

-package com.pangding.web.authority.vo.reqvo;
-
-import com.pangding.web.authority.vo.SceneInfo;
-import com.yanzuoguang.util.vo.BaseVo;
-
-/**
- * @Author zhangjinyao
- * @create 2019/6/6 16:23
- */
-public class QrCodeReqVo extends BaseVo {
-    private String reqId;
-    /**
-     * 该二维码有效时间，以秒为单位。 最大不超过2592000（即30天），此字段如果不填，则默认有效期为30秒。
-     */
-    private int expire_seconds;
-    /**
-     * 二维码类型，QR_SCENE为临时的整型参数值，QR_STR_SCENE为临时的字符串参数值，QR_LIMIT_SCENE为永久的整型参数值，QR_LIMIT_STR_SCENE为永久的字符串参数值
-     */
-    private String action_name;
-    /**
-     * 二维码详细信息
-     */
-    private SceneInfo action_info;
-    /**
-     * 二维码下载标识
-     */
-    private String ticket;
-
-    public String getReqId() {
-        return reqId;
-    }
-
-    public void setReqId(String reqId) {
-        this.reqId = reqId;
-    }
-
-    public String getTicket() {
-        return ticket;
-    }
-
-    public void setTicket(String ticket) {
-        this.ticket = ticket;
-    }
-
-    public int getExpire_seconds() {
-        return expire_seconds;
-    }
-
-    public void setExpire_seconds(int expire_seconds) {
-        this.expire_seconds = expire_seconds;
-    }
-
-    public String getAction_name() {
-        return action_name;
-    }
-
-    public void setAction_name(String action_name) {
-        this.action_name = action_name;
-    }
-
-    public SceneInfo getAction_info() {
-        return action_info;
-    }
-
-    public void setAction_info(SceneInfo action_info) {
-        this.action_info = action_info;
-    }
-}