Merge branch 'feature-canvas' into 'developer'

画布卡券领取

See merge request !2345

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

@@ -243,7 +243,7 @@ public class QywxSendServiceImpl implements QywxSendService {
                 Long sendTime = DateUtil.getStartTimeOfDay().getTime() ;
                 String str = "{\"id\":48,\"url\":\"/pages/member-center/coupon/coupon-group-get/coupon-group-get?execLogId="+execLogId+"&canvasId="+canvasId+"&time="+sendTime+"&nodeId="+nodeId+"\"}" ;
                 EnterpriseWxaRelationDTO en = this.enterpriseService.getByWxappkey(material.getAppId()) ;
-                Map<String, Object> map = this.enterpriseWxaLinkService.getWxaLinkAndQrCodeWithChannelAndSceneOfNotUrl(en.getEnterpriseId(),str,canvasId,"canvas","canvas") ;
+                Map<String, Object> map = this.enterpriseWxaLinkService.getWxaLinkAndQrCodeWithChannelAndSceneOfNotUrl(en.getEnterpriseId(),str,canvasId,"canvas",nodeId) ;
                 miniprogramMaterialDTO.setPage(map.get("link").toString());
             }
             if(null != planType && StringUtils.isNotBlank(planId)) {