Merge remote-tracking branch 'origin/feature-canvas' into feature-canvas

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

@@ -29,6 +29,20 @@ public class ContentMaterialDTO implements Serializable {
 
     private String materialDesc;
 
+    /**
+     * 画布-群发-卡券素材ID
+     */
+    private String canvasCouponUUID ;
+
+
+    public String getCanvasCouponUUID() {
+        return canvasCouponUUID;
+    }
+
+    public void setCanvasCouponUUID(String canvasCouponUUID) {
+        this.canvasCouponUUID = canvasCouponUUID;
+    }
+
     public String getMaterialDesc() {
         return materialDesc;
     }

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,8 @@ public class QywxSendServiceImpl implements QywxSendService {
             Long clerkTaskTime = canvas.getTaskTime();
             String clerkId = canvas.getClerkId() ;
             if(materialType==7) {
-                String str = "{\"id\":48,\"url\":\"/pages/member-center/coupon/coupon-group-get/coupon-group-get?execLogId="+execLogId+"&canvasId="+canvasId+"&time="+clerkTaskTime+"&nodeId="+nodeId+"\"}" ;
+                String unid = material.getLink();
+                String str = "{\"id\":48,\"url\":\"/pages/member-center/coupon/coupon-group-get/coupon-group-get?canvasCouponUUID="+unid+"&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) ;
                 path = this.enterpriseWxaLinkService.getLinkForCanvas(en.getEnterpriseId(),str,canvasId,nodeId,execLogId,new Date(clerkTaskTime),clerkId) ;

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

@@ -636,6 +636,11 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
     }
 
     @Override
+    public List<String> listAlStoreIdsByEnterpriseId(String enterpriseId) {
+        return this.mapper.listAlStoreIdsByEnterpriseId(enterpriseId);
+    }
+
+    @Override
     public List<StaffClerkRelationDTO>listByWxEnterpriseIdAndStaffId(String wxEnterpriseId, Set<String> staffIdList) {
         return this.mapper.listByWxEnterpriseIdAndStaffId(wxEnterpriseId,staffIdList);
     }

haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml

@@ -263,7 +263,7 @@
         </foreach>
         and a.status_flag = 1
         group by a.staff_id, a.clerk_id) as scr on scr.staff_id = ecr.staff_id
-        where ecr.status_flag = 1 AND ecr.`external_status` in (1 , 3)
+        where ecr.status_flag = 1 AND ecr.`external_status` in (1)
         and ecr.enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
         and ecr.wx_enterprise_id=#{wxEnterpriseId}
         and ecr.member_id in