Skip to content

H
haoban-manage3.0
Commit 9d21931a by jinxin
Options

Merge remote-tracking branch 'origin/bugfix/2023-06-07' into developer 

# Conflicts:
#	haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/StaffActiveDataVO.java
parents 1b23dc18 e8df7f6f
Showing with 168 additions and 125 deletions
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
package com.gic.haoban.manage.web.vo;
import java.io.Serializable;
/**
* @description: 通讯录许可数据总览
* @Author: wenhua
* @Date: 2023/1/30 20:28
*/
public class StaffActiveDataVO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
private String id;
/**
* wx企业id
*/
private String wxEnterpriseId;
/**
* 已购买许可总数
*/
private Integer purchased;
/**
* 已使用许可总数
*/
private Integer used;
/**
* 未激活许可总数
*/
private Integer inactive;
/**
* 待转移许可总数
*/
private Integer transfer;
/**
* 已激活许可总数
*/
private Integer activated;
/**
* 已过期许可总数
*/
private Integer expired;
/**
* 其他占用许可总数
*/
private Integer occupy;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Integer getPurchased() {
return purchased;
}
public void setPurchased(Integer purchased) {
this.purchased = purchased;
}
public Integer getInactive() {
return inactive;
}
public void setInactive(Integer inactive) {
this.inactive = inactive;
}
public Integer getTransfer() {
return transfer;
}
public void setTransfer(Integer transfer) {
this.transfer = transfer;
}
public Integer getActivated() {
return activated;
}
public void setActivated(Integer activated) {
this.activated = activated;
}
public Integer getExpired() {
return expired;
}
public void setExpired(Integer expired) {
this.expired = expired;
}
public Integer getOccupy() {
return occupy;
}
public void setOccupy(Integer occupy) {
this.occupy = occupy;
}
public Integer getUsed() {
return used;
}
public void setUsed(Integer used) {
this.used = used;
}
}
package com.gic.haoban.manage.web.vo;
import java.io.Serializable;
/**
* @description: 通讯录许可数据总览
* @Author: wenhua
* @Date: 2023/1/30 20:28
*/
public class StaffActiveDataVO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
private String id;
/**
* wx企业id
*/
private String wxEnterpriseId;
/**
* 已购买许可总数
*/
private Integer purchased;
/**
* 已使用许可总数
*/
private Integer used;
/**
* 未激活许可总数
*/
private Integer inactive;
/**
* 待转移许可总数
*/
private Integer transfer;
/**
* 已激活许可总数
*/
private Integer activated;
/**
* 已过期许可总数
*/
private Integer expired;
/**
* 其他占用许可总数
*/
private Integer occupy;
/**
* 已合并许可总数
*/
private Integer merged;
public Integer getMerged() {
return merged;
}
public void setMerged(Integer merged) {
this.merged = merged;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Integer getPurchased() {
return purchased;
}
public void setPurchased(Integer purchased) {
this.purchased = purchased;
}
public Integer getInactive() {
return inactive;
}
public void setInactive(Integer inactive) {
this.inactive = inactive;
}
public Integer getTransfer() {
return transfer;
}
public void setTransfer(Integer transfer) {
this.transfer = transfer;
}
public Integer getActivated() {
return activated;
}
public void setActivated(Integer activated) {
this.activated = activated;
}
public Integer getExpired() {
return expired;
}
public void setExpired(Integer expired) {
this.expired = expired;
}
public Integer getOccupy() {
return occupy;
}
public void setOccupy(Integer occupy) {
this.occupy = occupy;
}
public Integer getUsed() {
return used;
}
public void setUsed(Integer used) {
this.used = used;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment