Merge branch 'feature/xgh/代开发调整25年' into 'developer'

Feature/xgh/代开发调整25年

See merge request !2420

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

@@ -18,6 +18,17 @@ public class ChatEventDTO implements Serializable {
     private String corpid;
     // 是否自建应用的回调
     private int selfCallback = 0 ;
+    // 用于判断是否代开发应用的回调
+    private String suiteId;
+
+    public String getSuiteId() {
+        return suiteId;
+    }
+
+    public void setSuiteId(String suiteId) {
+        this.suiteId = suiteId;
+    }
+
     public int getSelfCallback() {
         return selfCallback;
     }

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

@@ -75,6 +75,7 @@ public class GroupChatApiServiceImpl implements GroupChatApiService {
     private GroupChatMapper groupChatMapper ;
     @Autowired
     private GroupChatUserMapper groupChatUserMapper ;
+    private static final String SELF_APP = "selfSuiteId";
 
     @Override
     public ServiceResponse<Page<GroupChatDTO>> listPage(GroupChatSearchQDTO qdto, BasePageInfo basePageInfo) {
@@ -229,8 +230,14 @@ public class GroupChatApiServiceImpl implements GroupChatApiService {
         }
         String wxEnterpriseId =  wxEnterprise.getWxEnterpriseId();
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
-        if(qwDTO.isSelf() && dto.getSelfCallback()==0) {
-            logger.info("非自建应用回调");
+        if(qwDTO.getWxSecurityType()==5) {
+            if (qwDTO.isSelf() && dto.getSelfCallback() == 0) {
+                logger.info("非自建应用回调");
+                return ServiceResponse.success();
+            }
+        }
+        if(qwDTO.getWxSecurityType() !=6 && StringUtils.isNotBlank(dto.getSuiteId()) && SELF_APP.equals(dto.getSuiteId())) {
+            logger.info("非仅代开的不处理代发的回调");
             return ServiceResponse.success();
         }
         // 群解散事件

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

@@ -114,8 +114,8 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
         feeOrderListQDTO.setCorpid(corpid);
         if (null == RedisUtil.getCache("qywx-order-search-date")) {
             feeOrderListQDTO
-                    .setStartTime(DateUtil.beginOfDay(new Date()).offsetNew(DateField.HOUR_OF_DAY, -24).getTime());
-            feeOrderListQDTO.setEndTime(new Date().getTime());
+                    .setStartTime(DateUtil.beginOfDay(new Date()).offsetNew(DateField.HOUR_OF_DAY, -24).getTime()/1000);
+            feeOrderListQDTO.setEndTime(new Date().getTime()/1000);
         }
         feeOrderListQDTO.setLimit(Manage3Constants.QW_LIMIT);
         FeeOrderResponseList feeOrderResponseList = qywxUserApiService.listOrder(corpid, config.getCorpid(),