feat：企微收费

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

@@ -7,6 +7,7 @@ import com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
+import com.gic.haoban.manage.service.entity.fee.TabHaobanQywxFee;
 import com.gic.haoban.manage.service.entity.fee.TabHaobanQywxFeeAccountStaff;
 import com.gic.haoban.manage.service.entity.fee.TabHaobanQywxFeeOrder;
 import com.gic.haoban.manage.service.entity.fee.TabHaobanQywxFeeOrderAccount;
@@ -59,21 +60,22 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
             String wxEnterpriseId = tabHaobanWxEnterpris.getWxEnterpriseId();
             String autoActiveStatus = qywxUserApiService.getAutoActiveStatus(corpid, serviceCorpid);
             if (!"1".equals(autoActiveStatus)) {
-                logger.info("未开启自动激活：{}",corpid);
-                wxEnterpriseService.updateAutoActiveFlagById(0,wxEnterpriseId);
+                logger.info("未开启自动激活：{}", corpid);
+                wxEnterpriseService.updateAutoActiveFlagById(0, wxEnterpriseId);
                 continue;
             }
-            logger.info("企微收费：{},{}",corpid,wxEnterpriseId);
-            //所有订单
+            logger.info("企微收费：{},{}", corpid, wxEnterpriseId);
+
+            //更新订单
             List<String> orderIds = new ArrayList<>();
-            while (true){
+            while (true) {
                 FeeOrderListQDTO feeOrderListQDTO = new FeeOrderListQDTO();
                 feeOrderListQDTO.setCorpid(corpid);
                 feeOrderListQDTO.setLimit(Manage3Constants.QW_LIMIT);
-                FeeOrderResponseList feeOrderResponseList = qywxUserApiService.listOrder(corpid, serviceCorpid,feeOrderListQDTO);
+                FeeOrderResponseList feeOrderResponseList = qywxUserApiService.listOrder(corpid, serviceCorpid, feeOrderListQDTO);
                 int errcode = feeOrderResponseList.getErrcode();
                 if (errcode != 0) {
-                    logger.error("查询订单列表失败：{}",feeOrderResponseList.getErrmsg());
+                    logger.error("查询订单列表失败：{}", feeOrderResponseList.getErrmsg());
                     break;
                 }
                 for (FeeOrderResponseList.OrderListDTO orderListDTO : feeOrderResponseList.getOrderList()) {
@@ -85,7 +87,7 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
                     break;
                 }
                 feeOrderListQDTO.setCursor(feeOrderResponseList.getNextCursor());
-                feeOrderResponseList = qywxUserApiService.listOrder(corpid, serviceCorpid,feeOrderListQDTO);
+                feeOrderResponseList = qywxUserApiService.listOrder(corpid, serviceCorpid, feeOrderListQDTO);
                 for (FeeOrderResponseList.OrderListDTO orderListDTO : feeOrderResponseList.getOrderList()) {
                     orderIds.add(orderListDTO.getOrderId());
                 }
@@ -95,18 +97,25 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
             for (String orderId : orderIds) {
                 FeeOrderDeatilResponseDTO order = qywxUserApiService.getOrder(corpid, serviceCorpid, orderId);
                 if (order.getErrcode() != 0) {
-                    logger.error("请求企微失败：{}",orderId);
+                    logger.error("请求企微失败：{}", orderId);
                     break;
                 }
+
                 //插入订单
                 FeeOrderDeatilResponseDTO.OrderDTO orderDTO = order.getOrder();
+                Integer orderStatus = orderDTO.getOrderStatus();
+                if (orderStatus != 1) {
+                    logger.info("只处理已支付订单:{}", orderId);
+                    continue;
+                }
+
                 TabHaobanQywxFeeOrder tabHaobanQywxFeeOrder = new TabHaobanQywxFeeOrder();
                 tabHaobanQywxFeeOrder.setFeeOrderId(UniqueIdUtils.uniqueLong());
                 tabHaobanQywxFeeOrder.setOrderId(orderId);
                 tabHaobanQywxFeeOrder.setCorpId(corpid);
                 tabHaobanQywxFeeOrder.setWxEnterpriseId(wxEnterpriseId);
                 tabHaobanQywxFeeOrder.setOrderType(orderDTO.getOrderType());
-                tabHaobanQywxFeeOrder.setOrderStatus(orderDTO.getOrderStatus());
+                tabHaobanQywxFeeOrder.setOrderStatus(orderStatus);
                 tabHaobanQywxFeeOrder.setPrice(new BigDecimal(orderDTO.getPrice()));
                 tabHaobanQywxFeeOrder.setBaseCount(orderDTO.getAccountCount().getBaseCount());
                 tabHaobanQywxFeeOrder.setExternalContactCount(orderDTO.getAccountCount().getExternalContactCount());
@@ -114,16 +123,18 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
                 tabHaobanQywxFeeOrder.setCreateTime(DateUtil.date(orderDTO.getCreateTime()));
                 tabHaobanQywxFeeOrder.setPayTime(DateUtil.date(orderDTO.getPayTime()));
                 haobanQywxFeeOrderService.insert(tabHaobanQywxFeeOrder);
+
             }
 
-            while (true){
+            //更新账号
+            while (true) {
                 FeeOrderListQDTO feeOrderListQDTO = new FeeOrderListQDTO();
                 feeOrderListQDTO.setCorpid(corpid);
                 feeOrderListQDTO.setLimit(Manage3Constants.QW_LIMIT);
                 AccountListResponseDTO accountListResponseDTO = qywxUserApiService.listActivedAccount(corpid, serviceCorpid, feeOrderListQDTO);
 
                 if (accountListResponseDTO.getErrcode() != 0) {
-                    logger.info("订单账号列表报错：{}",accountListResponseDTO.getErrmsg());
+                    logger.info("订单账号列表报错：{}", accountListResponseDTO.getErrmsg());
                     break;
                 }
 
@@ -147,7 +158,7 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
             for (String activeCode : activeCodes) {
                 ActiveInfoCodeResponseDTO activeInfoCodeResponseDTO = qywxUserApiService.getActiveInfoByCode(corpid, serviceCorpid, activeCode);
                 if (activeInfoCodeResponseDTO.getErrcode() != 0) {
-                    logger.error("激活码详情报错：{}",activeInfoCodeResponseDTO.getErrmsg());
+                    logger.error("激活码详情报错：{}", activeInfoCodeResponseDTO.getErrmsg());
                     continue;
                 }
                 String userid = activeInfoCodeResponseDTO.getUserid();
@@ -164,9 +175,10 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
                 tabHaobanQywxFeeOrderAccount.setActiveTime(DateUtil.date(activeInfoCodeResponseDTO.getActiveTime()));
                 haobanQywxFeeOrderAccountService.insert(tabHaobanQywxFeeOrderAccount);
 
+                //更新成员
                 ActiveInfoUserResponseDTO activeInfoUserResponseDTO = qywxUserApiService.getActiveInfoByUser(corpid, serviceCorpid, userid);
                 if (activeInfoUserResponseDTO.getErrcode() != 0) {
-                    logger.info("成员激活详情报错：{}",activeInfoUserResponseDTO.getErrmsg());
+                    logger.info("成员激活详情报错：{}", activeInfoUserResponseDTO.getErrmsg());
                     break;
                 }
                 List<AccountListDTO> activeInfoList = activeInfoUserResponseDTO.getActiveInfoList();
@@ -191,16 +203,29 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
                 }
                 if (tabHaobanStaff != null) {
                     String staffId = tabHaobanStaff.getStaffId();
-                    staffService.updateActiveStatusById(activeStatus,staffId);
+                    staffService.updateActiveStatusById(activeStatus, staffId);
                 }
             }
 
             //更新企微状态
-            wxEnterpriseService.updateAutoActiveFlagById(1,wxEnterpriseId);
-        }
+            wxEnterpriseService.updateAutoActiveFlagById(1, wxEnterpriseId);
+
+            //更新收费
+            TabHaobanQywxFee tabHaobanQywxFee = new TabHaobanQywxFee();
+            tabHaobanQywxFee.setQwFeeId(UniqueIdUtils.uniqueLong());
+            tabHaobanQywxFee.setCorpName(tabHaobanWxEnterpris.getCorpName());
+            tabHaobanQywxFee.setCorpId(corpid);
+            tabHaobanQywxFee.setWxEnterpriseId(wxEnterpriseId);
+            //tabHaobanQywxFee.setInterceptTime();
+            //tabHaobanQywxFee.setInterceptUserNum();
+            //tabHaobanQywxFee.setPermissionUserNum();
+            //tabHaobanQywxFee.setBuyPermissionUserNum();
+            tabHaobanQywxFee.setInterceptFlag(0);
+            haobanQywxFeeService.insert(tabHaobanQywxFee);
 
-    }
 
+        }
 
+    }
 
 }