修改消息发送

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();
-        ObjectHelper.writeWithFrom(companyCodeVo, req);
-        companyCodeVo.setCompanyCodeId(StringHelper.getNewID());
-        return companyCodeDao.create(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());
+            companyCodeDao.create(companyCodeVo);
+        }
+        return "";
     }
 
 }

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