创建续期订单

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-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;
     /**
      * 校验金额
      */