修改消息发送

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

@@ -25,9 +25,10 @@ public class CompanyMsgDaoImpl extends BaseDaoImpl implements CompanyMsgDao {
 
         table.add(QUERY_LIST_PAGE, "select m.*,cm.msg_id,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("companyId", " AND cm.company_id = ? ")
                 .add("merchantId", " AND cm.merchant_id = ? ")
-                .add("type", "and cm.type = ? ");
+                .add("msgId", " AND cm.msg_id = ? ")
+                .add("type", " AND cm.type = ? ");
 
     }
 

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

@@ -37,10 +37,18 @@ public class CompanyCodeServiceImpl implements CompanyCodeService {
 
     @Override
     public String saveComapnyCode(CompanyCodeReqVo req){
-        CompanyCodeVo companyCodeVo = new CompanyCodeVo();
+        CompanyCodeReqVo companyCodeReqVo = new CompanyCodeReqVo();
+        companyCodeReqVo.setCompanyId(req.getCompanyId());
+        companyCodeReqVo.setCodeCode(req.getCodeCode());
+        companyCodeReqVo.setCodeType(req.getCodeType());
+        CompanyCodeVo companyCodeVo = companyCodeDao.load(companyCodeReqVo, CompanyCodeVo.class);
+        if(StringHelper.isEmpty(companyCodeVo)){
+            companyCodeVo = new CompanyCodeVo();
             ObjectHelper.writeWithFrom(companyCodeVo, req);
             companyCodeVo.setCompanyCodeId(StringHelper.getNewID());
-        return companyCodeDao.create(companyCodeVo);
+            companyCodeDao.create(companyCodeVo);
+        }
+        return "";
     }
 
 }

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

@@ -23,24 +23,17 @@ 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;
 import com.pangding.web.vo.system.pd.authority.UserVo;
-import com.pangding.web.vo.system.pd.company.CompanyBankCardVo;
-import com.pangding.web.vo.system.pd.company.CompanyDivideRuleVo;
-import com.pangding.web.vo.system.pd.company.CompanyExtendVo;
-import com.pangding.web.vo.system.pd.company.CompanyVo;
+import com.pangding.web.vo.system.pd.company.*;
 import com.pangding.web.vo.system.req.CompanyMsgReqVo;
 import com.pangding.web.vo.system.req.authority.UserRoleReqVo;
 import com.pangding.web.vo.system.req.company.CompanyBankCardReqVo;
 import com.pangding.web.vo.system.req.company.CompanyCodeReqVo;
 import com.pangding.web.vo.system.req.company.CompanyMoneyDetailReqVo;
 import com.pangding.web.vo.system.req.company.CompanyMoneyUpdateReqVo;
-import com.pangding.web.vo.system.res.company.CompanyExtendResVo;
-import com.pangding.web.vo.system.res.company.CompanyMoneyDetailResVo;
-import com.pangding.web.vo.system.res.company.CompanyResVo;
-import com.pangding.web.vo.system.res.company.FindCompanyBalanceResVo;
+import com.pangding.web.vo.system.res.company.*;
 import com.yanzuoguang.util.base.ObjectHelper;
 import com.yanzuoguang.util.exception.CodeException;
 import com.yanzuoguang.util.helper.DateHelper;
-import com.yanzuoguang.util.helper.JsonHelper;
 import com.yanzuoguang.util.helper.StringHelper;
 import com.yanzuoguang.util.vo.PageSizeData;
 import com.yanzuoguang.util.vo.ResponseResult;
@@ -70,6 +63,8 @@ public class CompanyServiceImpl implements CompanyService {
     @Autowired
     private UserDao userDao;
     @Autowired
+    private CompanyCodeDao companyCodeDao;
+    @Autowired
     private PayFeign payFeign;
     @Autowired
     private StoreFeign storeFeign;
@@ -662,28 +657,172 @@ public class CompanyServiceImpl implements CompanyService {
     @Transactional(rollbackFor = Exception.class)
     public String generateQrCodeUrl(GenerateQrCodeUrlReqVo reqVo) {
         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("公司信息不存在");
+            throw new CodeException("公司不存在");
+        }
+        int codeType = 0;
+        String msgGroupId = payMsgId;
+        if (2 == reqVo.getCodeType()) {
+            codeType = 4;
+            msgGroupId = groupProductMsgId;
+        }
+        if (1 == reqVo.getCodeType()) {
+            codeType = 1;
+        }
+        if(!StringHelper.isEmpty(reqVo.getMsgId())){
+            msgGroupId = reqVo.getMsgId();
         }
-        ObjectHelper.writeWithFrom(companyExtendVo, companyResVo);
-        if (StringHelper.isEmpty(companyResVo.getQrCode())) {
+        reqVo.setCodeType(codeType);
+        CompanyCodeReqVo companyCodeReqVo = new CompanyCodeReqVo();
+        companyCodeReqVo.setCompanyId(reqVo.getCompanyId());
+        companyCodeReqVo.setCodeType(reqVo.getCodeType());
+        CompanyCodeVo companyCodeVo = companyCodeDao.load(companyCodeReqVo, CompanyCodeVo.class);
+        if (StringHelper.isEmpty(companyCodeVo)) {
+            String code = DateHelper.getNow()
+                    .replace("-", "")
+                    .replace(":", "")
+                    .replace(" ", "");
+            companyCodeVo = new CompanyCodeVo();
+            companyCodeVo.setCompanyCodeId(StringHelper.getNewID());
+            companyCodeVo.setCompanyId(reqVo.getCompanyId());
+            companyCodeVo.setCodeType(reqVo.getCodeType());
+            companyCodeVo.setCodeCode(code);
+            companyCodeVo.setCreateTime(DateHelper.getNow());
+            companyCodeVo.setMsgGroupId(msgGroupId);
+            companyCodeVo.setCodeStatus(0);
+            // 获取微信二维码
+            companyCodeVo = getWeixinCode(0, companyCodeVo);
+            companyCodeDao.create(companyCodeVo);
+        }
+        if (StringHelper.isEmpty(companyCodeVo.getCodeCode())) {
             String code = DateHelper.getNow()
                     .replace("-", "")
                     .replace(":", "")
                     .replace(" ", "");
-            ObjectHelper.writeWithFrom(companyExtendVo, companyResVo);
-            companyExtendVo.setQrCode(code);
+            companyCodeVo.setCodeCode(code);
+            companyCodeVo.setMsgGroupId(msgGroupId);
+            // 获取微信二维码
+            companyCodeVo = getWeixinCode(0, companyCodeVo);
+            companyCodeDao.update(companyCodeVo);
+        }
+        if (StringHelper.isEmpty(companyCodeVo.getCodeImgUrl())) {
+            // 获取微信二维码
+            companyCodeVo = getWeixinCode(0, companyCodeVo);
+            companyCodeVo.setMsgGroupId(msgGroupId);
+            companyCodeDao.update(companyCodeVo);
         }
-        int select = reqVo.getSelect();
+        com.pangding.web.vo.system.req.CompanyMsgReqVo companyMsgReqVo = new com.pangding.web.vo.system.req.CompanyMsgReqVo();
+        companyMsgReqVo.setCompanyId(companyCodeVo.getCompanyId());
+        companyMsgReqVo.setMsgId(msgGroupId);
+        companyMsgReqVo.setMerchantId("");
+        CompanyMsgVo companyMsgVo = companyMsgDao.load(companyMsgReqVo, CompanyMsgVo.class);
+        if (StringHelper.isEmpty(companyMsgVo)) {
+            companyMsgVo = new CompanyMsgVo();
+            companyMsgVo.setId(StringHelper.getNewID());
+            companyMsgVo.setCompanyId(companyCodeVo.getCompanyId());
+            companyMsgVo.setMerchantId(reqVo.getMerchantId());
+            companyMsgVo.setCompanyName(companyResVo.getCompanyName());
+            companyMsgVo.setMerchantName("");
+            companyMsgVo.setMsgId(msgGroupId);
+            companyMsgVo.setMsgLocation(1);
+            companyMsgVo.setType(companyResVo.getCompanyAttribute());
+            companyMsgDao.create(companyMsgVo);
+        }
+
+        return companyCodeVo.getCodeImgUrl();
+
+//        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("公司信息不存在");
+//        }
+//        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();
+//        /*此处应调用微信接口传入qrCode和select获取qrCodeUrl*/
+//        QrCodeReqVo qrCodeReqVo = new QrCodeReqVo();
+//        qrCodeReqVo.setReqId(reqVo.getReqId());
+//        /*临时二维码，超时时间30分钟*/
+//        SceneInfo sceneInfo = new SceneInfo();
+//        Scene scene = new Scene();
+//        scene.setScene_str(companyCodeVo.getCodeCode());
+//        sceneInfo.setScene(scene);
+//        qrCodeReqVo.setAction_info(sceneInfo);
+////            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 url = wxVo.getPdUrl();
+//        if ("QR_LIMIT_STR_SCENE".equals(qrCodeReqVo.getAction_name())) {
+//            companyExtendVo.setQrCodeUrl(url);
+//            companyExtendDao.update(companyExtendVo);
+//        }
+//        com.pangding.web.vo.system.req.CompanyMsgReqVo companyMsgReqVo = new com.pangding.web.vo.system.req.CompanyMsgReqVo();
+//        companyMsgReqVo.setCompanyId(companyCodeVo.getCompanyId());
+//        companyMsgReqVo.setMerchantId("");
+//        CompanyMsgVo companyMsgVo = companyMsgDao.load(companyMsgReqVo, CompanyMsgVo.class);
+//        if (StringHelper.isEmpty(companyMsgVo)) {
+//            companyMsgVo = new CompanyMsgVo();
+//            companyMsgVo.setId(StringHelper.getNewID());
+//            companyMsgVo.setCompanyId(companyCodeVo.getCompanyId());
+//            companyMsgVo.setMerchantId(reqVo.getMerchantId());
+//            companyMsgVo.setCompanyName("");
+//            companyMsgVo.setMerchantName("");
+//            if (2 == reqVo.getCodeType()) {
+//                companyMsgVo.setMsgId(groupProductMsgId);
+//            } else {
+//                companyMsgVo.setMsgId(payMsgId);
+//            }
+//            companyMsgVo.setMsgLocation(1);
+//            companyMsgVo.setType(companyResVo.getCompanyAttribute());
+//            companyMsgDao.create(companyMsgVo);
+//        }
+//        CompanyCodeReqVo companyCodeReqVo = new CompanyCodeReqVo();
+//        companyCodeReqVo.setCompanyId(companyResVo.getId());
+//        if (2 == reqVo.getCodeType()) {
+//            companyCodeReqVo.setCodeType(4);
+//            companyCodeReqVo.setCodeCode(companyResVo.getQrCode());
+//        }
+//        if (1 == reqVo.getCodeType()) {
+//            companyCodeReqVo.setCodeType(1);
+//            companyCodeReqVo.setCodeCode(companyResVo.getQrCode());
+//        }
+//        companyCodeReqVo.setCodeLink("");
+//        companyCodeReqVo.setCodeImgUrl(url);
+//        companyCodeReqVo.setCodeValidityType(0);
+//        companyCodeReqVo.setSubscribe(1);
+//        companyCodeReqVo.setMsgGroupId("");
+//        companyCodeReqVo.setCreateTime(DateHelper.getNow());
+//        companyCodeService.saveComapnyCode(companyCodeReqVo);
+//        return url;
+
+    }
+
+    public CompanyCodeVo getWeixinCode(int select, CompanyCodeVo companyCodeVo) {
         /*此处应调用微信接口传入qrCode和select获取qrCodeUrl*/
         QrCodeReqVo qrCodeReqVo = new QrCodeReqVo();
-        qrCodeReqVo.setReqId(reqVo.getReqId());
         /*临时二维码，超时时间30分钟*/
         SceneInfo sceneInfo = new SceneInfo();
         Scene scene = new Scene();
-        scene.setScene_str(companyExtendVo.getQrCode());
+        scene.setScene_str(companyCodeVo.getCodeCode());
         sceneInfo.setScene(scene);
         qrCodeReqVo.setAction_info(sceneInfo);
 //            if (select == 0) {
@@ -702,48 +841,9 @@ public class CompanyServiceImpl implements CompanyService {
         WxVo wxVo = (WxVo) result.getData();
         String url = wxVo.getPdUrl();
         if ("QR_LIMIT_STR_SCENE".equals(qrCodeReqVo.getAction_name())) {
-            companyExtendVo.setQrCodeUrl(url);
-            companyExtendDao.update(companyExtendVo);
+            companyCodeVo.setCodeImgUrl(url);
         }
-        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(reqVo.getMerchantId());
-            companyMsgVo.setCompanyName(companyResVo.getCompanyName());
-            companyMsgVo.setMerchantName("");
-            if (2 == reqVo.getCodeType()) {
-                companyMsgVo.setMsgId(groupProductMsgId);
-            } else {
-                companyMsgVo.setMsgId(payMsgId);
-            }
-            companyMsgVo.setMsgLocation(1);
-            companyMsgVo.setType(companyResVo.getCompanyAttribute());
-            companyMsgDao.create(companyMsgVo);
-        }
-        CompanyCodeReqVo companyCodeReqVo = new CompanyCodeReqVo();
-        companyCodeReqVo.setCompanyId(companyResVo.getId());
-        if (2 == reqVo.getCodeType()) {
-            companyCodeReqVo.setCodeType(4);
-            companyCodeReqVo.setCodeCode(companyResVo.getQrCode());
-        }
-        if (1 == reqVo.getCodeType()){
-            companyCodeReqVo.setCodeType(1);
-            companyCodeReqVo.setCodeCode(companyResVo.getQrCode());
-        }
-        companyCodeReqVo.setCodeLink("");
-        companyCodeReqVo.setCodeImgUrl(url);
-        companyCodeReqVo.setCodeValidityType(0);
-        companyCodeReqVo.setSubscribe(1);
-        companyCodeReqVo.setMsgGroupId("");
-        companyCodeReqVo.setCreateTime(DateHelper.getNow());
-        companyCodeService.saveComapnyCode(companyCodeReqVo);
-        return url;
-
+        return companyCodeVo;
     }
 
     /**
@@ -890,24 +990,38 @@ public class CompanyServiceImpl implements CompanyService {
      */
     @Override
     public GetCompanyResVo getCompanyByQrCode(GetCompanyByQrCodeReqVo reqVo) {
-        CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
-        companyExtendGetReqVo.setQrCode(reqVo.getQrCode());
-        CompanyExtendVo companyExtendVo = companyExtendDao.load(companyExtendGetReqVo, CompanyExtendVo.class);
-        if (null != companyExtendVo) {
-            CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
-            companyGetReqVo.setId(companyExtendVo.getId());
-            GetCompanyResVo companyVo = companyDao.load(companyGetReqVo, GetCompanyResVo.class);
-            if (null != companyVo) {
+//        CompanyExtendGetReqVo companyExtendGetReqVo = new CompanyExtendGetReqVo();
+//        companyExtendGetReqVo.setQrCode(reqVo.getQrCode());
+//        CompanyExtendVo companyExtendVo = companyExtendDao.load(companyExtendGetReqVo, CompanyExtendVo.class);
+//        if (null != companyExtendVo) {
+//            CompanyGetReqVo companyGetReqVo = new CompanyGetReqVo();
+//            companyGetReqVo.setId(companyExtendVo.getId());
+//            GetCompanyResVo companyVo = companyDao.load(companyGetReqVo, GetCompanyResVo.class);
+//            if (null != companyVo) {
+//                CompanyMsgReqVo companyMsgReqVo = new CompanyMsgReqVo();
+//                companyMsgReqVo.setCompanyId(companyVo.getId());
+//                companyMsgReqVo.setType(companyVo.getCompanyAttribute());
+//                List<GetCompanyMsgResVo> companyMsgVoList = companyMsgDao.findCompanyMsgList(companyMsgReqVo);
+//                companyVo.setMsgList(companyMsgVoList);
+//            }
+//            return companyVo;
+//        }
+
+        CompanyCodeReqVo companyCodeReqVo = new CompanyCodeReqVo();
+        companyCodeReqVo.setCodeCode(reqVo.getQrCode());
+        CompanyCodeResVo companyCodeResVo = companyCodeDao.load(companyCodeReqVo, CompanyCodeResVo.class);
+        if (StringHelper.isEmpty(companyCodeResVo)) {
+            throw new CodeException("未找到公司信息");
+        }
+        GetCompanyResVo companyVo = companyDao.load(companyCodeResVo.getCompanyId(), GetCompanyResVo.class);
+
         CompanyMsgReqVo companyMsgReqVo = new CompanyMsgReqVo();
-                companyMsgReqVo.setCompanyId(companyVo.getId());
-                companyMsgReqVo.setType(companyVo.getCompanyAttribute());
+        companyMsgReqVo.setCompanyId(companyCodeResVo.getCompanyId());
+        companyMsgReqVo.setMsgId(companyCodeResVo.getMsgGroupId());
         List<GetCompanyMsgResVo> companyMsgVoList = companyMsgDao.findCompanyMsgList(companyMsgReqVo);
         companyVo.setMsgList(companyMsgVoList);
-            }
         return companyVo;
     }
-        return null;
-    }
 
     @Override
     public List<GetCompanyDivideResVo> findCompanyDivideInfo(CompanyDivideReqVo req) {
@@ -915,11 +1029,11 @@ public class CompanyServiceImpl implements CompanyService {
         List<GetCompanyReqVo> companyList = req.getCompanyIdList();
         for (int i = 0; i < companyList.size(); i++) {
             GetCompanyReqVo getCompanyReqVo = companyList.get(i);
-            if("1ef73ca537fb494ca02b9e320a6883cf".equals(getCompanyReqVo.getCompanyId())){
+            if ("1ef73ca537fb494ca02b9e320a6883cf".equals(getCompanyReqVo.getCompanyId())) {
                 getCompanyReqVo.setCompanyId("6da527f930be4aa1904fe17fcb41874f");
             }
             GetCompanyDivideResVo companyDivideResVo = companyDivideRuleDao.findCompanyDivideInfo(getCompanyReqVo);
-            if(!StringHelper.isEmpty(companyDivideResVo)){
+            if (!StringHelper.isEmpty(companyDivideResVo)) {
                 companyDivideResVo.setCompanyChannelType(getCompanyReqVo.getCompanyChannelType());
                 companyDivideResVoList.add(companyDivideResVo);
             }

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

@@ -16,6 +16,8 @@ public class GenerateQrCodeUrlReqVo {
     private String merchantName;
     @ApiModelProperty(notes = "二维码类型，1支付码， 2 营销码")
     public Integer codeType;
+    @ApiModelProperty(notes = "推送消息id")
+    public String msgId;
 
     private int select;
 
@@ -66,4 +68,12 @@ public class GenerateQrCodeUrlReqVo {
     public void setCodeType(Integer codeType) {
         this.codeType = codeType;
     }
+
+    public String getMsgId() {
+        return msgId;
+    }
+
+    public void setMsgId(String msgId) {
+        this.msgId = msgId;
+    }
 }