Skip to content

H
haoban-manage3.0
Commit 99658758 by 徐高华
Options

Merge remote-tracking branch 'origin/feature/获取用户敏感信息' into developer 

Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/fee/TabHaobanQywxFeeOrderMapper.java
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/fee/HaobanQywxFeeOrderService.java
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/fee/impl/HaobanQywxFeeOrderServiceImpl.java
	haoban-manage3-service/src/main/resources/mapper/fee/TabHaobanQywxFeeOrderMapper.xml
parents 36878d47 abe87adc
Showing with 200 additions and 393 deletions
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/fee/TabHaobanQywxFeeOrderMapper.java
package com.gic.haoban.manage.service.dao.mapper.fee;
import com.gic.haoban.manage.service.entity.fee.TabHaobanQywxFeeOrder;
import org.apache.ibatis.annotations.Param;
import org.springframework.data.domain.Pageable;
import java.util.List;
/**
* 企业微信收费订单(TabHaobanQywxFeeOrder)表数据库访问层
*
* @author mozhu
* @since 2022-08-03 16:12:32
*/
public interface TabHaobanQywxFeeOrderMapper {
/**
* 通过ID查询单条数据
*
* @param feeOrderId 主键
* @return 实例对象
*/
TabHaobanQywxFeeOrder queryById(Long feeOrderId);
/**
* 查询指定行数据
*
* @param tabHaobanQywxFeeOrder 查询条件
* @param pageable 分页对象
* @return 对象列表
*/
List<TabHaobanQywxFeeOrder> queryAllByLimit(TabHaobanQywxFeeOrder tabHaobanQywxFeeOrder, @Param("pageable") Pageable pageable);
/**
* 新增数据
*
* @param tabHaobanQywxFeeOrder 实例对象
* @return 影响行数
*/
int insert(TabHaobanQywxFeeOrder tabHaobanQywxFeeOrder);
/**
* 批量新增数据（MyBatis原生foreach方法）
*
* @param entities List<TabHaobanQywxFeeOrder> 实例对象列表
* @return 影响行数
*/
int insertBatch(@Param("entities") List<TabHaobanQywxFeeOrder> entities);
/**
* 修改数据
*
* @param tabHaobanQywxFeeOrder 实例对象
* @return 影响行数
*/
int update(TabHaobanQywxFeeOrder tabHaobanQywxFeeOrder);
/**
* 通过主键删除数据
*
* @param feeOrderId 主键
* @return 影响行数
*/
int deleteById(Long feeOrderId);
/**
* 购买许可总数
*
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-08-05 11:18:22
*/
int countExternalContactCount(@Param("wxEnterpriseId") String wxEnterpriseId);
/**
* 有订单
*
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-08-12 10:42:36
*/
int hasOrder(@Param("wxEnterpriseId") String wxEnterpriseId);
}
package com.gic.haoban.manage.service.dao.mapper.fee;
import org.apache.ibatis.annotations.Param;
import com.gic.haoban.manage.service.entity.fee.TabHaobanQywxFeeOrder;
/**
* 企业微信收费订单(TabHaobanQywxFeeOrder)表数据库访问层
*
* @author mozhu
* @since 2022-08-03 16:12:32
*/
public interface TabHaobanQywxFeeOrderMapper {
/**
* 通过ID查询单条数据
*
* @param feeOrderId 主键
* @return 实例对象
*/
TabHaobanQywxFeeOrder selectByOrderId(@Param("wxEnterpriseId")String wxEnterpriseId , @Param("wxEnterpriseId")String orderId) ;
/**
* 新增数据
*
* @param tabHaobanQywxFeeOrder 实例对象
* @return 影响行数
*/
int insert(TabHaobanQywxFeeOrder tabHaobanQywxFeeOrder);
/**
* 购买许可总数
*
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-08-05 11:18:22
*/
int countExternalContactCount(@Param("wxEnterpriseId") String wxEnterpriseId);
/**
* 有订单
*
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-08-12 10:42:36
*/
int hasOrder(@Param("wxEnterpriseId") String wxEnterpriseId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/fee/HaobanQywxFeeOrderService.java
package com.gic.haoban.manage.service.service.fee;
import com.gic.haoban.manage.service.entity.fee.TabHaobanQywxFeeOrder;
/**
* 企业微信收费订单(TabHaobanQywxFeeOrder)表服务接口
*
* @author mozhu
* @since 2022-08-03 16:12:33
*/
public interface HaobanQywxFeeOrderService {
/**
* 通过ID查询单条数据
*
* @param feeOrderId 主键
* @return 实例对象
*/
TabHaobanQywxFeeOrder queryById(Long feeOrderId);
/**
* 新增数据
*
* @param tabHaobanQywxFeeOrder 实例对象
* @return 实例对象
*/
TabHaobanQywxFeeOrder insert(TabHaobanQywxFeeOrder tabHaobanQywxFeeOrder);
/**
* 修改数据
*
* @param tabHaobanQywxFeeOrder 实例对象
* @return 实例对象
*/
TabHaobanQywxFeeOrder update(TabHaobanQywxFeeOrder tabHaobanQywxFeeOrder);
/**
* 通过主键删除数据
*
* @param feeOrderId 主键
* @return 是否成功
*/
boolean deleteById(Long feeOrderId);
/**
* 购买许可总数
*
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-08-05 11:17:43
*/
int countExternalContactCount(String wxEnterpriseId);
/**
* 是否有订单
*
* @param wxEnterpriseId wx企业标识
* @return boolean
* @author mozhu
* @date 2022-08-12 10:43:21
*/
boolean hasOrder(String wxEnterpriseId);
}
package com.gic.haoban.manage.service.service.fee;
import com.gic.haoban.manage.service.entity.fee.TabHaobanQywxFeeOrder;
/**
* 企业微信收费订单(TabHaobanQywxFeeOrder)表服务接口
*
* @author mozhu
* @since 2022-08-03 16:12:33
*/
public interface HaobanQywxFeeOrderService {
/**
* 新增数据
*
* @param tabHaobanQywxFeeOrder 实例对象
* @return 实例对象
*/
TabHaobanQywxFeeOrder insert(TabHaobanQywxFeeOrder tabHaobanQywxFeeOrder);
/**
* 购买许可总数
*
* @param wxEnterpriseId wx企业标识
* @return int
* @author mozhu
* @date 2022-08-05 11:17:43
*/
int countExternalContactCount(String wxEnterpriseId);
/**
* 是否有订单
*
* @param wxEnterpriseId wx企业标识
* @return boolean
* @author mozhu
* @date 2022-08-12 10:43:21
*/
boolean hasOrder(String wxEnterpriseId);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/fee/impl/HaobanQywxFeeOrderServiceImpl.java
package com.gic.haoban.manage.service.service.fee.impl;
import com.gic.haoban.manage.service.dao.mapper.fee.TabHaobanQywxFeeOrderMapper;
import com.gic.haoban.manage.service.entity.fee.TabHaobanQywxFeeOrder;
import com.gic.haoban.manage.service.service.fee.HaobanQywxFeeOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* 企业微信收费订单(TabHaobanQywxFeeOrder)表服务实现类
*
* @author mozhu
* @since 2022-08-03 16:12:33
*/
@Service
public class HaobanQywxFeeOrderServiceImpl implements HaobanQywxFeeOrderService {
@Autowired
private TabHaobanQywxFeeOrderMapper tabHaobanQywxFeeOrderMapper;
/**
* 通过ID查询单条数据
*
* @param feeOrderId 主键
* @return 实例对象
*/
@Override
public TabHaobanQywxFeeOrder queryById(Long feeOrderId) {
return this.tabHaobanQywxFeeOrderMapper.queryById(feeOrderId);
}
/**
* 新增数据
*
* @param tabHaobanQywxFeeOrder 实例对象
* @return 实例对象
*/
@Override
public TabHaobanQywxFeeOrder insert(TabHaobanQywxFeeOrder tabHaobanQywxFeeOrder) {
this.tabHaobanQywxFeeOrderMapper.insert(tabHaobanQywxFeeOrder);
return tabHaobanQywxFeeOrder;
}
/**
* 修改数据
*
* @param tabHaobanQywxFeeOrder 实例对象
* @return 实例对象
*/
@Override
public TabHaobanQywxFeeOrder update(TabHaobanQywxFeeOrder tabHaobanQywxFeeOrder) {
this.tabHaobanQywxFeeOrderMapper.update(tabHaobanQywxFeeOrder);
return this.queryById(tabHaobanQywxFeeOrder.getFeeOrderId());
}
/**
* 通过主键删除数据
*
* @param feeOrderId 主键
* @return 是否成功
*/
@Override
public boolean deleteById(Long feeOrderId) {
return this.tabHaobanQywxFeeOrderMapper.deleteById(feeOrderId) > 0;
}
@Override
public int countExternalContactCount(String wxEnterpriseId) {
return tabHaobanQywxFeeOrderMapper.countExternalContactCount(wxEnterpriseId);
}
@Override
public boolean hasOrder(String wxEnterpriseId) {
int count = tabHaobanQywxFeeOrderMapper.hasOrder(wxEnterpriseId);
return count > 0;
}
}
package com.gic.haoban.manage.service.service.fee.impl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.gic.haoban.manage.service.dao.mapper.fee.TabHaobanQywxFeeOrderMapper;
import com.gic.haoban.manage.service.entity.fee.TabHaobanQywxFeeOrder;
import com.gic.haoban.manage.service.service.fee.HaobanQywxFeeOrderService;
/**
* 企业微信收费订单(TabHaobanQywxFeeOrder)表服务实现类
*
* @author mozhu
* @since 2022-08-03 16:12:33
*/
@Service
public class HaobanQywxFeeOrderServiceImpl implements HaobanQywxFeeOrderService {
@Autowired
private TabHaobanQywxFeeOrderMapper tabHaobanQywxFeeOrderMapper;
/**
* 新增数据
*
* @param tabHaobanQywxFeeOrder 实例对象
* @return 实例对象
*/
@Override
public TabHaobanQywxFeeOrder insert(TabHaobanQywxFeeOrder tabHaobanQywxFeeOrder) {
String wxEnterpriseId = tabHaobanQywxFeeOrder.getWxEnterpriseId() ;
String orderId = tabHaobanQywxFeeOrder.getOrderId() ;
TabHaobanQywxFeeOrder tab = this.tabHaobanQywxFeeOrderMapper.selectByOrderId(wxEnterpriseId, orderId) ;
if(null != tab) {
return tab ;
}
this.tabHaobanQywxFeeOrderMapper.insert(tabHaobanQywxFeeOrder);
return tabHaobanQywxFeeOrder;
}
@Override
public int countExternalContactCount(String wxEnterpriseId) {
return tabHaobanQywxFeeOrderMapper.countExternalContactCount(wxEnterpriseId);
}
@Override
public boolean hasOrder(String wxEnterpriseId) {
int count = tabHaobanQywxFeeOrderMapper.hasOrder(wxEnterpriseId);
return count > 0;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/fee/HaobanQywxFeeApiServiceImpl.java
......@@ -115,7 +115,7 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
private void getOrderAccount(String orderId , String corpid , String cursor , List<Map<String, String>> activeCodeList) {
FeeOrderListQDTO feeOrderListQDTO = new FeeOrderListQDTO();
feeOrderListQDTO.setOrderId(orderId);
feeOrderListQDTO.setCursor(feeOrderListQDTO.getCursor());
feeOrderListQDTO.setCursor(cursor);
feeOrderListQDTO.setLimit(Manage3Constants.QW_LIMIT);
AccountListResponseDTO accountListResponseDTO = qywxUserApiService.listOrderAccount(corpid, config.getCorpid(), feeOrderListQDTO);
if (accountListResponseDTO.getErrcode() != 0) {
......
haoban-manage3-service/src/main/resources/mapper/fee/TabHaobanQywxFeeOrderMapper.xml
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gic.haoban.manage.service.dao.mapper.fee.TabHaobanQywxFeeOrderMapper">
<resultMap type="com.gic.haoban.manage.service.entity.fee.TabHaobanQywxFeeOrder" id="TabHaobanQywxFeeOrderMap">
<result property="feeOrderId" column="fee_order_id" jdbcType="INTEGER"/>
<result property="orderId" column="order_id" jdbcType="VARCHAR"/>
<result property="corpId" column="corp_id" jdbcType="VARCHAR"/>
<result property="wxEnterpriseId" column="wx_enterprise_id" jdbcType="VARCHAR"/>
<result property="orderType" column="order_type" jdbcType="INTEGER"/>
<result property="orderStatus" column="order_status" jdbcType="INTEGER"/>
<result property="price" column="price" jdbcType="VARCHAR"/>
<result property="baseCount" column="base_count" jdbcType="INTEGER"/>
<result property="externalContactCount" column="external_contact_count" jdbcType="INTEGER"/>
<result property="months" column="months" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="payTime" column="pay_time" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
fee_order_id
, order_id, corp_id, wx_enterprise_id, order_type, order_status, price, base_count, external_contact_count, months, create_time, pay_time
</sql>
<!--查询单个-->
<select id="queryById" resultMap="TabHaobanQywxFeeOrderMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_qywx_fee_order
where fee_order_id = #{feeOrderId}
</select>
<!--查询指定行数据-->
<select id="queryAllByLimit" resultMap="TabHaobanQywxFeeOrderMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_qywx_fee_order
<where>
<if test="feeOrderId != null">
and fee_order_id = #{feeOrderId}
</if>
<if test="orderId != null and orderId != ''">
and order_id = #{orderId}
</if>
<if test="corpId != null and corpId != ''">
and corp_id = #{corpId}
</if>
<if test="wxEnterpriseId != null and wxEnterpriseId != ''">
and wx_enterprise_id = #{wxEnterpriseId}
</if>
<if test="orderType != null">
and order_type = #{orderType}
</if>
<if test="orderStatus != null">
and order_status = #{orderStatus}
</if>
<if test="price != null">
and price = #{price}
</if>
<if test="baseCount != null">
and base_count = #{baseCount}
</if>
<if test="externalContactCount != null">
and external_contact_count = #{externalContactCount}
</if>
<if test="months != null">
and months = #{months}
</if>
<if test="createTime != null">
and create_time = #{createTime}
</if>
<if test="payTime != null">
and pay_time = #{payTime}
</if>
</where>
limit #{pageable.offset}, #{pageable.pageSize}
</select>
<!--新增所有列-->
<insert id="insert" keyProperty="feeOrderId" useGeneratedKeys="true">
insert into tab_haoban_qywx_fee_order(fee_order_id, order_id, corp_id, wx_enterprise_id, order_type,
order_status, price, base_count, external_contact_count, months,
create_time, pay_time)
values (#{feeOrderId}, #{orderId}, #{corpId}, #{wxEnterpriseId}, #{orderType}, #{orderStatus}, #{price},
#{baseCount}, #{externalContactCount}, #{months}, #{createTime}, #{payTime})
</insert>
<insert id="insertBatch" keyProperty="feeOrderId" useGeneratedKeys="true">
insert into tab_haoban_qywx_fee_order(fee_order_id, order_id, corp_id, wx_enterprise_id, order_type,
order_status, price, base_count, external_contact_count, months, create_time, pay_time)
values
<foreach collection="entities" item="entity" separator=",">
(#{entity.feeOrderId}, #{entity.orderId}, #{entity.corpId}, #{entity.wxEnterpriseId}, #{entity.orderType},
#{entity.orderStatus}, #{entity.price}, #{entity.baseCount}, #{entity.externalContactCount},
#{entity.months}, #{entity.createTime}, #{entity.payTime})
</foreach>
</insert>
<!--通过主键修改数据-->
<update id="update">
update tab_haoban_qywx_fee_order
<set>
<if test="orderId != null and orderId != ''">
order_id = #{orderId},
</if>
<if test="corpId != null and corpId != ''">
corp_id = #{corpId},
</if>
<if test="wxEnterpriseId != null and wxEnterpriseId != ''">
wx_enterprise_id = #{wxEnterpriseId},
</if>
<if test="orderType != null">
order_type = #{orderType},
</if>
<if test="orderStatus != null">
order_status = #{orderStatus},
</if>
<if test="price != null">
price = #{price},
</if>
<if test="baseCount != null">
base_count = #{baseCount},
</if>
<if test="externalContactCount != null">
external_contact_count = #{externalContactCount},
</if>
<if test="months != null">
months = #{months},
</if>
<if test="createTime != null">
create_time = #{createTime},
</if>
<if test="payTime != null">
pay_time = #{payTime},
</if>
</set>
where fee_order_id = #{feeOrderId}
</update>
<!--通过主键删除-->
<delete id="deleteById">
delete
from tab_haoban_qywx_fee_order
where fee_order_id = #{feeOrderId}
</delete>
<select id="countExternalContactCount" resultType="java.lang.Integer">
select sum(external_contact_count)
from tab_haoban_qywx_fee_order
where wx_enterprise_id = #{wxEnterpriseId}
</select>
<select id="hasOrder" resultType="java.lang.Integer">
select count(*)
from tab_haoban_qywx_fee_order
where wx_enterprise_id = #{wxEnterpriseId}
</select>
</mapper>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gic.haoban.manage.service.dao.mapper.fee.TabHaobanQywxFeeOrderMapper">
<resultMap type="com.gic.haoban.manage.service.entity.fee.TabHaobanQywxFeeOrder" id="TabHaobanQywxFeeOrderMap">
<result property="feeOrderId" column="fee_order_id" jdbcType="INTEGER"/>
<result property="orderId" column="order_id" jdbcType="VARCHAR"/>
<result property="corpId" column="corp_id" jdbcType="VARCHAR"/>
<result property="wxEnterpriseId" column="wx_enterprise_id" jdbcType="VARCHAR"/>
<result property="orderType" column="order_type" jdbcType="INTEGER"/>
<result property="orderStatus" column="order_status" jdbcType="INTEGER"/>
<result property="price" column="price" jdbcType="VARCHAR"/>
<result property="baseCount" column="base_count" jdbcType="INTEGER"/>
<result property="externalContactCount" column="external_contact_count" jdbcType="INTEGER"/>
<result property="months" column="months" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="payTime" column="pay_time" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
fee_order_id
, order_id, corp_id, wx_enterprise_id, order_type, order_status, price, base_count, external_contact_count, months, create_time, pay_time
</sql>
<!--查询单个-->
<select id="selectByOrderId" resultMap="TabHaobanQywxFeeOrderMap">
select
<include refid="Base_Column_List"/>
from tab_haoban_qywx_fee_order
where wx_enterprise_id = #{wxEnterpriseId} and order_id = #{orderId}
</select>
<!--新增所有列-->
<insert id="insert" keyProperty="feeOrderId" useGeneratedKeys="true">
insert into tab_haoban_qywx_fee_order(fee_order_id, order_id, corp_id, wx_enterprise_id, order_type,
order_status, price, base_count, external_contact_count, months,
create_time, pay_time)
values (#{feeOrderId}, #{orderId}, #{corpId}, #{wxEnterpriseId}, #{orderType}, #{orderStatus}, #{price},
#{baseCount}, #{externalContactCount}, #{months}, #{createTime}, #{payTime})
</insert>
<select id="countExternalContactCount" resultType="java.lang.Integer">
select sum(external_contact_count)
from tab_haoban_qywx_fee_order
where wx_enterprise_id = #{wxEnterpriseId}
</select>
<select id="hasOrder" resultType="java.lang.Integer">
select count(*)
from tab_haoban_qywx_fee_order
where wx_enterprise_id = #{wxEnterpriseId}
</select>
</mapper>
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