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

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

@@ -14,9 +14,10 @@ import com.gic.clerk.api.service.PowerService;
 import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GICMQClientUtil;
-import com.gic.enterprise.api.dto.EnterpriseDTO;
+import com.gic.enterprise.api.dto.QRcodeDTO;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
+import com.gic.enterprise.api.service.ImageService;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.app.customer.dto.ChildDTO;
 import com.gic.haoban.app.customer.dto.CustomerDTO;
@@ -61,7 +62,6 @@ import com.gic.wechat.api.dto.qywx.*;
 import com.gic.wechat.api.dto.qywx.welcome.*;
 import com.gic.wechat.api.enums.QywxExternalMessageTypeEnum;
 import com.gic.wechat.api.enums.QywxMediaTypeEnum;
-import com.gic.wechat.api.service.fwh.WeixinBaseFunService;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.github.pagehelper.PageHelper;
@@ -132,8 +132,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     @Autowired
     private MemberApiService memberApiService;
     @Autowired
-    private WeixinBaseFunService weixinBaseFunService;
-    @Autowired
     private EnterpriseService enterpriseService;
     @Autowired
     private TabHaobanExternalClerkRelatedMapper externalClerkRelatedMapper;
@@ -141,6 +139,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     private ExternalClerkRelatedApiService externalClerkRelatedApiService;
     @Autowired
     private MemberStoreService memberStoreService;
+    @Autowired
+    private ImageService imageService;
 
     @Override
     public void dealQywxExternalUser(String params) {
@@ -538,14 +538,14 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
         if (friendSettingType.equals(FriendSettingTypeEnum.TEXT_AND_QRCODE.getCode())) {
             //带参数的公众号二维码
-            EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(enterpriseId);
             String sceneStr = "QWHY_" + relationKey + "_" + clerkId;
             //7天失效
-            String temporaryQRcodeURL = weixinBaseFunService.getTemporaryQRcodeURL(enterpriseDTO.getAppkey(), sceneStr, 604800);
-            log.info("参数的公众号二维码返回：{}",temporaryQRcodeURL);
-            if (StringUtils.isNotBlank(temporaryQRcodeURL)) {
-                String[] arr = temporaryQRcodeURL.split("/");
-                JSONResponse jp = qywxSuiteApiService.uploadMedia(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(temporaryQRcodeURL), arr[arr.length - 1], QywxMediaTypeEnum.IMAGE.getCode());
+            QRcodeDTO qRcodePic = imageService.getQRcodePic(enterpriseId, sceneStr, 604800);
+            log.info("参数的公众号二维码返回：{}",JSON.toJSONString(qRcodePic));
+            if (qRcodePic != null) {
+                String downloadUrl = qRcodePic.getPicUploadResDTO().downloadUrl;
+                String[] arr = downloadUrl.split("/");
+                JSONResponse jp = qywxSuiteApiService.uploadMedia(wxEnterpriseDTO.getCorpid(), config.getWxSuiteid(), CommonUtil.getFileByte(downloadUrl), arr[arr.length - 1], QywxMediaTypeEnum.IMAGE.getCode());
                 log.info("欢迎语发送带参数的公众号企微二维码返回：{}", JSON.toJSONString(jp));
                 if (jp.getErrorCode() == 0) {
                     QywxImageExternalBaseDTO qywxImageExternalBaseDTO = new QywxImageExternalBaseDTO();

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -153,4 +153,6 @@
 
     <dubbo:reference id="weixinBaseFunService" interface="com.gic.wechat.api.service.fwh.WeixinBaseFunService" timeout="10000"/>
     <dubbo:reference id="memberStoreService" interface="com.gic.member.api.service.MemberStoreService" timeout="10000"/>
+    <dubbo:reference id="imageService" interface="com.gic.enterprise.api.service.ImageService" timeout="10000"/>
+
 </beans>
\ No newline at end of file