新增设备，修改注册流程

src/main/java/com/pangding/web/authority/controller/CompanyCodeController.java

@@ -31,6 +31,16 @@ public class CompanyCodeController {
         return ResponseResult.result(companyCodeService.findCodeLink(req));
     }
 
+    @RequestMapping(value = "/findCodeLinkByOldLink")
+    @ApiOperation(value = "查询商户跳转链接地址", notes = "返回商户需要跳转的连接地址.")
+    public ResponseResult<CompanyCodeResVo> findCodeLinkByOldLink(@RequestBody CompanyCodeReqVo req) {
+        CheckerHelper.newInstance()
+                .notBlankCheck("companyId", req.getCompanyId())
+                .notBlankCheck("codeType", req.getCodeType())
+                .checkException();
+        return ResponseResult.result(companyCodeService.findCodeLink(req));
+    }
+
     @RequestMapping(value = "/findCodeList")
     @ApiOperation(value = "查询商户二维码列表", notes = "返回商户二维码列表")
     public ResponseResult findCodeList(@RequestBody CompanyCodeReqVo req) {

src/main/java/com/pangding/web/authority/controller/CompanyManagementController.java

@@ -108,6 +108,7 @@ public class CompanyManagementController {
     public ResponseResult<String> generateQrCodeUrl(@RequestBody GenerateQrCodeUrlReqVo reqVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("companyId",reqVo.getCompanyId())
+                .notBlankCheck("merchantId", reqVo.getMerchantId())
                 .notBlankCheck("select",reqVo.getSelect())
                 .checkException();
         return ResponseResult.result(companyServiceImpl.generateQrCodeUrl(reqVo));

src/main/java/com/pangding/web/authority/controller/PangdingManagementController.java

@@ -291,7 +291,6 @@ public class PangdingManagementController {
         CheckerHelper.newInstance()
                 .notBlankCheck("qrCode",reqVo.getQrCode())
                 .checkException();
-        System.out.println("change");
         return ResponseResult.resultAllowNull(companyServiceImpl.getCompanyByQrCode(reqVo));
     }
 

src/main/java/com/pangding/web/authority/dao/impl/CompanyMsgDaoImpl.java

@@ -19,9 +19,10 @@ public class CompanyMsgDaoImpl extends BaseDaoImpl implements CompanyMsgDao {
 
         register(CompanyMsgVo.class);
 
-        table.add(QUERY_LIST, "select m.*,cm.company_id,cm.type " +
+        table.add(QUERY_LIST, "select m.*,cm.company_id,cm.type,cm.merchant_id " +
                 "from pd_company_msg cm left join pd_msg m on cm.msg_id = m.id where 1=1 ")
                 .add("companyId", "and cm.company_id = ? ")
+                .add("", " AND cm.merchantId = ? ")
                 .add("type", "and cm.type = ? ");
 
     }

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

@@ -18,6 +18,7 @@ import com.pangding.web.mq.CompanyProducer;
 import com.pangding.web.util.RSAUtils;
 import com.pangding.web.vo.order.req.CapitalFlowReqVo;
 import com.pangding.web.vo.product.pd.merchant.MerchantVo;
+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.UserVo;
 import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
@@ -647,24 +648,19 @@ public class CompanyServiceImpl implements CompanyService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String generateQrCodeUrl(GenerateQrCodeUrlReqVo reqVo) {
-        CompanyExtendGetReqVo reqVo1 = new CompanyExtendGetReqVo();
-        reqVo1.setId(reqVo.getCompanyId());
-        CompanyExtendVo companyExtendVo = companyExtendDao.load(reqVo1, CompanyExtendVo.class);
-        if (null == companyExtendVo) {
-            companyExtendVo = new CompanyExtendVo();
-            companyExtendVo.setId(reqVo.getCompanyId());
-            companyExtendDao.save(companyExtendVo);
-        }
-        String url = companyExtendVo.getQrCodeUrl();
-        if (null != url && !url.isEmpty() && reqVo.getSelect() == 1) {
-            return url;
+        com.pangding.web.vo.system.res.company.CompanyResVo companyResVo = companyDao.load(reqVo.getCompanyId(), com.pangding.web.vo.system.res.company.CompanyResVo.class);
+//        CompanyExtendVo companyExtendVo = companyExtendDao.load(reqVo.getCompanyId(), CompanyExtendVo.class);
+        CompanyExtendVo companyExtendVo = new CompanyExtendVo();
+        if (StringHelper.isEmpty(companyResVo)) {
+           throw new CodeException("公司信息不存在");
         }
-        String qrCode = companyExtendVo.getQrCode();
-        if (null == qrCode || qrCode.isEmpty()) {
+        ObjectHelper.writeWithFrom(companyExtendVo, companyResVo);
+        if(StringHelper.isEmpty(companyResVo.getQrCode())){
             String code = DateHelper.getNow()
                     .replace("-", "")
                     .replace(":", "")
                     .replace(" ", "");
+            ObjectHelper.writeWithFrom(companyExtendVo, companyResVo);
             companyExtendVo.setQrCode(code);
         }
         int select = reqVo.getSelect();
@@ -677,27 +673,43 @@ public class CompanyServiceImpl implements CompanyService {
         scene.setScene_str(companyExtendVo.getQrCode());
         sceneInfo.setScene(scene);
         qrCodeReqVo.setAction_info(sceneInfo);
-        if (select == 0) {
-            qrCodeReqVo.setExpire_seconds(60 * 30);
-            qrCodeReqVo.setAction_name("QR_STR_SCENE");
-        } else {
+//            if (select == 0) {
+//                qrCodeReqVo.setExpire_seconds(60 * 30);
+//                qrCodeReqVo.setAction_name("QR_STR_SCENE");
+//            } else {
         qrCodeReqVo.setAction_name("QR_LIMIT_STR_SCENE");
-        }
+//            }
         ResponseResult result;
         try {
-
             result = wxFeign.qcCodeGet(qrCodeReqVo);
         } catch (CodeException e) {
             throw new CodeException(e.getCode(), e.getMessage());
         }
 
         WxVo wxVo = (WxVo) result.getData();
-        String qrCodeUrl = wxVo.getPdUrl();
+        String url = wxVo.getPdUrl();
         if ("QR_LIMIT_STR_SCENE".equals(qrCodeReqVo.getAction_name())) {
-            companyExtendVo.setQrCodeUrl(qrCodeUrl);
+            companyExtendVo.setQrCodeUrl(url);
             companyExtendDao.update(companyExtendVo);
         }
-        return qrCodeUrl;
+        com.pangding.web.vo.system.req.CompanyMsgReqVo companyMsgReqVo = new com.pangding.web.vo.system.req.CompanyMsgReqVo();
+        companyMsgReqVo.setCompanyId(companyResVo.getId());
+        companyMsgReqVo.setMerchantId("");
+        CompanyMsgVo companyMsgVo = companyMsgDao.load(companyMsgReqVo, CompanyMsgVo.class);
+        if(StringHelper.isEmpty(companyMsgVo)){
+            companyMsgVo = new CompanyMsgVo();
+            companyMsgVo.setId(StringHelper.getNewID());
+            companyMsgVo.setCompanyId(companyResVo.getId());
+            companyMsgVo.setMerchantId("");
+            companyMsgVo.setCompanyName(companyResVo.getCompanyName());
+            companyMsgVo.setMerchantName("");
+            companyMsgVo.setMsgId("4");
+            companyMsgVo.setMsgLocation(1);
+            companyMsgVo.setType(1);
+            companyMsgDao.create(companyMsgVo);
+        }
+        return url;
+
     }
 
     /**

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

@@ -16,6 +16,7 @@ import com.pangding.web.vo.system.pd.company.CompanyVo;
 import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.DateHelper;
+import com.yanzuoguang.util.helper.StringHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -244,7 +245,7 @@ public class PangdingPartnerServiceImpl implements PangdingPartnerService {
             companyExtendDaoImpl.create(companyExtendVo);
         }
         String invitationCode = companyExtendVo.getInvitationCode();
-        if (null == invitationCode){
+        if (StringHelper.isEmpty(invitationCode)){
             invitationCode = ShareCodeUtil.toSerialCode((new Date()).getTime());
             companyExtendVo.setInvitationCode(invitationCode);
             companyExtendDaoImpl.update(companyExtendVo);

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

@@ -11,6 +11,7 @@ import com.pangding.web.authority.vo.resvo.AuthorityListByLevelResVo;
 import com.pangding.web.authority.vo.resvo.LoginCompanyResVo;
 import com.pangding.web.authority.vo.resvo.SaveCompanyResVo;
 import com.pangding.web.util.RSAUtils;
+import com.pangding.web.vo.product.pd.merchant.MerchantVo;
 import com.pangding.web.vo.system.pd.LoginTokenVo;
 import com.pangding.web.vo.system.pd.authority.AuthorityVo;
 import com.pangding.web.vo.system.pd.authority.UserVo;
@@ -415,6 +416,27 @@ public class RegisterServiceImpl implements RegisterService {
         loginCompanyResVo.setCompanyBankCardVo(companyBankCardVo);
         resVo.setCompanyResVo(loginCompanyResVo);
 
+         /*获取商家信息*/
+        CompanyScenicInfoReqVo companyScenicInfoReqVo = new CompanyScenicInfoReqVo();
+        companyScenicInfoReqVo.setReqId(StringHelper.getNewID());
+        companyScenicInfoReqVo.setCompanyId(companyVo.getId());
+        companyScenicInfoReqVo.setProductOrInterface(0);
+        ResponseResult result = new ResponseResult();
+        try {
+            result = storeFeign.getCompanyScenicInfo(companyScenicInfoReqVo);
+        } catch (Exception e) {
+            resVo.setMerchant(null);
+        }
+        MerchantVo merchant = (MerchantVo) result.getData();
+        resVo.setMerchant(merchant);
+
+
+        /*获取用户权限列表*/
+        RoleAuthorityGetReqVo roleAuthorityGetReqVo = new RoleAuthorityGetReqVo();
+        roleAuthorityGetReqVo.setUserId(userVo.getId());
+        List<AuthorityListByLevelResVo> roleAuthorityVoList = roleAuthorityDaoImpl.loadList(roleAuthorityGetReqVo, AuthorityListByLevelResVo.class);
+        resVo.setAuthorityListByLevel(AuthorityServiceImpl.getChildList(roleAuthorityVoList, false));
+
         // 判断基本信息是否完善，及状态是否为2，且为个人用户，若不完善则跳转个人完善页面
         if (companyVo.getStatus() < (CompanyConstant.COMPANY_STATUS_BIND_PHONE) && CompanyConstant.COMPANY_TYPE_PERSON == (companyVo.getCompanyType())) {
             resVo.setCode("01");
@@ -445,8 +467,6 @@ public class RegisterServiceImpl implements RegisterService {
             return resVo;
         }*/
 
-
-
         if (companyBankCardVoList == null || companyBankCardVoList.isEmpty()) {
             /*该公司没有银行卡，需要跳转添加银行卡*/
             resVo.setCode("03");
@@ -456,26 +476,6 @@ public class RegisterServiceImpl implements RegisterService {
         loginCompanyResVo.setBankCardVoList(companyBankCardVoList);
         resVo.setCompanyResVo(loginCompanyResVo);
 
-        /*获取商家信息*/
-        CompanyScenicInfoReqVo companyScenicInfoReqVo = new CompanyScenicInfoReqVo();
-        companyScenicInfoReqVo.setReqId(StringHelper.getNewID());
-        companyScenicInfoReqVo.setCompanyId(companyVo.getId());
-        companyScenicInfoReqVo.setProductOrInterface(0);
-        ResponseResult result = new ResponseResult();
-//        try {
-//            result = storeFeign.getCompanyScenicInfo(companyScenicInfoReqVo);
-//        } catch (Exception e) {
-//            resVo.setMerchant(null);
-//        }
-//        MerchantVo merchant = (MerchantVo) result.getData();
-//        resVo.setMerchant(merchant);
-
-        /*获取用户权限列表*/
-        RoleAuthorityGetReqVo roleAuthorityGetReqVo = new RoleAuthorityGetReqVo();
-        roleAuthorityGetReqVo.setUserId(userVo.getId());
-        List<AuthorityListByLevelResVo> roleAuthorityVoList = roleAuthorityDaoImpl.loadList(roleAuthorityGetReqVo, AuthorityListByLevelResVo.class);
-        resVo.setAuthorityListByLevel(AuthorityServiceImpl.getChildList(roleAuthorityVoList, false));
-
         resVo.setCode("00");
         return resVo;
     }

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

 package com.pangding.web.authority.vo.reqvo;
 
+import io.swagger.annotations.ApiModelProperty;
+
 /**
  * @Author zhangjinyao
  * @create 2019/5/23 19:26
  */
 public class GenerateQrCodeUrlReqVo {
     private String reqId;
-
+    @ApiModelProperty(notes = "公司id")
     private String companyId;
+    @ApiModelProperty(notes = "商户id")
+    private String merchantId;
+    @ApiModelProperty(notes = "商户名称")
+    private String merchantName;
 
     private int select;
 
@@ -34,4 +40,20 @@ public class GenerateQrCodeUrlReqVo {
     public void setSelect(int select) {
         this.select = select;
     }
+
+    public String getMerchantId() {
+        return merchantId;
+    }
+
+    public void setMerchantId(String merchantId) {
+        this.merchantId = merchantId;
+    }
+
+    public String getMerchantName() {
+        return merchantName;
+    }
+
+    public void setMerchantName(String merchantName) {
+        this.merchantName = merchantName;
+    }
 }

src/main/java/com/pangding/web/authority/vo/resvo/GetCompanyMsgResVo.java

@@ -5,6 +5,8 @@ public class GetCompanyMsgResVo{
 
     private String companyId;
 
+    private String merchantId;
+
     private String companyName;
 
     private String msgId;
@@ -102,4 +104,12 @@ public class GetCompanyMsgResVo{
     public void setMsgSort(int msgSort) {
         this.msgSort = msgSort;
     }
+
+    public String getMerchantId() {
+        return merchantId;
+    }
+
+    public void setMerchantId(String merchantId) {
+        this.merchantId = merchantId;
+    }
 }