fix：收费

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/fee/TabHaobanQywxFeeOrderMapper.java

@@ -72,5 +72,15 @@ public interface TabHaobanQywxFeeOrderMapper {
      * @date 2022-08-05 11:18:22
      */
     int countExternalContactCount(@Param("wxEnterpriseId") String wxEnterpriseId);
+
+    /**
+     * 有订单
+     *
+     * @param wxEnterpriseId wx企业标识
+     * @return int
+     * @author mozhu
+     * @date 2022-08-12 10:42:36
+     */
+    int hasOrder(@Param("wxEnterpriseId") String wxEnterpriseId);
 }
 

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

@@ -53,4 +53,15 @@ public interface HaobanQywxFeeOrderService {
     int countExternalContactCount(String wxEnterpriseId);
 
 
+    /**
+     * 是否有订单
+     *
+     * @param wxEnterpriseId wx企业标识
+     * @return boolean
+     * @author mozhu
+     * @date 2022-08-12 10:43:21
+     */
+    boolean hasOrder(String wxEnterpriseId);
+
+
 }

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

@@ -68,4 +68,10 @@ public class HaobanQywxFeeOrderServiceImpl implements HaobanQywxFeeOrderService
     public int countExternalContactCount(String wxEnterpriseId) {
         return tabHaobanQywxFeeOrderMapper.countExternalContactCount(wxEnterpriseId);
     }
+
+    @Override
+    public boolean hasOrder(String wxEnterpriseId) {
+        int count = tabHaobanQywxFeeOrderMapper.hasOrder(wxEnterpriseId);
+        return count > 0;
+    }
 }

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

 package com.gic.haoban.manage.service.service.out.impl.fee;
 
+import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -73,7 +74,7 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
             try {
                 instance.sendMessage("qywxAddFeeMq", wxEnterprise.getWxEnterpriseId());
             } catch (Exception e) {
-                logger.info("发送消息处理异常：{}", e.getMessage(),e);
+                logger.info("发送消息处理异常：{}", e.getMessage(), e);
             }
         }
     }
@@ -96,12 +97,16 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
             return;
         }
         logger.info("企微收费：{},{}", corpid, wxEnterpriseId);
-
+        boolean hasOrder = haobanQywxFeeOrderService.hasOrder(wxEnterpriseId);
         //更新订单
         List<String> orderIds = new ArrayList<>();
         while (true) {
             FeeOrderListQDTO feeOrderListQDTO = new FeeOrderListQDTO();
             feeOrderListQDTO.setCorpid(corpid);
+            if (hasOrder) {
+                feeOrderListQDTO.setStart_time(DateUtil.beginOfDay(new Date()).offsetNew(DateField.HOUR_OF_DAY, -1).getTime());
+                feeOrderListQDTO.setEnd_time(DateUtil.endOfDay(new Date()).offsetNew(DateField.HOUR_OF_DAY, -1).getTime());
+            }
             feeOrderListQDTO.setLimit(Manage3Constants.QW_LIMIT);
             FeeOrderResponseList feeOrderResponseList = qywxUserApiService.listOrder(corpid, serviceCorpid, feeOrderListQDTO);
             int errcode = feeOrderResponseList.getErrcode();
@@ -218,7 +223,6 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
             for (AccountListDTO accountListDTO : activeInfoList) {
                 TabHaobanQywxFeeAccountStaff tabHaobanQywxFeeAccountStaff = new TabHaobanQywxFeeAccountStaff();
                 tabHaobanQywxFeeAccountStaff.setFeeAccountStaffId(UniqueIdUtils.uniqueLong());
-                //tabHaobanQywxFeeAccountStaff.setOrderId();
                 tabHaobanQywxFeeAccountStaff.setCorpId(corpid);
                 tabHaobanQywxFeeAccountStaff.setWxEnterpriseId(wxEnterpriseId);
                 tabHaobanQywxFeeAccountStaff.setWxUserId(userid);
@@ -243,6 +247,7 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
 
         //更新收费
         HaobanQywxFeeDetailDTO haobanQywxFeeDetailDTO = haobanQywxFeeAccountStaffService.feeIntercept(wxEnterpriseId);
+        int permissionUserNum = haobanQywxFeeOrderAccountService.countOrderAccountStatus(1, wxEnterpriseId);
         if (haobanQywxFeeDetailDTO != null) {
             TabHaobanQywxFee tabHaobanQywxFee = new TabHaobanQywxFee();
             tabHaobanQywxFee.setQwFeeId(UniqueIdUtils.uniqueLong());
@@ -251,12 +256,17 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
             tabHaobanQywxFee.setWxEnterpriseId(wxEnterpriseId);
             tabHaobanQywxFee.setInterceptTime(haobanQywxFeeDetailDTO.getInterceptTime());
             tabHaobanQywxFee.setInterceptUserNum(haobanQywxFeeDetailDTO.getInterceptUserNum());
-            tabHaobanQywxFee.setPermissionUserNum(haobanQywxFeeOrderAccountService.countOrderAccountStatus(1, wxEnterpriseId));
+            tabHaobanQywxFee.setPermissionUserNum(permissionUserNum);
             tabHaobanQywxFee.setBuyPermissionUserNum(haobanQywxFeeOrderService.countExternalContactCount(wxEnterpriseId));
             tabHaobanQywxFee.setInterceptFlag(0);
             haobanQywxFeeService.insert(tabHaobanQywxFee);
+            //判断今天是否是本月最后一天
+            if (DateUtil.isSameDay(DateUtil.endOfMonth(new Date()), new Date())) {
+                int day1 = 0;
+                String content = "30天将有" + day1 + "个接口许可证即将过期，您总共还剩余" + permissionUserNum + "个可用的接口许可证，请保证数量充足，如需增加请及时联系相关人员续费，避免影响使用";
                 //告警
-            messageAlert(wxEnterpriseId, corpName, corpid, AlertTypeEnum.FEE_ALARM.getName());
+                messageAlert(wxEnterpriseId, corpName, corpid, AlertTypeEnum.FEE_ALARM.getName(), content);
+            }
         }
 
         List<TabHaobanQywxFeeAccountInterceptLog> tabHaobanQywxFeeAccountInterceptLogs = haobanQywxFeeAccountInterceptLogService.queryByWxEnterpriseId(wxEnterpriseId);
@@ -268,7 +278,7 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
             tabHaobanQywxFee.setWxEnterpriseId(wxEnterpriseId);
             tabHaobanQywxFee.setInterceptTime(DateUtil.offsetDay(new Date(), -1));
             tabHaobanQywxFee.setInterceptUserNum(tabHaobanQywxFeeAccountInterceptLogs.size());
-            tabHaobanQywxFee.setPermissionUserNum(haobanQywxFeeOrderAccountService.countOrderAccountStatus(1, wxEnterpriseId));
+            tabHaobanQywxFee.setPermissionUserNum(permissionUserNum);
             tabHaobanQywxFee.setBuyPermissionUserNum(haobanQywxFeeOrderService.countExternalContactCount(wxEnterpriseId));
             tabHaobanQywxFee.setInterceptFlag(1);
             haobanQywxFeeService.insert(tabHaobanQywxFee);
@@ -313,7 +323,7 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
      *
      * @param wxEnterpriseId
      */
-    private void messageAlert(String wxEnterpriseId, String corpName, String corpid, String titleSub) {
+    private void messageAlert(String wxEnterpriseId, String corpName, String corpid, String titleSub, String content) {
         ProviderLocalTag providerLocalTag = ProviderLocalTag.tag.get();
         String traceId = providerLocalTag.traceId;
         AlertMessageDTO messageDTO = new AlertMessageDTO();
@@ -323,6 +333,7 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
         Map<String, Object> map = new HashMap<>();
         map.put("企业名称", corpName);
         map.put("企业id", corpid);
+        map.put("内容", content);
         messageDTO.setContentMap(map);
         messageDTO.setTraceId(traceId);
         GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
@@ -332,4 +343,5 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
             logger.info("异常：{}", e.getMessage(), e);
         }
     }
+
 }

haoban-manage3-service/src/main/resources/mapper/fee/HaobanQywxFeeOrderService.xml

@@ -131,7 +131,7 @@
     </delete>
 
 
-    <select id="countOrderAccountStatus" resultMap="TabHaobanQywxFeeOrderAccountMap">
+    <select id="countOrderAccountStatus" resultType="java.lang.Integer">
         select
         count(*)
         from tab_haoban_qywx_fee_order_account

haoban-manage3-service/src/main/resources/mapper/fee/TabHaobanQywxFeeOrderMapper.xml

@@ -147,10 +147,16 @@
     </delete>
 
     <select id="countExternalContactCount" resultType="java.lang.Integer">
-        select
-        sum(external_contact_count)
+        select sum(external_contact_count)
+        from tab_haoban_qywx_fee_order
+        where wx_enterprise_id = #{wxEnterpriseId}
+    </select>
+
+    <select id="hasOrder" resultType="java.lang.Integer">
+        select count(*)
         from tab_haoban_qywx_fee_order
         where wx_enterprise_id = #{wxEnterpriseId}
     </select>
+
 </mapper>
 

haoban-manage3-service/src/test/java/ServiceTest.java

 import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
+import com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService;
 import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
+import com.gic.haoban.manage.service.config.Config;
 import com.gic.wechat.api.service.qywx.QywxDepartmentApiService;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
@@ -35,6 +37,10 @@ public class ServiceTest {
 
     @Autowired
     private HmQrcodeApiService hmQrcodeApiService;
+    @Autowired
+    private HaobanQywxFeeApiService haobanQywxFeeApiService;
+    @Autowired
+    private Config config;
 
 
     @Test
@@ -56,4 +62,15 @@ public class ServiceTest {
     public void test2() {
         hmQrcodeApiService.checkStaffOpenContactByWxEnterpriseId("5bd929fd3b2c49deaa1184bcb0d669b3","ff8080815dacd3a2015dacd3ef5c0000");
     }
+
+    @Test
+    public void test3() {
+        haobanQywxFeeApiService.addFee("5bd929fd3b2c49deaa1184bcb0d669b3");
+    }
+
+    @Test
+    public void test4() {
+        String autoActiveStatus = qywxUserApiService.getAutoActiveStatus("wp59NLDQAAJL6DsM6YwOGqJlhCBykkeA", config.getCorpid());
+        System.out.println(autoActiveStatus);
+    }
 }