画布-群发

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

@@ -245,20 +245,26 @@ public class QywxSendServiceImpl implements QywxSendService {
             miniprogramMaterialDTO.setAppid(material.getAppId());
             miniprogramMaterialDTO.setPage(material.getLink());
             // 卡券
+            String path = material.getLink();
+            Long canvasId = canvas.getCanvasId();
+            Long nodeId = canvas.getNodeId();
+            Long execLogId = canvas.getExecLogId() ;
+            Long clerkTaskTime = canvas.getTaskTime();
+            String clerkId = canvas.getClerkId() ;
             if(materialType==7) {
-                Long canvasId = canvas.getCanvasId();
-                Long nodeId = canvas.getNodeId();
-                Long execLogId = canvas.getExecLogId() ;
-                Long clerkTaskTime = canvas.getTaskTime();
-                String clerkId = canvas.getClerkId() ;
                 String str = "{\"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) ;
-                miniprogramMaterialDTO.setPage(map.get("link").toString());
+                path = map.get("link").toString() ;
+            }
+            if(StringUtils.isNotBlank(material.getLink()) && material.getLink().startsWith("{")) {
+                EnterpriseWxaRelationDTO en = this.enterpriseService.getByWxappkey(material.getAppId()) ;
+                Map<String, Object> map = this.enterpriseWxaLinkService.getWxaLinkAndQrCodeWithChannelAndSceneOfNotUrl(en.getEnterpriseId(),material.getLink(),canvasId+"","canvas",nodeId+"_"+execLogId+"_"+clerkTaskTime+"_"+clerkId) ;
+                path = map.get("link").toString() ;
             }
             if(null != planType && StringUtils.isNotBlank(planId)) {
                 String url = "qtActivityType="+planType+"&qtActivityId="+planId ;
-                if(material.getLink().contains("?")) {
+                if(path.contains("?")) {
                     url = "&" + url ;
                 }else {
                     url = "?" +url ;