Merge branch 'xgh_内容中台' into 'developer'

/

See merge request !428

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

@@ -16,7 +16,7 @@ public interface QywxSendService {
     /**
      * 素材-分享
      */
-    public ServiceResponse<String> sendMessage(String wxEnterpriseId, String staffId, List<String> extendUserList,
+    public ServiceResponse<String> sendMessageShare(String wxEnterpriseId, String staffId, List<String> extendUserList,
             List<ContentMaterialDTO> imageList, String message);
 
     /**

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

@@ -80,7 +80,8 @@ public class QywxSendServiceImpl implements QywxSendService {
         return this.send(wxEnterpriseId, staffId, extendUserList, materialIdList, null, 1);
     }
 
-    public ServiceResponse<String> sendMessage(String wxEnterpriseId, String staffId, List<String> extendUserList,
+    @Autowired
+    public ServiceResponse<String> sendMessageShare(String wxEnterpriseId, String staffId, List<String> extendUserList,
             List<ContentMaterialDTO> imageList, String message) {
         List<String> materialIdList = this.getImageMediaId(wxEnterpriseId, imageList, 1);
         return this.send(wxEnterpriseId, staffId, extendUserList, materialIdList, message, 2);
@@ -145,6 +146,7 @@ public class QywxSendServiceImpl implements QywxSendService {
     }
 
     // 分享朋友圈
+    @Autowired
     public ServiceResponse<String> share(String wxEnterpriseId, List<String> clerkIdList, String message,
             List<ContentMaterialDTO> imageList) {
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);

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

@@ -1237,7 +1237,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     @Override
     public JSONResponse sendMessageShare(String wxEnterpriseId, String staffId, List<String> extendUserList, String message,
             List<ContentMaterialDTO> imgList) {
-        com.gic.api.base.commons.ServiceResponse<String> resp = this.qywxSendService.sendMessage(wxEnterpriseId, staffId, extendUserList, imgList, message) ;
+        com.gic.api.base.commons.ServiceResponse<String> resp = this.qywxSendService.sendMessageShare(wxEnterpriseId, staffId, extendUserList, imgList, message) ;
         return this.retJson(resp) ;
     }