Merge remote-tracking branch 'origin/developer' into developer

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

@@ -178,7 +178,7 @@ public class MaterialApiServiceImpl implements MaterialApiService {
         QywxMediaTypeEnum fileType = null;
         String url = "";
         String oldUrl = "";
-        if (type == 2) {
+        if (type == 2 || type == 6) {
             fileType = QywxMediaTypeEnum.IMAGE;
             url = materialDTO.getImgUrl();
             oldUrl = old.getImgUrl();

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

@@ -440,7 +440,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                 exsitDTO.setStatusFlag(1);
                 externalClerkRelatedService.update(exsitDTO);
             }
-            sendWelcome(dto, wxEnterpriseId, enterpriseId, staffId, false);
+            sendWelcome(dto, wxEnterpriseId, enterpriseId, staffId, clerkId, false);
             //同步好友标签
             pushTagSync(memberId, wxEnterpriseId, enterpriseId);
             //回调给会员
@@ -465,11 +465,12 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
      */
     private void addFriendByWelcome(MemberUnionidRelatedDTO dto, StaffClerkRelationDTO staffClerkRelationDTO) {
         String staffId = staffClerkRelationDTO.getStaffId();
+        String clerkId = staffClerkRelationDTO.getClerkId();
         String relationKey = SecureUtil.md5(staffId + dto.getExternalUserid());
         String wxEnterpriseId = staffClerkRelationDTO.getWxEnterpriseId();
         String enterpriseId = staffClerkRelationDTO.getEnterpriseId();
         //发送欢迎语
-        sendWelcome(dto, wxEnterpriseId, enterpriseId, staffId, true);
+        sendWelcome(dto, wxEnterpriseId, enterpriseId, staffId, clerkId, true);
 
         //保存好友关系
         List<TabHaobanExternalClerkRelated> externalClerkRelateds = externalClerkRelatedService.listByExTernalUseridAndWxUserIdAllStatus(wxEnterpriseId, dto.getExternalUserid(), dto.getWxUserId());
@@ -515,7 +516,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
      * @param staffId
      * @param sendApp
      */
-    private void sendWelcome(MemberUnionidRelatedDTO dto, String wxEnterpriseId, String enterpriseId, String staffId, boolean sendApp) {
+    private void sendWelcome(MemberUnionidRelatedDTO dto, String wxEnterpriseId, String enterpriseId, String staffId, String clerkId, boolean sendApp) {
         log.info("发送欢迎语：dto:{},wxEnterpriseId:{},staffId:{},sendApp:{}", JSONObject.toJSONString(dto), wxEnterpriseId, staffId, sendApp);
         String relationKey = SecureUtil.md5(staffId + dto.getExternalUserid());
         FriendSettingDetailBO friendSetting = welcomeService.getFriendSetting(wxEnterpriseId);
@@ -549,7 +550,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         if (friendSettingType.equals(FriendSettingTypeEnum.TEXT_AND_QRCODE.getCode())) {
             //带参数的公众号二维码
             EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(enterpriseId);
-            String sceneStr = "QWHY_" + relationKey;
+            String sceneStr = "QWHY_" + relationKey + "_" + clerkId;
             //7天失效
             String temporaryQRcodeURL = weixinBaseFunService.getTemporaryQRcodeURL(enterpriseDTO.getAppkey(), sceneStr, 604800);
             JSONResponse jp = qywxSuiteApiService.uploadMedia(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), getFileByte(temporaryQRcodeURL), sceneStr, QywxMediaTypeEnum.IMAGE.getCode());
@@ -1328,7 +1329,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                 externalClerkRelatedService.delByUserIdAndExternalUserId(dto);
             }
         }
-
     }
 
     @Override
@@ -1825,7 +1825,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                     boolean flag = externalClerkRelatedApiService.bindMemberIdExternalById(externalClerkRelated.getExternalClerkRelatedId(), enterpriseId, memberId, unionid);
                     if (flag) {
                         //调用会员接口来自企微
-                        memberStoreService.saveMemberStoreClerkRelation(memberId,externalClerkRelated.getStoreId(),externalClerkRelated.getClerkId(),"企微好友");
+                        memberStoreService.saveMemberStoreClerkRelation(memberId, externalClerkRelated.getStoreId(), externalClerkRelated.getClerkId(), "企微好友");
                     }
                 }
             }
@@ -1851,8 +1851,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String relationKey = s[1];
         TabHaobanExternalClerkRelated externalClerkRelated = externalClerkRelatedMapper.getByRelationKey(relationKey);
         externalClerkRelatedApiService.bindMemberIdExternalById(externalClerkRelated.getExternalClerkRelatedId(), enterpriseId, memberId, unionid);
-        //调用会员接口来自企微
-        memberStoreService.saveMemberStoreClerkRelation(memberId,externalClerkRelated.getStoreId(),externalClerkRelated.getClerkId(),"企微好友");
         return serviceResponse;
     }