Commit 5d617f32 by jinxin

企业微信账号购买接口开发

parent 1a976e26
package com.gic.haoban.manage.api.dto;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author jx
* @since 2023-03-09
*/
public class LicenceOrderDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 订单id
*/
private Long orderId;
/**
* gic商户Id
*/
private String enterpriseId;
/**
* wx企业Id
*/
private String wxEnterpriseId;
/**
* 订单类型,1:购买帐号,2:续期帐号
*/
private Integer orderType;
/**
* 互通帐号个数
*/
private Integer externalContactCount;
/**
* 基础帐号个数
*/
private Integer baseCount;
/**
* 订单金额,单位分
*/
private Integer price;
/**
* 购买时间类型 1:按月购买,2:按天购买
*/
private Integer timeType;
/**
* 购买的时间数值
*/
private Integer timeValue;
/**
* 支付类型 1在线支付 2对公转账
*/
private Integer payType;
/**
* 订单编号
*/
private String transactionId;
/**
* 上传凭证url
*/
private String voucher;
/**
* 订单状态,0:待支付,1:已支付,2:已取消,3:已过期,4:已退款,5:审核中
*/
private Integer orderStatus;
/**
* 订单状态更改原因
*/
private String orderStatusReason;
/**
* 支付类型为1:微信支付时间 2:上传凭证时间
*/
private Date payTime;
/**
* 退款时间
*/
private Date refundTime;
/**
* 企业微信订单id
*/
private String qywxOrderId;
/**
* 企业微信订单状态,0:待支付,1:已支付,2:已取消,3:已过期,4:退款中,5:退款被拒绝,6:已退款,7已失效
*/
private Integer qywxOrderStatus;
/**
* 企业微信订单更改原因
*/
private String qywxOrderStatusReason;
/**
* 企业微信支付时间
*/
private Date qywxPayTime;
/**
* 企业微信退款时间
*/
private Date qywxRefundTime;
/**
* 审核不通过原因
*/
private String reason;
/**
* 逻辑删除,0未删除,1删除
*/
private Integer deleteFlag;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 创建人
*/
private String creatorId;
/**
* 创建人名称
*/
private String creatorName;
}
package com.gic.haoban.manage.api.dto.qdto;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author jx
* @since 2023-03-09
*/
public class LicenceOrderQDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 订单id
*/
private Long orderId;
/**
* gic商户Id
*/
private String enterpriseId;
/**
* wx企业Id
*/
private String wxEnterpriseId;
/**
* 订单类型,1:购买帐号,2:续期帐号
*/
private Integer orderType;
/**
* 互通帐号个数
*/
private Integer externalContactCount;
/**
* 基础帐号个数
*/
private Integer baseCount;
/**
* 订单金额,单位分
*/
private Integer price;
/**
* 购买时间类型 1:按月购买,2:按天购买
*/
private Integer timeType;
/**
* 购买的时间数值
*/
private Integer timeValue;
/**
* 支付类型 1在线支付 2对公转账
*/
private Integer payType;
/**
* 订单编号
*/
private String transactionId;
/**
* 上传凭证url
*/
private String voucher;
/**
* 订单状态,0:待支付,1:已支付,2:已取消,3:已过期,4:已退款,5:审核中
*/
private Integer orderStatus;
/**
* 订单状态更改原因
*/
private String orderStatusReason;
/**
* 支付类型为1:微信支付时间 2:上传凭证时间
*/
private Date payTime;
/**
* 退款时间
*/
private Date refundTime;
/**
* 企业微信订单id
*/
private String qywxOrderId;
/**
* 企业微信订单状态,0:待支付,1:已支付,2:已取消,3:已过期,4:退款中,5:退款被拒绝,6:已退款,7已失效
*/
private Integer qywxOrderStatus;
/**
* 企业微信订单更改原因
*/
private String qywxOrderStatusReason;
/**
* 企业微信支付时间
*/
private Date qywxPayTime;
/**
* 企业微信退款时间
*/
private Date qywxRefundTime;
/**
* 审核不通过原因
*/
private String reason;
/**
* 逻辑删除,0未删除,1删除
*/
private Integer deleteFlag;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 创建人
*/
private String creatorId;
/**
* 创建人名称
*/
private String creatorName;
}
package com.gic.haoban.manage.service.dao.mapper.licence; package com.gic.haoban.manage.service.dao.mapper.licence;
import com.gic.haoban.manage.service.entity.licence.TabHaobanLicenceOrder;
import org.apache.ibatis.annotations.Param;
/** /**
* <p> * <p>
* Mapper 接口 * Mapper 接口
...@@ -10,4 +13,25 @@ package com.gic.haoban.manage.service.dao.mapper.licence; ...@@ -10,4 +13,25 @@ package com.gic.haoban.manage.service.dao.mapper.licence;
*/ */
public interface TabHaobanLicenceOrderMapper { public interface TabHaobanLicenceOrderMapper {
/**
* 获取订单详情
* @param orderId
* @return
*/
TabHaobanLicenceOrder selectById(@Param("orderId") Long orderId);
/**
* 新增订单
* @param tabHaobanLicenceOrder
* @return
*/
Integer insert(TabHaobanLicenceOrder tabHaobanLicenceOrder);
/**
* 删除订单
* @param orderId
* @return
*/
Integer deleteById(@Param("orderId") Long orderId);
} }
package com.gic.haoban.manage.service.dao.mapper.licence; package com.gic.haoban.manage.service.dao.mapper.licence;
import com.gic.haoban.manage.service.entity.licence.TabHaobanLicenceOrderProgress;
/** /**
* <p> * <p>
* Mapper 接口 * Mapper 接口
...@@ -10,4 +12,10 @@ package com.gic.haoban.manage.service.dao.mapper.licence; ...@@ -10,4 +12,10 @@ package com.gic.haoban.manage.service.dao.mapper.licence;
*/ */
public interface TabHaobanLicenceOrderProgressMapper { public interface TabHaobanLicenceOrderProgressMapper {
/**
* 插入订单进度数据
* @param tabHaobanLicenceOrderProgress
* @return
*/
Integer insert(TabHaobanLicenceOrderProgress tabHaobanLicenceOrderProgress);
} }
package com.gic.haoban.manage.service.service.licence; package com.gic.haoban.manage.service.service.licence;
import com.gic.haoban.manage.api.dto.qdto.LicenceOrderQDTO;
import com.gic.haoban.manage.service.entity.licence.TabHaobanLicenceOrder;
/** /**
* <p> * <p>
* 服务类 * 企业微信许可账号购买
* </p> * </p>
* *
* @author jx * @author jx
* @since 2023-03-09 * @since 2023-03-09
*/ */
public interface LicenceOrderService { public interface LicenceOrderService {
/**
* 查询企业微信订单详情
*
* @param orderId 订单id
* @return
*/
TabHaobanLicenceOrder getLicenceOrderDetail(Long orderId);
/**
* 删除订单
* @param orderId 订单id
* @return
*/
Integer deleteLicenceOrder(Long orderId);
/**
* 新增或者修改订单
* @param licenceOrderQDTO
* @return
*/
Integer saveOrUpdateLicenceOrder(LicenceOrderQDTO licenceOrderQDTO);
} }
package com.gic.haoban.manage.service.service.licence.impl; package com.gic.haoban.manage.service.service.licence.impl;
import com.gic.haoban.manage.api.dto.qdto.LicenceOrderQDTO;
import com.gic.haoban.manage.service.dao.mapper.licence.TabHaobanLicenceOrderMapper;
import com.gic.haoban.manage.service.entity.licence.TabHaobanLicenceOrder;
import com.gic.haoban.manage.service.service.licence.LicenceOrderService; import com.gic.haoban.manage.service.service.licence.LicenceOrderService;
import org.springframework.beans.factory.annotation.Autowired;
/** /**
* @description: * @description:
...@@ -8,4 +12,23 @@ import com.gic.haoban.manage.service.service.licence.LicenceOrderService; ...@@ -8,4 +12,23 @@ import com.gic.haoban.manage.service.service.licence.LicenceOrderService;
* @Date: 2023/3/9 17:01 * @Date: 2023/3/9 17:01
*/ */
public class LicenceOrderServiceImpl implements LicenceOrderService { public class LicenceOrderServiceImpl implements LicenceOrderService {
@Autowired
private TabHaobanLicenceOrderMapper tabHaobanLicenceOrderMapper;
@Override
public TabHaobanLicenceOrder getLicenceOrderDetail(Long orderId) {
TabHaobanLicenceOrder tabHaobanLicenceOrder = tabHaobanLicenceOrderMapper.selectById(orderId);
return tabHaobanLicenceOrder;
}
@Override
public Integer deleteLicenceOrder(Long orderId) {
return tabHaobanLicenceOrderMapper.deleteById(orderId);
}
@Override
public Integer saveOrUpdateLicenceOrder(LicenceOrderQDTO licenceOrderQDTO) {
return null;
}
} }
...@@ -113,9 +113,9 @@ ...@@ -113,9 +113,9 @@
#{qywxPayTime,jdbcType=TIMESTAMP}, #{qywxPayTime,jdbcType=TIMESTAMP},
#{qywxRefundTime,jdbcType=TIMESTAMP}, #{qywxRefundTime,jdbcType=TIMESTAMP},
#{reason,jdbcType=VARCHAR}, #{reason,jdbcType=VARCHAR},
#{deleteFlag,jdbcType=INTEGER}, 0,
#{createTime,jdbcType=TIMESTAMP}, now(),
#{updateTime,jdbcType=TIMESTAMP}, now(),
#{creatorId,jdbcType=VARCHAR}, #{creatorId,jdbcType=VARCHAR},
#{creatorName,jdbcType=VARCHAR} #{creatorName,jdbcType=VARCHAR}
) )
...@@ -123,48 +123,46 @@ ...@@ -123,48 +123,46 @@
</insert> </insert>
<!-- =====================删除==================== --> <!-- =====================删除==================== -->
<update id="deleteByPrimaryKey" parameterType="long"> <update id="deleteById" parameterType="long">
UPDATE tab_haoban_licence_order SET delete_flag = 1 WHERE order_id = #{orderId} UPDATE tab_haoban_licence_order SET delete_flag = 1 WHERE order_id = #{orderId}
</update> </update>
<!-- ==================更新 ========== --> <!-- ==================更新 ========== -->
<update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.licence.TabHaobanLicenceOrder"> <!-- <update id="update" parameterType="com.gic.haoban.manage.service.entity.licence.TabHaobanLicenceOrder">
<![CDATA[ UPDATE tab_haoban_licence_order SET
UPDATE tab_haoban_licence_order SET order_id=#{orderId,jdbcType=BIGINT},
order_id=#{orderId,jdbcType=BIGINT}, enterprise_id=#{enterpriseId,jdbcType=VARCHAR},
enterprise_id=#{enterpriseId,jdbcType=VARCHAR}, wx_enterprise_id=#{wxEnterpriseId,jdbcType=VARCHAR},
wx_enterprise_id=#{wxEnterpriseId,jdbcType=VARCHAR}, order_type=#{orderType,jdbcType=INTEGER},
order_type=#{orderType,jdbcType=INTEGER}, external_contact_count=#{externalContactCount,jdbcType=INTEGER},
external_contact_count=#{externalContactCount,jdbcType=INTEGER}, base_count=#{baseCount,jdbcType=INTEGER},
base_count=#{baseCount,jdbcType=INTEGER}, price=#{price,jdbcType=INTEGER},
price=#{price,jdbcType=INTEGER}, time_type=#{timeType,jdbcType=INTEGER},
time_type=#{timeType,jdbcType=INTEGER}, time_value=#{timeValue,jdbcType=INTEGER},
time_value=#{timeValue,jdbcType=INTEGER}, pay_type=#{payType,jdbcType=INTEGER},
pay_type=#{payType,jdbcType=INTEGER}, transaction_id=#{transactionId,jdbcType=CHAR},
transaction_id=#{transactionId,jdbcType=CHAR}, voucher=#{voucher,jdbcType=VARCHAR},
voucher=#{voucher,jdbcType=VARCHAR}, order_status=#{orderStatus,jdbcType=INTEGER},
order_status=#{orderStatus,jdbcType=INTEGER}, order_status_reason=#{orderStatusReason,jdbcType=VARCHAR},
order_status_reason=#{orderStatusReason,jdbcType=VARCHAR}, pay_time=#{payTime,jdbcType=TIMESTAMP},
pay_time=#{payTime,jdbcType=TIMESTAMP}, refund_time=#{refundTime,jdbcType=TIMESTAMP},
refund_time=#{refundTime,jdbcType=TIMESTAMP}, qywx_order_id=#{qywxOrderId,jdbcType=VARCHAR},
qywx_order_id=#{qywxOrderId,jdbcType=VARCHAR}, qywx_order_status=#{qywxOrderStatus,jdbcType=INTEGER},
qywx_order_status=#{qywxOrderStatus,jdbcType=INTEGER}, qywx_order_status_reason=#{qywxOrderStatusReason,jdbcType=VARCHAR},
qywx_order_status_reason=#{qywxOrderStatusReason,jdbcType=VARCHAR}, qywx_pay_time=#{qywxPayTime,jdbcType=TIMESTAMP},
qywx_pay_time=#{qywxPayTime,jdbcType=TIMESTAMP}, qywx_refund_time=#{qywxRefundTime,jdbcType=TIMESTAMP},
qywx_refund_time=#{qywxRefundTime,jdbcType=TIMESTAMP}, reason=#{reason,jdbcType=VARCHAR},
reason=#{reason,jdbcType=VARCHAR}, delete_flag=#{deleteFlag,jdbcType=INTEGER},
delete_flag=#{deleteFlag,jdbcType=INTEGER}, create_time=#{createTime,jdbcType=TIMESTAMP},
create_time=#{createTime,jdbcType=TIMESTAMP}, update_time=#{updateTime,jdbcType=TIMESTAMP},
update_time=#{updateTime,jdbcType=TIMESTAMP}, creator_id=#{creatorId,jdbcType=VARCHAR},
creator_id=#{creatorId,jdbcType=VARCHAR}, creator_name=#{creatorName,jdbcType=VARCHAR}
creator_name=#{creatorName,jdbcType=VARCHAR} where order_id = #{orderId}
order_id = #{orderId} </update>-->
]]>
</update>
<!-- ============ 查询=============--> <!-- ============ 查询=============-->
<select id="selectById" parameterType="long" resultMap="BaseResultMap"> <select id="selectById" parameterType="long" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" /> FROM tab_haoban_licence_order WHERE order_id = #{orderId} SELECT <include refid="Base_Column_List" /> FROM tab_haoban_licence_order WHERE order_id = #{orderId} and delete_flag=0
</select> </select>
</mapper> </mapper>
\ No newline at end of file
...@@ -51,9 +51,9 @@ ...@@ -51,9 +51,9 @@
#{type,jdbcType=INTEGER}, #{type,jdbcType=INTEGER},
#{voucher,jdbcType=VARCHAR}, #{voucher,jdbcType=VARCHAR},
#{reason,jdbcType=VARCHAR}, #{reason,jdbcType=VARCHAR},
#{deleteFlag,jdbcType=INTEGER}, 0,
#{createTime,jdbcType=TIMESTAMP}, now(),
#{updateTime,jdbcType=TIMESTAMP}, now(),
#{creatorName,jdbcType=VARCHAR} #{creatorName,jdbcType=VARCHAR}
) )
]]> ]]>
...@@ -67,26 +67,24 @@ ...@@ -67,26 +67,24 @@
<!-- ==================更新 ========== --> <!-- ==================更新 ========== -->
<update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.licence.TabHaobanLicenceOrderProgress"> <update id="updateByPrimaryKey" parameterType="com.gic.haoban.manage.service.entity.licence.TabHaobanLicenceOrderProgress">
<![CDATA[ UPDATE tab_haoban_licence_order_progress SET
UPDATE tab_haoban_licence_order_progress SET id=#{id,jdbcType=BIGINT},
id=#{id,jdbcType=BIGINT}, enterprise_id=#{enterpriseId,jdbcType=VARCHAR},
enterprise_id=#{enterpriseId,jdbcType=VARCHAR}, wx_enterprise_id=#{wxEnterpriseId,jdbcType=VARCHAR},
wx_enterprise_id=#{wxEnterpriseId,jdbcType=VARCHAR}, order_id=#{orderId,jdbcType=BIGINT},
order_id=#{orderId,jdbcType=BIGINT}, order_status=#{orderStatus,jdbcType=VARCHAR},
order_status=#{orderStatus,jdbcType=VARCHAR}, type=#{type,jdbcType=INTEGER},
type=#{type,jdbcType=INTEGER}, voucher=#{voucher,jdbcType=VARCHAR},
voucher=#{voucher,jdbcType=VARCHAR}, reason=#{reason,jdbcType=VARCHAR},
reason=#{reason,jdbcType=VARCHAR}, delete_flag=#{deleteFlag,jdbcType=INTEGER},
delete_flag=#{deleteFlag,jdbcType=INTEGER}, create_time=#{createTime,jdbcType=TIMESTAMP},
create_time=#{createTime,jdbcType=TIMESTAMP}, update_time=#{updateTime,jdbcType=TIMESTAMP},
update_time=#{updateTime,jdbcType=TIMESTAMP}, creator_name=#{creatorName,jdbcType=VARCHAR}
creator_name=#{creatorName,jdbcType=VARCHAR} where id = #{id}
id = #{id}
]]>
</update> </update>
<!-- ============ 查询=============--> <!-- ============ 查询=============-->
<select id="selectById" parameterType="long" resultMap="BaseResultMap"> <select id="selectById" parameterType="long" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List" /> FROM tab_haoban_licence_order_progress WHERE id = #{id} SELECT <include refid="Base_Column_List" /> FROM tab_haoban_licence_order_progress WHERE id = #{id} and delete_flag=0
</select> </select>
</mapper> </mapper>
\ No newline at end of file
...@@ -27,7 +27,7 @@ public class LicenceOrderController { ...@@ -27,7 +27,7 @@ public class LicenceOrderController {
* 查询订单详情 * 查询订单详情
*/ */
@RequestMapping("licence-order-detail") @RequestMapping("licence-order-detail")
public RestResponse<LicenceOrderVO> getLicenceOrderDetail(@RequestParam String orderId) { public RestResponse<LicenceOrderVO> getLicenceOrderDetail(@RequestParam Long orderId) {
return null; return null;
} }
...@@ -35,7 +35,7 @@ public class LicenceOrderController { ...@@ -35,7 +35,7 @@ public class LicenceOrderController {
* 删除订单 * 删除订单
*/ */
@RequestMapping("licence-order-delete") @RequestMapping("licence-order-delete")
public RestResponse<Boolean> deleteLicenceOrder(@RequestParam String orderId) { public RestResponse<Boolean> deleteLicenceOrder(@RequestParam Long orderId) {
return null; return null;
} }
...@@ -59,7 +59,7 @@ public class LicenceOrderController { ...@@ -59,7 +59,7 @@ public class LicenceOrderController {
* 取消订单/订单已经过期 * 取消订单/订单已经过期
*/ */
@RequestMapping("licence-order-cancel") @RequestMapping("licence-order-cancel")
public RestResponse<Boolean> cancelLicenceOrder(@RequestParam String orderId,Integer type) { public RestResponse<Boolean> cancelLicenceOrder(@RequestParam Long orderId,Integer type) {
return null; return null;
} }
...@@ -67,7 +67,7 @@ public class LicenceOrderController { ...@@ -67,7 +67,7 @@ public class LicenceOrderController {
* 订单凭证上传 * 订单凭证上传
*/ */
@RequestMapping("licence-order-voucher-upload") @RequestMapping("licence-order-voucher-upload")
public RestResponse<Boolean> uploadLicenceOrderVoucher(@RequestParam String orderId,String voucher) { public RestResponse<Boolean> uploadLicenceOrderVoucher(@RequestParam Long orderId,String voucher) {
return null; return null;
} }
...@@ -75,7 +75,7 @@ public class LicenceOrderController { ...@@ -75,7 +75,7 @@ public class LicenceOrderController {
* 支付订单 * 支付订单
*/ */
@RequestMapping("licence-order-pay") @RequestMapping("licence-order-pay")
public RestResponse<Boolean> payLicenceOrder(@RequestParam String orderId) { public RestResponse<Boolean> payLicenceOrder(@RequestParam Long orderId) {
return null; return null;
} }
......
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