feat:收费增加待转移字段

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/fee/HaobanQywxFeeDTO.java

@@ -43,6 +43,8 @@ public class HaobanQywxFeeDTO implements Serializable {
 
     private Integer detailNum;
 
+    private Integer transferUserNum;
+
     private Integer autoActiveFlag;
 
     private String enterpriseNames;
@@ -142,5 +144,13 @@ public class HaobanQywxFeeDTO implements Serializable {
     public void setEnterpriseNames(String enterpriseNames) {
         this.enterpriseNames = enterpriseNames;
     }
+
+    public Integer getTransferUserNum() {
+        return transferUserNum;
+    }
+
+    public void setTransferUserNum(Integer transferUserNum) {
+        this.transferUserNum = transferUserNum;
+    }
 }
 

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

@@ -64,7 +64,7 @@ public interface TabHaobanQywxFeeOrderAccountMapper {
     int deleteById(Long feeAccountId);
 
     /**
-     * 未激活用户数
+     * 根据状态查询用户数
      *
      * @param status
      * @param wxEnterpriseId

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

@@ -39,6 +39,7 @@ public class TabHaobanQywxFee implements Serializable {
      * 拦截：1:已拦截；0：将被拦截
      */
     private Integer interceptFlag;
+    private Integer transferUserNum;
 
 
     public Long getQwFeeId() {
@@ -113,5 +114,12 @@ public class TabHaobanQywxFee implements Serializable {
         this.interceptFlag = interceptFlag;
     }
 
+    public Integer getTransferUserNum() {
+        return transferUserNum;
+    }
+
+    public void setTransferUserNum(Integer transferUserNum) {
+        this.transferUserNum = transferUserNum;
+    }
 }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/fee/HaobanQywxFeeBO.java

@@ -39,6 +39,7 @@ public class HaobanQywxFeeBO implements Serializable {
      * 拦截：1:已拦截；0：将被拦截
      */
     private Integer interceptFlag;
+    private Integer transferUserNum;
 
 
     public Long getQwFeeId() {
@@ -113,5 +114,12 @@ public class HaobanQywxFeeBO implements Serializable {
         this.interceptFlag = interceptFlag;
     }
 
+    public Integer getTransferUserNum() {
+        return transferUserNum;
+    }
+
+    public void setTransferUserNum(Integer transferUserNum) {
+        this.transferUserNum = transferUserNum;
+    }
 }
 

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

@@ -239,6 +239,7 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
         //更新收费
         HaobanQywxFeeDetailDTO haobanQywxFeeDetailDTO = haobanQywxFeeAccountStaffService.feeIntercept(wxEnterpriseId);
         int permissionUserNum = haobanQywxFeeOrderAccountService.countOrderAccountStatus(1, wxEnterpriseId);
+        int transferUserNum = haobanQywxFeeOrderAccountService.countOrderAccountStatus(4, wxEnterpriseId);
         if (haobanQywxFeeDetailDTO != null && permissionUserNum > 0) {
             TabHaobanQywxFee tabHaobanQywxFee = new TabHaobanQywxFee();
             tabHaobanQywxFee.setQwFeeId(UniqueIdUtils.uniqueLong());
@@ -248,6 +249,7 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
             tabHaobanQywxFee.setInterceptTime(haobanQywxFeeDetailDTO.getInterceptTime());
             tabHaobanQywxFee.setInterceptUserNum(haobanQywxFeeDetailDTO.getInterceptUserNum());
             tabHaobanQywxFee.setPermissionUserNum(permissionUserNum);
+            tabHaobanQywxFee.setTransferUserNum(transferUserNum);
             tabHaobanQywxFee.setBuyPermissionUserNum(haobanQywxFeeOrderService.countExternalContactCount(wxEnterpriseId));
             tabHaobanQywxFee.setInterceptFlag(0);
             haobanQywxFeeService.insert(tabHaobanQywxFee);
@@ -270,6 +272,7 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
             tabHaobanQywxFee.setInterceptTime(DateUtil.offsetDay(new Date(), -1));
             tabHaobanQywxFee.setInterceptUserNum(tabHaobanQywxFeeAccountInterceptLogs.size());
             tabHaobanQywxFee.setPermissionUserNum(permissionUserNum);
+            tabHaobanQywxFee.setTransferUserNum(transferUserNum);
             tabHaobanQywxFee.setBuyPermissionUserNum(haobanQywxFeeOrderService.countExternalContactCount(wxEnterpriseId));
             tabHaobanQywxFee.setInterceptFlag(1);
             haobanQywxFeeService.insert(tabHaobanQywxFee);

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

@@ -12,11 +12,20 @@
         <result property="permissionUserNum" column="permission_user_num" jdbcType="INTEGER"/>
         <result property="buyPermissionUserNum" column="buy_permission_user_num" jdbcType="INTEGER"/>
         <result property="interceptFlag" column="intercept_flag" jdbcType="INTEGER"/>
+        <result property="transferUserNum" column="transfer_user_num" jdbcType="INTEGER"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        qw_fee_id
-        , corp_name, corp_id, wx_enterprise_id, intercept_time, intercept_user_num, permission_user_num, buy_permission_user_num, intercept_flag
+        qw_fee_id,
+        corp_name,
+        corp_id,
+        wx_enterprise_id,
+        intercept_time,
+        intercept_user_num,
+        permission_user_num,
+        buy_permission_user_num,
+        intercept_flag,
+        transfer_user_num
     </sql>
 
     <!--查询单个-->
@@ -66,19 +75,19 @@
     <insert id="insert" keyProperty="qwFeeId" useGeneratedKeys="true">
         insert into tab_haoban_qywx_fee(qw_fee_id, corp_name, corp_id, wx_enterprise_id, intercept_time,
                                         intercept_user_num, permission_user_num, buy_permission_user_num,
-                                        intercept_flag)
+                                        intercept_flag,transfer_user_num)
         values (#{qwFeeId}, #{corpName}, #{corpId}, #{wxEnterpriseId}, #{interceptTime}, #{interceptUserNum},
-                #{permissionUserNum}, #{buyPermissionUserNum}, #{interceptFlag})
+                #{permissionUserNum}, #{buyPermissionUserNum}, #{interceptFlag},#{transferUserNum})
     </insert>
 
     <insert id="insertBatch" keyProperty="qwFeeId" useGeneratedKeys="true">
         insert into tab_haoban_qywx_fee(qw_fee_id, corp_name, corp_id, wx_enterprise_id, intercept_time,
-        intercept_user_num, permission_user_num, buy_permission_user_num, intercept_flag)
+        intercept_user_num, permission_user_num, buy_permission_user_num, intercept_flag,transfer_user_num)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.qwFeeId}, #{entity.corpName}, #{entity.corpId}, #{entity.wxEnterpriseId}, #{entity.interceptTime},
             #{entity.interceptUserNum}, #{entity.permissionUserNum}, #{entity.buyPermissionUserNum},
-            #{entity.interceptFlag})
+            #{entity.interceptFlag},#{entity.transferUserNum})
         </foreach>
     </insert>
 
@@ -111,6 +120,9 @@
             <if test="interceptFlag != null">
                 intercept_flag = #{interceptFlag},
             </if>
+            <if test="transferUserNum != null">
+                transfer_user_num = #{transferUserNum},
+            </if>
         </set>
         where qw_fee_id = #{qwFeeId}
     </update>