画布

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/MaterialDTO.java

@@ -44,19 +44,7 @@ public class MaterialDTO implements Serializable{
     private String fromMaterialId = "-1";
     //appid  link路径  img_url 封面图 materialTitle
     private String appId;
-    /**
-     * 画布-群发-卡券素材ID
-     */
-    private String canvasCouponUUID ;
 
-
-    public String getCanvasCouponUUID() {
-        return canvasCouponUUID;
-    }
-
-    public void setCanvasCouponUUID(String canvasCouponUUID) {
-        this.canvasCouponUUID = canvasCouponUUID;
-    }
     private static final long serialVersionUID = 1L;
 
     public String getMediaid() {

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MaterialServiceImpl.java

@@ -307,7 +307,12 @@ public class MaterialServiceImpl implements MaterialService {
             imageList.forEach(dto -> {
                 String imageUrl = dto.getImgUrl();
                 int type = dto.getMaterialType();
-                String md5 = Md5Util.MD5(imageUrl+type);
+                String md5 = null ;
+                if(type==7) {
+                    md5 = Md5Util.MD5(imageUrl + type + dto.getCanvasCouponUUID());
+                }else {
+                    md5 = Md5Util.MD5(imageUrl+type);
+                }
                 TabMaterialContent tab = this.materialContentMapper.selectByUrl(wxEnterpriseId, md5, mediaType);
                 if (null != tab) {
                     Integer materialType = tab.getMaterialType();
@@ -329,6 +334,9 @@ public class MaterialServiceImpl implements MaterialService {
                     tab.setAppid(dto.getAppid());
                     tab.setMaterialTitle(dto.getMaterialTitle());
                     tab.setLink(dto.getLink());
+                    if(mediaType==7) {
+                        tab.setLink(dto.getCanvasCouponUUID());
+                    }
                     this.materialContentMapper.insert(tab);
                     materialIdList.add(id);
                 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/QywxSendServiceImpl.java

@@ -253,7 +253,7 @@ public class QywxSendServiceImpl implements QywxSendService {
             Long clerkTaskTime = canvas.getTaskTime();
             String clerkId = canvas.getClerkId() ;
             if(materialType==7) {
-                String unid = material.getCanvasCouponUUID() ;
+                String unid = material.getLink();
                 String str = "{\"canvasCouponUUID\":\""+unid+"\",\"id\":48,\"url\":\"/pages/member-center/coupon/coupon-group-get/coupon-group-get?execLogId="+execLogId+"&canvasId="+canvasId+"&time="+clerkTaskTime+"&nodeId="+nodeId+"\"}" ;
                 EnterpriseWxaRelationDTO en = this.enterpriseService.getByWxappkey(material.getAppId()) ;
                 //Map<String, Object> map = this.enterpriseWxaLinkService.getWxaLinkAndQrCodeWithChannelAndSceneOfNotUrl(en.getEnterpriseId(),str,canvasId+"","canvas",nodeId+"_"+execLogId+"_"+clerkTaskTime+"_"+clerkId) ;