创建续期订单

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/licence/InvalidUserInfoDTO.java

+package com.gic.haoban.manage.api.dto.licence;
+
+import java.io.Serializable;
+
+/**
+ * @description:
+ * @Author: wenhua
+ * @Date: 2023/6/12 15:25
+ */
+public class InvalidUserInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 微信userId
+     */
+    private String wxUserId;
+    /**
+     * 电话
+     */
+    private String phone;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 不合法错误码
+     */
+    private String invalidCode;
+    /**
+     * 不合法错误描述
+     */
+    private String invalidMsg;
+
+    public String getWxUserId() {
+        return wxUserId;
+    }
+
+    public void setWxUserId(String wxUserId) {
+        this.wxUserId = wxUserId;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getInvalidCode() {
+        return invalidCode;
+    }
+
+    public void setInvalidCode(String invalidCode) {
+        this.invalidCode = invalidCode;
+    }
+
+    public String getInvalidMsg() {
+        return invalidMsg;
+    }
+
+    public void setInvalidMsg(String invalidMsg) {
+        this.invalidMsg = invalidMsg;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/licence/LicenceOrderQDTO.java

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.api.dto.qdto.licence;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -51,7 +52,7 @@ public class LicenceOrderQDTO implements Serializable {
     private Integer price;
 
     /**
-     * 购买时间类型 1：按月购买，2：按天购买
+     * 购买时间类型 1：按月购买，2：按天购买，3：指定到期时间（仅续期订单有此类型）
      */
     private Integer timeType;
 
@@ -105,6 +106,18 @@ public class LicenceOrderQDTO implements Serializable {
      * 企业微信订单id
      */
     private String qywxOrderId;
+    /**
+     * 续期成员staffIdList
+     */
+    private List<String> staffIdList;
+
+    public List<String> getStaffIdList() {
+        return staffIdList;
+    }
+
+    public void setStaffIdList(List<String> staffIdList) {
+        this.staffIdList = staffIdList;
+    }
 
     public String getQywxOrderId() {
         return qywxOrderId;

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

@@ -4,6 +4,8 @@ import com.gic.haoban.manage.service.entity.TabHaobanRenewalUser;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 
+import java.util.List;
+
 /**
  * (TabHaobanRenewalUser)表服务接口
  *
@@ -37,6 +39,8 @@ public interface TabHaobanRenewalUserService {
      */
     TabHaobanRenewalUser insert(TabHaobanRenewalUser tabHaobanRenewalUser);
 
+    void insertBatch(List<TabHaobanRenewalUser> tabHaobanRenewalUserList);
+
     /**
      * 修改数据
      *

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

 package com.gic.haoban.manage.service.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.gic.haoban.manage.service.entity.TabHaobanRenewalUser;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanRenewalUserDao;
 import com.gic.haoban.manage.service.service.TabHaobanRenewalUserService;
@@ -9,6 +10,7 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * (TabHaobanRenewalUser)表服务实现类
@@ -57,6 +59,15 @@ public class TabHaobanRenewalUserServiceImpl implements TabHaobanRenewalUserServ
         return tabHaobanRenewalUser;
     }
 
+    @Override
+    public void insertBatch(List<TabHaobanRenewalUser> tabHaobanRenewalUserList) {
+        if (CollUtil.isEmpty(tabHaobanRenewalUserList)){
+            return;
+        }
+        this.tabHaobanRenewalUserDao.insertBatch(tabHaobanRenewalUserList);
+    }
+
+
     /**
      * 修改数据
      *

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

@@ -15,6 +15,7 @@ import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.haoban.manage.api.dto.StaffActiveDataDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
+import com.gic.haoban.manage.api.dto.licence.InvalidUserInfoDTO;
 import com.gic.haoban.manage.api.dto.licence.LicenceOrderDTO;
 import com.gic.haoban.manage.api.dto.licence.LicenceOrderPageDTO;
 import com.gic.haoban.manage.api.dto.licence.LicenceOrderProgressDTO;
@@ -23,12 +24,12 @@ import com.gic.haoban.manage.api.dto.qdto.licence.LicenceOrderQDTO;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.api.service.licence.LicenceOrderApiService;
 import com.gic.haoban.manage.service.config.Config;
+import com.gic.haoban.manage.service.entity.TabHaobanRenewalUser;
+import com.gic.haoban.manage.service.entity.TabHaobanStaff;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseActiveData;
 import com.gic.haoban.manage.service.entity.licence.TabHaobanLicenceOrder;
 import com.gic.haoban.manage.service.entity.licence.TabHaobanLicenceOrderProgress;
-import com.gic.haoban.manage.service.service.StaffClerkRelationService;
-import com.gic.haoban.manage.service.service.WxEnterpriseActiveDataService;
-import com.gic.haoban.manage.service.service.WxEnterpriseService;
+import com.gic.haoban.manage.service.service.*;
 import com.gic.haoban.manage.service.service.licence.LicenceOrderProgressService;
 import com.gic.haoban.manage.service.service.licence.LicenceOrderService;
 import com.gic.haoban.manage.service.util.DingUtils;
@@ -37,11 +38,14 @@ import com.gic.thirdparty.api.dto.RefundReqDataDTO;
 import com.gic.thirdparty.api.dto.RefundResDataDTO;
 import com.gic.thirdparty.api.service.Pay4WXService;
 import com.gic.wechat.api.dto.qywx.fee.CreateOrderResponseDTO;
+import com.gic.wechat.api.dto.qywx.fee.CreateRenewOrderJobDTO;
 import com.gic.wechat.api.dto.qywx.fee.FeeOrderDeatilResponseDTO;
+import com.gic.wechat.api.dto.qywx.fee.qdto.AccountListQDTO;
 import com.gic.wechat.api.dto.qywx.fee.qdto.CreateOrderQDTO;
 import com.gic.wechat.api.dto.qywx.response.QywxResponseDTO;
 import com.gic.wechat.api.service.qywx.QywxOrderApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,9 +53,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -89,6 +91,10 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
     private StaffClerkRelationService staffClerkRelationService;
     @Autowired
     private WxEnterpriseActiveDataService wxEnterpriseActiveDataService;
+    @Autowired
+    private StaffService staffService;
+    @Autowired
+    private TabHaobanRenewalUserService renewalUserService;
 
     @Override
     public ServiceResponse<LicenceOrderDTO> getLicenceOrderDetail(Long orderId, Integer type) {
@@ -132,37 +138,155 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
         String openCorpid = wxEnterpriseDTO.getOpenCorpid();
         String serviceCorpid = config.getCorpid();
         CreateOrderQDTO orderQDTO = new CreateOrderQDTO();
-        orderQDTO.setBaseCount(0);
-        orderQDTO.setExternalCount(licenceOrderQDTO.getExternalContactCount());
         orderQDTO.setBuyerUserid(config.getBuyerUserid());
         if (licenceOrderQDTO.getTimeType() == 1) {
             orderQDTO.setMonths(licenceOrderQDTO.getTimeValue());
             orderQDTO.setDays(0);
-        } else {
+        } else if (licenceOrderQDTO.getTimeType() == 2){
             orderQDTO.setMonths(0);
             orderQDTO.setDays(licenceOrderQDTO.getTimeValue());
-        }
-        ServiceResponse<CreateOrderResponseDTO> newOrder = qywxOrderApiService.createNewOrder(serviceCorpid, openCorpid, orderQDTO);
-        logger.info("企业微信订单返回信息：{}", JSON.toJSONString(newOrder));
-        if (newOrder.isSuccess()) {
-            //更新企业微信订单状态，保存企业微信订单id
-            String qywxOrderId = newOrder.getResult().getOrderId();
-            //查询订单详情，获取订单金额
-            FeeOrderDeatilResponseDTO dto = qywxUserApiService.getOrder(openCorpid, serviceCorpid, qywxOrderId);
-            logger.info("查询企业微信订单详情返回信息：{}", JSON.toJSONString(dto));
-            if (null != dto && 0 == dto.getErrcode()) {
-                Integer price = dto.getOrder().getPrice();
-                licenceOrderQDTO.setQywxOrderId(qywxOrderId);
-                licenceOrderQDTO.setPrice(price);
-                String s = licenceOrderService.saveOrUpdateLicenceOrder(licenceOrderQDTO);
-                JSONObject jsonObject = new JSONObject();
-                jsonObject.put("orderId", s);
-                jsonObject.put("price", price);
-                return ServiceResponse.success(JSON.toJSONString(jsonObject));
+        }else if (licenceOrderQDTO.getTimeType() == 3){
+            orderQDTO.setTimeStamp(licenceOrderQDTO.getTimeValue());
+        }
+        if (licenceOrderQDTO.getOrderType() == 1){
+            orderQDTO.setBaseCount(0);
+            orderQDTO.setExternalCount(licenceOrderQDTO.getExternalContactCount());
+            ServiceResponse<CreateOrderResponseDTO> newOrder = qywxOrderApiService.createNewOrder(serviceCorpid, openCorpid, orderQDTO);
+            logger.info("企业微信订单返回信息：{}", JSON.toJSONString(newOrder));
+            if (newOrder.isSuccess()) {
+                //更新企业微信订单状态，保存企业微信订单id
+                String qywxOrderId = newOrder.getResult().getOrderId();
+                //查询订单详情，获取订单金额
+                FeeOrderDeatilResponseDTO dto = qywxUserApiService.getOrder(openCorpid, serviceCorpid, qywxOrderId);
+                logger.info("查询企业微信订单详情返回信息：{}", JSON.toJSONString(dto));
+                if (null != dto && 0 == dto.getErrcode()) {
+                    Integer price = dto.getOrder().getPrice();
+                    licenceOrderQDTO.setQywxOrderId(qywxOrderId);
+                    licenceOrderQDTO.setPrice(price);
+                    String s = licenceOrderService.saveOrUpdateLicenceOrder(licenceOrderQDTO);
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("orderId", s);
+                    jsonObject.put("price", price);
+                    jsonObject.put("invalidUserList",null);
+                    return ServiceResponse.success(JSON.toJSONString(jsonObject));
+                }
+                return ServiceResponse.failure(String.valueOf(dto.getErrcode()), dto.getErrmsg());
+            }
+            return ServiceResponse.failure(newOrder.getCode(), newOrder.getMessage());
+        }else if (licenceOrderQDTO.getOrderType() == 2){
+            /**
+             * 续期订单创建流程： 0根据续期成员staffId查询成员基本信息；1按续期成员分批（每次1000）创建续期任务；2记录每一批次任务中，不合法的续期成员；3保存所有的续期成员信息；
+             * 4提交续期任务，创建企业微信订单；5查询企业微信订单详情，获得订单金额；6返回企业微信订单id、需支付的金额、非法续期成员列表
+             */
+            List<String> staffIdList = licenceOrderQDTO.getStaffIdList();
+            List<TabHaobanStaff> staffList = staffService.listStaffWithIds(staffIdList);
+            List<InvalidUserInfoDTO> invalidUserInfoDTOList = new ArrayList<>();
+            String jobId = null;
+            if (CollUtil.isEmpty(staffList)){
+                return ServiceResponse.failure("-9999","续期成员为空");
             }
-            return ServiceResponse.failure(String.valueOf(dto.getErrcode()), dto.getErrmsg());
+            Map<String, TabHaobanStaff> collect = staffList.stream().collect(Collectors.toMap(TabHaobanStaff::getWxUserId, a -> a));
+
+            List<AccountListQDTO> userIdList = new ArrayList<>();
+            List<List<AccountListQDTO>> userIds = new ArrayList<>();
+            for (int i = 0; i < staffList.size(); i++) {
+                if (staffList.get(i).getWxUserId() != null){
+                    AccountListQDTO accountListQDTO = new AccountListQDTO();
+                    //默认购买互通账号
+                    accountListQDTO.setType(2);
+                    accountListQDTO.setUserid(staffList.get(i).getWxUserId());
+                    userIdList.add(accountListQDTO);
+                }
+                if ((i+1) % 1000 == 0) {
+                    userIds.add(userIdList);
+                    userIdList.clear();
+                }
+            }
+            if (CollectionUtils.isNotEmpty(userIdList)) {
+                userIds.add(userIdList);
+                userIdList.clear();
+            }
+            for (List<AccountListQDTO> list : userIds){
+                logger.info("续期成员个数{}", list.size());
+                ServiceResponse<CreateRenewOrderJobDTO> job = qywxOrderApiService.createRenewOrderJob(serviceCorpid, openCorpid, jobId, list);
+                logger.info("企业微信续期订单接口返回信息：{}",JSON.toJSONString(job));
+                if (job.isSuccess()){
+                    CreateRenewOrderJobDTO result = job.getResult();
+                    jobId = result.getJobid();
+                    //续期非法成员处理
+                    List<AccountListQDTO> invalidAccountList = result.getInvalid_account_list();
+                    if (CollUtil.isNotEmpty(invalidAccountList)){
+                        for (AccountListQDTO dto : invalidAccountList){
+                            String userid = dto.getUserid();
+                            TabHaobanStaff staff = collect.get(userid);
+                            if (null != staff){
+                                InvalidUserInfoDTO invalidUserInfoDTO = new InvalidUserInfoDTO();
+                                invalidUserInfoDTO.setWxUserId(userid);
+                                invalidUserInfoDTO.setInvalidCode(String.valueOf(dto.getErrcode()));
+                                invalidUserInfoDTO.setInvalidMsg(dto.getErrmsg());
+                                invalidUserInfoDTO.setName(staff.getStaffName());
+                                invalidUserInfoDTO.setPhone(staff.getPhoneNumber());
+                                invalidUserInfoDTOList.add(invalidUserInfoDTO);
+                            }
+                        }
+                    }
+                }else {
+                    logger.info("企业微信创建续期任务接口返回失败");
+                    return ServiceResponse.failure("-9999","企业微信创建续期任务接口返回失败");
+                }
+            }
+            //提交任务订单
+            orderQDTO.setJobId(jobId);
+            ServiceResponse<CreateOrderResponseDTO> submitOrderJob = qywxOrderApiService.submitOrderJob(serviceCorpid, openCorpid, orderQDTO);
+            if (submitOrderJob.isSuccess()){
+                //更新企业微信订单状态，保存企业微信订单id
+                String qywxOrderId = submitOrderJob.getResult().getOrderId();
+                //查询订单详情，获取订单金额
+                FeeOrderDeatilResponseDTO dto = qywxUserApiService.getOrder(openCorpid, serviceCorpid, qywxOrderId);
+                logger.info("查询企业微信订单详情返回信息：{}", JSON.toJSONString(dto));
+                if (null != dto && 0 == dto.getErrcode()) {
+                    Integer price = dto.getOrder().getPrice();
+                    licenceOrderQDTO.setQywxOrderId(qywxOrderId);
+                    licenceOrderQDTO.setPrice(price);
+                    String s = licenceOrderService.saveOrUpdateLicenceOrder(licenceOrderQDTO);
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("orderId", s);
+                    jsonObject.put("price", price);
+                    jsonObject.put("invalidUserList",invalidUserInfoDTOList);
+                    //保存续期成员信息
+                    List<TabHaobanRenewalUser> renewalUserList = new ArrayList<>();
+                    Map<String, InvalidUserInfoDTO> invalidUserMap = invalidUserInfoDTOList.stream().collect(Collectors.toMap(InvalidUserInfoDTO::getWxUserId, a -> a));
+                    for (TabHaobanStaff staff : staffList){
+                        //需要区分续期成功和不成功的成员
+                        TabHaobanRenewalUser renewalUser = new TabHaobanRenewalUser();
+                        renewalUser.setOrderId(Long.valueOf(s));
+                        renewalUser.setRenewalId(UniqueIdUtils.uniqueLong());
+                        renewalUser.setWxUserId(staff.getWxUserId());
+                        renewalUser.setWxEnterpriseId(licenceOrderQDTO.getWxEnterpriseId());
+                        renewalUser.setPhone(staff.getPhoneNumber());
+                        renewalUser.setName(staff.getStaffName());
+                        renewalUser.setPostion(staff.getPostion());
+                        renewalUser.setCreateTime(new Date());
+                        renewalUser.setUpdateTime(new Date());
+                        renewalUser.setDeleteFlag(0);
+                        if (CollUtil.isNotEmpty(invalidUserMap) && invalidUserMap.containsKey(staff.getWxUserId())){
+                            InvalidUserInfoDTO invalidUserInfoDTO = invalidUserMap.get(staff.getWxUserId());
+                            renewalUser.setInvalidFlag(0);
+                            renewalUser.setInvalidCode(invalidUserInfoDTO.getInvalidCode());
+                            renewalUser.setInvalidMsg(invalidUserInfoDTO.getInvalidMsg());
+                        }else {
+                            renewalUser.setInvalidFlag(1);
+                        }
+                        renewalUserList.add(renewalUser);
+                    }
+                    renewalUserService.insertBatch(renewalUserList);
+                    return ServiceResponse.success(JSON.toJSONString(jsonObject));
+                }
+                return ServiceResponse.failure(String.valueOf(dto.getErrcode()), dto.getErrmsg());
+            }
+            return ServiceResponse.failure(submitOrderJob.getCode(), submitOrderJob.getMessage());
         }
-        return ServiceResponse.failure(newOrder.getCode(), newOrder.getMessage());
+        return null;
     }
 
     @Override

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java

@@ -472,7 +472,7 @@ public class StaffController extends WebBaseController {
     @RequestMapping("staff-export")
     public HaobanResponse staffExport(HttpServletRequest request, HttpServletResponse response,String departmentId, Integer activeFlag, Integer relationFlag,
                                       String keyWord, String permitState,BasePageInfo pageInfo,@RequestParam(defaultValue = "create_time") String sortField,
-                                      @RequestParam(defaultValue = "desc") String sortType,String enterpriseIdParam) {
+                                      @RequestParam(defaultValue = "desc") String sortType,String enterpriseIdParam,String startTime,String endTime) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
         if(StringUtils.isBlank(departmentId)){
@@ -497,6 +497,8 @@ public class StaffController extends WebBaseController {
         dto.setSortField(sortField);
         dto.setSortType(sortType);
         dto.setEnterpriseIdParam(enterpriseIdParam);
+        dto.setStartTime(startTime);
+        dto.setEndTime(endTime);
         pageInfo.setPageSize(Integer.MAX_VALUE);
         int pageNum = 1;
         while (true) {

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/licence/LicenceOrderQO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -52,7 +53,10 @@ public class LicenceOrderQO implements Serializable {
      * 支付类型 1在线支付 2对公转账
      */
     private Integer payType;
-
+    /**
+     * 续期成员staffIdList
+     */
+    private List<String> staffIdList;
     /**
      * 校验金额
      */