统计已合并许可账号总数

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

@@ -46,6 +46,18 @@ public class StaffActiveDataDTO implements Serializable {
      * 其他占用许可总数
      */
     private Integer occupy;
+    /**
+     * 已合并许可总数
+     */
+    private Integer merged;
+
+    public Integer getMerged() {
+        return merged;
+    }
+
+    public void setMerged(Integer merged) {
+        this.merged = merged;
+    }
 
     public String getId() {
         return id;

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

@@ -49,6 +49,18 @@ public class TabHaobanWxEnterpriseActiveData implements Serializable {
     private Date updateTime;
 
     private Integer deleteFlag;
+    /**
+     * 已合并许可总数
+     */
+    private Integer merged;
+
+    public Integer getMerged() {
+        return merged;
+    }
+
+    public void setMerged(Integer merged) {
+        this.merged = merged;
+    }
 
     public Long getId() {
         return id;

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

@@ -49,7 +49,7 @@ public class WxEnterpriseActiveDataServiceImpl implements WxEnterpriseActiveData
             return 0;
         }
         //初始化各状态
-        Integer purchased = 0, used = 0, inactive = 0, transfer = 0, activated = 0, expired = 0;
+        Integer purchased = 0, used = 0, inactive = 0, transfer = 0, activated = 0, expired = 0,merged = 0;
         for (HashMap<String, Integer> map : feeOrderAccountMapList) {
             switch (map.get("status")) {
                 case 1:
@@ -70,7 +70,8 @@ public class WxEnterpriseActiveDataServiceImpl implements WxEnterpriseActiveData
                     transfer += Integer.valueOf(String.valueOf(map.get("num")));
                     break;
                 case 5:
-                    purchased += Integer.valueOf(String.valueOf(map.get("num")));
+                    //已合并的激活码，总数会减少
+                    merged += Integer.valueOf(String.valueOf(map.get("num")));
                     break;
                 default:
                     break;
@@ -87,6 +88,7 @@ public class WxEnterpriseActiveDataServiceImpl implements WxEnterpriseActiveData
             tabHaobanWxEnterpriseActiveData.setUsed(used);
             tabHaobanWxEnterpriseActiveData.setTransfer(transfer);
             tabHaobanWxEnterpriseActiveData.setExpired(expired);
+            tabHaobanWxEnterpriseActiveData.setMerged(merged);
             return tabHaobanWxEnterpriseActiveDataMapper.updateActiveDataByWxEnterpriseId(tabHaobanWxEnterpriseActiveData);
         } else {
             //新增
@@ -99,6 +101,7 @@ public class WxEnterpriseActiveDataServiceImpl implements WxEnterpriseActiveData
             tabHaobanWxEnterpriseActiveData.setUsed(used);
             tabHaobanWxEnterpriseActiveData.setExpired(expired);
             tabHaobanWxEnterpriseActiveData.setTransfer(transfer);
+            tabHaobanWxEnterpriseActiveData.setMerged(merged);
             return tabHaobanWxEnterpriseActiveDataMapper.insert(tabHaobanWxEnterpriseActiveData);
         }
     }

haoban-manage3-service/src/main/resources/mapper/TabHaobanWxEnterpriseActiveDataMapper.xml

@@ -10,15 +10,16 @@
         <result column="transfer" jdbcType="INTEGER" property="transfer"/>
         <result column="activated" jdbcType="INTEGER" property="activated"/>
         <result column="expired" jdbcType="INTEGER" property="expired"/>
+        <result column="merged" jdbcType="INTEGER" property="merged"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="delete_flag" jdbcType="INTEGER" property="deleteFlag"/>
     </resultMap>
     <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseActiveData">
         insert into tab_haoban_wx_enterprise_active_data (id, wx_enterprise_id, purchased,used,
-                                                          inactive, transfer, activated,expired,create_time,update_time,delete_flag)
+                                                          inactive, transfer, activated,expired,create_time,update_time,delete_flag,merged)
         values (#{id,jdbcType=BIGINT}, #{wxEnterpriseId,jdbcType=VARCHAR}, #{purchased,jdbcType=INTEGER},#{used,jdbcType=INTEGER},#{inactive,jdbcType=INTEGER},
-                #{transfer,jdbcType=INTEGER},#{activated,jdbcType=INTEGER},#{expired,jdbcType=INTEGER},now(),now(),0)
+                #{transfer,jdbcType=INTEGER},#{activated,jdbcType=INTEGER},#{expired,jdbcType=INTEGER},now(),now(),0,#{merged,jdbcType=INTEGER})
 	</insert>
 
     <select id="getWxEnterpriseActiveDataByWxEnterpriseId" resultMap="BaseResultMap">
@@ -46,6 +47,9 @@
             <if test="expired != null" >
                 expired = #{expired,jdbcType=INTEGER},
             </if>
+            <if test="merged != null" >
+                merged = #{merged,jdbcType=INTEGER},
+            </if>
             update_time = now()
         </set>
         where wx_enterprise_id=#{wxEnterpriseId}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/StaffActiveDataVO.java

@@ -46,6 +46,18 @@ public class StaffActiveDataVO implements Serializable {
      * 其他占用许可总数
      */
     private Integer occupy;
+    /**
+     * 已合并许可总数
+     */
+    private Integer merged;
+
+    public Integer getMerged() {
+        return merged;
+    }
+
+    public void setMerged(Integer merged) {
+        this.merged = merged;
+    }
 
     public String getId() {
         return id;