Skip to content

H
haoban-manage3.0
Commit ed275e5a by jinxin
Options

Merge remote-tracking branch 'origin/feature/许可账号购买二期' into developer 

# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/licence/LicenceOrderDTO.java
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/licence/LicenceOrderPageDTO.java
#	haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/vo/licence/LicenceOrderPageVO.java
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/licence/TabHaobanLicenceOrder.java
#	haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/licence/LicenceOrderVO.java
parents 380f02d5 2582e3d0
Showing with 1332 additions and 1216 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/licence/LicenceOrderDTO.java
package com.gic.haoban.manage.api.dto.licence; package com.gic.haoban.manage.api.dto.licence;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
/** /**
* <p> * <p>
* *
* </p> * </p>
* *
* @author jx * @author jx
* @since 2023-03-09 * @since 2023-03-09
*/ */
public class LicenceOrderDTO implements Serializable { public class LicenceOrderDTO implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 订单id * 订单id
*/ */
private Long orderId; private Long orderId;
/** /**
* gic商户Id * gic商户Id
*/ */
private String enterpriseId; private String enterpriseId;
/** /**
* gic品牌名称 * gic品牌名称
*/ */
private String enterpriseName; private String enterpriseName;
/** /**
* wx企业Id * wx企业Id
*/ */
private String wxEnterpriseId; private String wxEnterpriseId;
/** /**
* 微信商户名称 * 微信商户名称
*/ */
private String wxEnterpriseName; private String wxEnterpriseName;
/** /**
* 订单类型，1：购买帐号，2：续期帐号 * 订单类型，1：购买帐号，2：续期帐号
*/ */
private Integer orderType; private Integer orderType;
/** /**
* 互通帐号个数 * 互通帐号个数
*/ */
private Integer externalContactCount; private Integer externalContactCount;
/** /**
* 基础帐号个数 * 基础帐号个数
*/ */
private Integer baseCount; private Integer baseCount;
/** /**
* 订单金额，单位分 * 订单金额，单位分
*/ */
private Integer price; private Integer price;
/** /**
* 购买时间类型 1：按月购买，2：按天购买 * 购买时间类型 1：按月购买，2：按天购买
*/ */
private Integer timeType; private Integer timeType;
/** /**
* 购买的时间数值 * 购买的时间数值
*/ */
private Integer timeValue; private Integer timeValue;
/** /**
* 支付类型 1在线支付 2对公转账 * 支付类型 1在线支付 2对公转账
*/ */
private Integer payType; private Integer payType;
/** /**
* 订单编号 * 订单编号
*/ */
private String orderNumber; private String orderNumber;
/** /**
* 上传凭证url * 上传凭证url
*/ */
private String voucher; private String voucher;
/** /**
* 订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：已退款，5：审核中 * 订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：已退款，5：审核中
*/ */
private Integer orderStatus; private Integer orderStatus;
/** /**
* 订单状态更改原因 * 订单状态更改原因
*/ */
private String orderStatusReason; private String orderStatusReason;
/** /**
* 支付时间 支付类型为1：微信支付时间 2：上传凭证时间 * 支付时间 支付类型为1：微信支付时间 2：上传凭证时间
*/ */
private Date payTime; private Date payTime;
/** /**
* 退款时间 * 退款时间
*/ */
private Date refundTime; private Date refundTime;
/** /**
* 企业微信订单id * 企业微信订单id
*/ */
private String qywxOrderId; private String qywxOrderId;
/** /**
* 企业微信订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：退款中，5：退款被拒绝，6：已退款，7已失效 * 企业微信订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：退款中，5：退款被拒绝，6：已退款，7已失效
*/ */
private Integer qywxOrderStatus; private Integer qywxOrderStatus;
/** /**
* 企业微信订单更改原因 * 企业微信订单更改原因
*/ */
private String qywxOrderStatusReason; private String qywxOrderStatusReason;
/** /**
* 企业微信支付时间 * 企业微信支付时间
*/ */
private Date qywxPayTime; private Date qywxPayTime;
/** /**
* 企业微信退款时间 * 企业微信退款时间
*/ */
private Date qywxRefundTime; private Date qywxRefundTime;
/** /**
* 审核不通过原因 * 审核不通过原因
*/ */
private String reason; private String reason;
/** /**
* 创建时间 * 创建时间
*/ */
private Date createTime; private Date createTime;
/** /**
* 到期时间 * 到期时间
*/ */
private Date expireTime; private Date expireTime;
/** /**
* 当前时间 * 当前时间
*/ */
private Date nowTime; private Date nowTime;
/** /**
* 订单进度list * 订单进度list
*/ */
private List<LicenceOrderProgressDTO> OrderProgressList; private List<LicenceOrderProgressDTO> OrderProgressList;
/** /**
* 微信url * 微信url
*/ */
private String wxUrl; private String wxUrl;
/**
public String getWxUrl() { * 企业微信订单过期时间
return wxUrl; */
} private Date qywxExpireTime;
public void setWxUrl(String wxUrl) { public Date getQywxExpireTime() {
this.wxUrl = wxUrl; return qywxExpireTime;
} }
public Long getOrderId() { public void setQywxExpireTime(Date qywxExpireTime) {
return orderId; this.qywxExpireTime = qywxExpireTime;
} }
public void setOrderId(Long orderId) { public String getWxUrl() {
this.orderId = orderId; return wxUrl;
} }
public String getEnterpriseId() { public void setWxUrl(String wxUrl) {
return enterpriseId; this.wxUrl = wxUrl;
} }
public void setEnterpriseId(String enterpriseId) { public Long getOrderId() {
this.enterpriseId = enterpriseId; return orderId;
} }
public String getEnterpriseName() { public void setOrderId(Long orderId) {
return enterpriseName; this.orderId = orderId;
} }
public void setEnterpriseName(String enterpriseName) { public String getEnterpriseId() {
this.enterpriseName = enterpriseName; return enterpriseId;
} }
public String getWxEnterpriseId() { public void setEnterpriseId(String enterpriseId) {
return wxEnterpriseId; this.enterpriseId = enterpriseId;
} }
public void setWxEnterpriseId(String wxEnterpriseId) { public String getEnterpriseName() {
this.wxEnterpriseId = wxEnterpriseId; return enterpriseName;
} }
public String getWxEnterpriseName() { public void setEnterpriseName(String enterpriseName) {
return wxEnterpriseName; this.enterpriseName = enterpriseName;
} }
public void setWxEnterpriseName(String wxEnterpriseName) { public String getWxEnterpriseId() {
this.wxEnterpriseName = wxEnterpriseName; return wxEnterpriseId;
} }
public Integer getOrderType() { public void setWxEnterpriseId(String wxEnterpriseId) {
return orderType; this.wxEnterpriseId = wxEnterpriseId;
} }
public void setOrderType(Integer orderType) { public String getWxEnterpriseName() {
this.orderType = orderType; return wxEnterpriseName;
} }
public Integer getExternalContactCount() { public void setWxEnterpriseName(String wxEnterpriseName) {
return externalContactCount; this.wxEnterpriseName = wxEnterpriseName;
} }
public void setExternalContactCount(Integer externalContactCount) { public Integer getOrderType() {
this.externalContactCount = externalContactCount; return orderType;
} }
public Integer getBaseCount() { public void setOrderType(Integer orderType) {
return baseCount; this.orderType = orderType;
} }
public void setBaseCount(Integer baseCount) { public Integer getExternalContactCount() {
this.baseCount = baseCount; return externalContactCount;
} }
public Integer getPrice() { public void setExternalContactCount(Integer externalContactCount) {
return price; this.externalContactCount = externalContactCount;
} }
public void setPrice(Integer price) { public Integer getBaseCount() {
this.price = price; return baseCount;
} }
public Integer getTimeType() { public void setBaseCount(Integer baseCount) {
return timeType; this.baseCount = baseCount;
} }
public void setTimeType(Integer timeType) { public Integer getPrice() {
this.timeType = timeType; return price;
} }
public Integer getTimeValue() { public void setPrice(Integer price) {
return timeValue; this.price = price;
} }
public void setTimeValue(Integer timeValue) { public Integer getTimeType() {
this.timeValue = timeValue; return timeType;
} }
public Integer getPayType() { public void setTimeType(Integer timeType) {
return payType; this.timeType = timeType;
} }
public void setPayType(Integer payType) { public Integer getTimeValue() {
this.payType = payType; return timeValue;
} }
public String getOrderNumber() { public void setTimeValue(Integer timeValue) {
return orderNumber; this.timeValue = timeValue;
} }
public void setOrderNumber(String orderNumber) { public Integer getPayType() {
this.orderNumber = orderNumber; return payType;
} }
public String getVoucher() { public void setPayType(Integer payType) {
return voucher; this.payType = payType;
} }
public void setVoucher(String voucher) { public String getOrderNumber() {
this.voucher = voucher; return orderNumber;
} }
public Integer getOrderStatus() { public void setOrderNumber(String orderNumber) {
return orderStatus; this.orderNumber = orderNumber;
} }
public void setOrderStatus(Integer orderStatus) { public String getVoucher() {
this.orderStatus = orderStatus; return voucher;
} }
public String getOrderStatusReason() { public void setVoucher(String voucher) {
return orderStatusReason; this.voucher = voucher;
} }
public void setOrderStatusReason(String orderStatusReason) { public Integer getOrderStatus() {
this.orderStatusReason = orderStatusReason; return orderStatus;
} }
public Date getPayTime() { public void setOrderStatus(Integer orderStatus) {
return payTime; this.orderStatus = orderStatus;
} }
public void setPayTime(Date payTime) { public String getOrderStatusReason() {
this.payTime = payTime; return orderStatusReason;
} }
public Date getRefundTime() { public void setOrderStatusReason(String orderStatusReason) {
return refundTime; this.orderStatusReason = orderStatusReason;
} }
public void setRefundTime(Date refundTime) { public Date getPayTime() {
this.refundTime = refundTime; return payTime;
} }
public String getQywxOrderId() { public void setPayTime(Date payTime) {
return qywxOrderId; this.payTime = payTime;
} }
public void setQywxOrderId(String qywxOrderId) { public Date getRefundTime() {
this.qywxOrderId = qywxOrderId; return refundTime;
} }
public Integer getQywxOrderStatus() { public void setRefundTime(Date refundTime) {
return qywxOrderStatus; this.refundTime = refundTime;
} }
public void setQywxOrderStatus(Integer qywxOrderStatus) { public String getQywxOrderId() {
this.qywxOrderStatus = qywxOrderStatus; return qywxOrderId;
} }
public String getQywxOrderStatusReason() { public void setQywxOrderId(String qywxOrderId) {
return qywxOrderStatusReason; this.qywxOrderId = qywxOrderId;
} }
public void setQywxOrderStatusReason(String qywxOrderStatusReason) { public Integer getQywxOrderStatus() {
this.qywxOrderStatusReason = qywxOrderStatusReason; return qywxOrderStatus;
} }
public Date getQywxPayTime() { public void setQywxOrderStatus(Integer qywxOrderStatus) {
return qywxPayTime; this.qywxOrderStatus = qywxOrderStatus;
} }
public void setQywxPayTime(Date qywxPayTime) { public String getQywxOrderStatusReason() {
this.qywxPayTime = qywxPayTime; return qywxOrderStatusReason;
} }
public Date getQywxRefundTime() { public void setQywxOrderStatusReason(String qywxOrderStatusReason) {
return qywxRefundTime; this.qywxOrderStatusReason = qywxOrderStatusReason;
} }
public void setQywxRefundTime(Date qywxRefundTime) { public Date getQywxPayTime() {
this.qywxRefundTime = qywxRefundTime; return qywxPayTime;
} }
public String getReason() { public void setQywxPayTime(Date qywxPayTime) {
return reason; this.qywxPayTime = qywxPayTime;
} }
public void setReason(String reason) { public Date getQywxRefundTime() {
this.reason = reason; return qywxRefundTime;
} }
public Date getCreateTime() { public void setQywxRefundTime(Date qywxRefundTime) {
return createTime; this.qywxRefundTime = qywxRefundTime;
} }
public void setCreateTime(Date createTime) { public String getReason() {
this.createTime = createTime; return reason;
} }
public Date getExpireTime() { public void setReason(String reason) {
return expireTime; this.reason = reason;
} }
public void setExpireTime(Date expireTime) { public Date getCreateTime() {
this.expireTime = expireTime; return createTime;
} }
public Date getNowTime() { public void setCreateTime(Date createTime) {
return nowTime; this.createTime = createTime;
} }
public void setNowTime(Date nowTime) { public Date getExpireTime() {
this.nowTime = nowTime; return expireTime;
} }
public List<LicenceOrderProgressDTO> getOrderProgressList() { public void setExpireTime(Date expireTime) {
return OrderProgressList; this.expireTime = expireTime;
} }
public void setOrderProgressList(List<LicenceOrderProgressDTO> orderProgressList) { public Date getNowTime() {
OrderProgressList = orderProgressList; return nowTime;
} }
}
public void setNowTime(Date nowTime) {
this.nowTime = nowTime;
}
public List<LicenceOrderProgressDTO> getOrderProgressList() {
return OrderProgressList;
}
public void setOrderProgressList(List<LicenceOrderProgressDTO> orderProgressList) {
OrderProgressList = orderProgressList;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/licence/LicenceOrderPageDTO.java
package com.gic.haoban.manage.api.dto.licence; package com.gic.haoban.manage.api.dto.licence;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
/** /**
* <p> * <p>
* *
* </p> * </p>
* *
* @author jx * @author jx
* @since 2023-03-09 * @since 2023-03-09
*/ */
public class LicenceOrderPageDTO implements Serializable { public class LicenceOrderPageDTO implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 订单id * 订单id
*/ */
private Long orderId; private Long orderId;
/** /**
* 订单类型，1：购买帐号，2：续期帐号 * 订单类型，1：购买帐号，2：续期帐号
*/ */
private Integer orderType; private Integer orderType;
/** /**
* 互通帐号个数 * 互通帐号个数
*/ */
private Integer externalContactCount; private Integer externalContactCount;
/** /**
* 基础帐号个数 * 基础帐号个数
*/ */
private Integer baseCount; private Integer baseCount;
/** /**
* 订单金额，单位分 * 订单金额，单位分
*/ */
private Integer price; private Integer price;
/** /**
* 购买时间类型 1：按月购买，2：按天购买 * 购买时间类型 1：按月购买，2：按天购买
*/ */
private Integer timeType; private Integer timeType;
/** /**
* 购买的时间数值 * 购买的时间数值
*/ */
private Integer timeValue; private Integer timeValue;
/** /**
* 支付类型 1在线支付 2对公转账 * 支付类型 1在线支付 2对公转账
*/ */
private Integer payType; private Integer payType;
/** /**
* 订单编号 * 订单编号
*/ */
private String orderNumber; private String orderNumber;
/** /**
* 订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：已退款，5：审核中 * 订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：已退款，5：审核中
*/ */
private Integer orderStatus; private Integer orderStatus;
/** /**
* 订单状态更改原因 * 订单状态更改原因
*/ */
private String orderStatusReason; private String orderStatusReason;
/** /**
* 支付时间 支付类型为1：微信支付时间 2：审核确认通过的时间 * 支付时间 支付类型为1：微信支付时间 2：审核确认通过的时间
*/ */
private Date payTime; private Date payTime;
/** /**
* 企业微信订单id * 企业微信订单id
*/ */
private String qywxOrderId; private String qywxOrderId;
/** /**
* 企业微信订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：退款中，5：退款被拒绝，6：已退款，7已失效 * 企业微信订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：退款中，5：退款被拒绝，6：已退款，7已失效
*/ */
private Integer qywxOrderStatus; private Integer qywxOrderStatus;
/** /**
* 企业微信订单更改原因 * 企业微信订单更改原因
*/ */
private String qywxOrderStatusReason; private String qywxOrderStatusReason;
/** /**
* 创建时间 * 创建时间
*/ */
private Date createTime; private Date createTime;
/** /**
* 创建人 * 创建人
*/ */
private String creatorId; private String creatorId;
/** /**
* 创建人名称 * 创建人名称
*/ */
private String creatorName; private String creatorName;
/** /**
* 到期时间 * 到期时间
*/ */
private Date expireTime; private Date expireTime;
/** /**
* 企业微信支付时间 * 企业微信支付时间
*/ */
private Date qywxPayTime; private Date qywxPayTime;
/** /**
* gic商户Id * gic商户Id
*/ */
private String enterpriseId; private String enterpriseId;
/** /**
* gic品牌名称 * gic品牌名称
*/ */
private String enterpriseName; private String enterpriseName;
/** /**
* wx企业Id * wx企业Id
*/ */
private String wxEnterpriseId; private String wxEnterpriseId;
/** /**
* 微信商户名称 * 微信商户名称
*/ */
private String wxEnterpriseName; private String wxEnterpriseName;
/** /**
* 微信订单id * 微信订单id
*/ */
private String wxOrderId; private String wxOrderId;
/**
public String getWxOrderId() { * 企业微信订单过期时间
return wxOrderId; */
} private Date qywxExpireTime;
public void setWxOrderId(String wxOrderId) { public Date getQywxExpireTime() {
this.wxOrderId = wxOrderId; return qywxExpireTime;
} }
public Date getQywxPayTime() { public void setQywxExpireTime(Date qywxExpireTime) {
return qywxPayTime; this.qywxExpireTime = qywxExpireTime;
} }
public void setQywxPayTime(Date qywxPayTime) { public String getWxOrderId() {
this.qywxPayTime = qywxPayTime; return wxOrderId;
} }
public String getEnterpriseId() { public void setWxOrderId(String wxOrderId) {
return enterpriseId; this.wxOrderId = wxOrderId;
} }
public void setEnterpriseId(String enterpriseId) { public Date getQywxPayTime() {
this.enterpriseId = enterpriseId; return qywxPayTime;
} }
public String getEnterpriseName() { public void setQywxPayTime(Date qywxPayTime) {
return enterpriseName; this.qywxPayTime = qywxPayTime;
} }
public void setEnterpriseName(String enterpriseName) { public String getEnterpriseId() {
this.enterpriseName = enterpriseName; return enterpriseId;
} }
public String getWxEnterpriseId() { public void setEnterpriseId(String enterpriseId) {
return wxEnterpriseId; this.enterpriseId = enterpriseId;
} }
public void setWxEnterpriseId(String wxEnterpriseId) { public String getEnterpriseName() {
this.wxEnterpriseId = wxEnterpriseId; return enterpriseName;
} }
public String getWxEnterpriseName() { public void setEnterpriseName(String enterpriseName) {
return wxEnterpriseName; this.enterpriseName = enterpriseName;
} }
public void setWxEnterpriseName(String wxEnterpriseName) { public String getWxEnterpriseId() {
this.wxEnterpriseName = wxEnterpriseName; return wxEnterpriseId;
} }
public Date getExpireTime() { public void setWxEnterpriseId(String wxEnterpriseId) {
return expireTime; this.wxEnterpriseId = wxEnterpriseId;
} }
public void setExpireTime(Date expireTime) { public String getWxEnterpriseName() {
this.expireTime = expireTime; return wxEnterpriseName;
} }
public Long getOrderId() { public void setWxEnterpriseName(String wxEnterpriseName) {
return orderId; this.wxEnterpriseName = wxEnterpriseName;
} }
public void setOrderId(Long orderId) { public Date getExpireTime() {
this.orderId = orderId; return expireTime;
} }
public Integer getOrderType() { public void setExpireTime(Date expireTime) {
return orderType; this.expireTime = expireTime;
} }
public void setOrderType(Integer orderType) { public Long getOrderId() {
this.orderType = orderType; return orderId;
} }
public Integer getExternalContactCount() { public void setOrderId(Long orderId) {
return externalContactCount; this.orderId = orderId;
} }
public void setExternalContactCount(Integer externalContactCount) { public Integer getOrderType() {
this.externalContactCount = externalContactCount; return orderType;
} }
public Integer getBaseCount() { public void setOrderType(Integer orderType) {
return baseCount; this.orderType = orderType;
} }
public void setBaseCount(Integer baseCount) { public Integer getExternalContactCount() {
this.baseCount = baseCount; return externalContactCount;
} }
public Integer getPrice() { public void setExternalContactCount(Integer externalContactCount) {
return price; this.externalContactCount = externalContactCount;
} }
public void setPrice(Integer price) { public Integer getBaseCount() {
this.price = price; return baseCount;
} }
public Integer getTimeType() { public void setBaseCount(Integer baseCount) {
return timeType; this.baseCount = baseCount;
} }
public void setTimeType(Integer timeType) { public Integer getPrice() {
this.timeType = timeType; return price;
} }
public Integer getTimeValue() { public void setPrice(Integer price) {
return timeValue; this.price = price;
} }
public void setTimeValue(Integer timeValue) { public Integer getTimeType() {
this.timeValue = timeValue; return timeType;
} }
public Integer getPayType() { public void setTimeType(Integer timeType) {
return payType; this.timeType = timeType;
} }
public void setPayType(Integer payType) { public Integer getTimeValue() {
this.payType = payType; return timeValue;
} }
public String getOrderNumber() { public void setTimeValue(Integer timeValue) {
return orderNumber; this.timeValue = timeValue;
} }
public void setOrderNumber(String orderNumber) { public Integer getPayType() {
this.orderNumber = orderNumber; return payType;
} }
public Integer getOrderStatus() { public void setPayType(Integer payType) {
return orderStatus; this.payType = payType;
} }
public void setOrderStatus(Integer orderStatus) { public String getOrderNumber() {
this.orderStatus = orderStatus; return orderNumber;
} }
public String getOrderStatusReason() { public void setOrderNumber(String orderNumber) {
return orderStatusReason; this.orderNumber = orderNumber;
} }
public void setOrderStatusReason(String orderStatusReason) { public Integer getOrderStatus() {
this.orderStatusReason = orderStatusReason; return orderStatus;
} }
public Date getPayTime() { public void setOrderStatus(Integer orderStatus) {
return payTime; this.orderStatus = orderStatus;
} }
public void setPayTime(Date payTime) { public String getOrderStatusReason() {
this.payTime = payTime; return orderStatusReason;
} }
public String getQywxOrderId() { public void setOrderStatusReason(String orderStatusReason) {
return qywxOrderId; this.orderStatusReason = orderStatusReason;
} }
public void setQywxOrderId(String qywxOrderId) { public Date getPayTime() {
this.qywxOrderId = qywxOrderId; return payTime;
} }
public Integer getQywxOrderStatus() { public void setPayTime(Date payTime) {
return qywxOrderStatus; this.payTime = payTime;
} }
public void setQywxOrderStatus(Integer qywxOrderStatus) { public String getQywxOrderId() {
this.qywxOrderStatus = qywxOrderStatus; return qywxOrderId;
} }
public String getQywxOrderStatusReason() { public void setQywxOrderId(String qywxOrderId) {
return qywxOrderStatusReason; this.qywxOrderId = qywxOrderId;
} }
public void setQywxOrderStatusReason(String qywxOrderStatusReason) { public Integer getQywxOrderStatus() {
this.qywxOrderStatusReason = qywxOrderStatusReason; return qywxOrderStatus;
} }
public Date getCreateTime() { public void setQywxOrderStatus(Integer qywxOrderStatus) {
return createTime; this.qywxOrderStatus = qywxOrderStatus;
} }
public void setCreateTime(Date createTime) { public String getQywxOrderStatusReason() {
this.createTime = createTime; return qywxOrderStatusReason;
} }
public String getCreatorId() { public void setQywxOrderStatusReason(String qywxOrderStatusReason) {
return creatorId; this.qywxOrderStatusReason = qywxOrderStatusReason;
} }
public void setCreatorId(String creatorId) { public Date getCreateTime() {
this.creatorId = creatorId; return createTime;
} }
public String getCreatorName() { public void setCreateTime(Date createTime) {
return creatorName; this.createTime = createTime;
} }
public void setCreatorName(String creatorName) { public String getCreatorId() {
this.creatorName = creatorName; return creatorId;
} }
}
public void setCreatorId(String creatorId) {
this.creatorId = creatorId;
}
public String getCreatorName() {
return creatorName;
}
public void setCreatorName(String creatorName) {
this.creatorName = creatorName;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/licence/LicenceOrderApiService.java
...@@ -151,5 +151,11 @@ public interface LicenceOrderApiService { ...@@ -151,5 +151,11 @@ public interface LicenceOrderApiService {
*/ */
ServiceResponse<HashMap<String, Integer>> hasPopup(String wxEnterpriseId); ServiceResponse<HashMap<String, Integer>> hasPopup(String wxEnterpriseId);
/**
* 查询企业微信订单状态是否过期
* @return
*/
ServiceResponse<Boolean> checkQywxOrderStatus(Long orderId);
} }
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/LicenceOrderController.java
...@@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.RequestParam; ...@@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -93,6 +94,7 @@ public class LicenceOrderController { ...@@ -93,6 +94,7 @@ public class LicenceOrderController {
if (ObjectUtil.isNotNull(wxEnterpriseDTO)) { if (ObjectUtil.isNotNull(wxEnterpriseDTO)) {
vo.setWxEnterpriseName(wxEnterpriseDTO.getCorpName()); vo.setWxEnterpriseName(wxEnterpriseDTO.getCorpName());
} }
vo.setNowTime(new Date());
} }
} }
return RestResponse.successResult(result); return RestResponse.successResult(result);
......
haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/vo/licence/LicenceOrderPageVO.java
package com.gic.haoban.manage.web.vo.licence; package com.gic.haoban.manage.web.vo.licence;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
/** /**
* <p> * <p>
* *
* </p> * </p>
* *
* @author jx * @author jx
* @since 2023-03-09 * @since 2023-03-09
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
public class LicenceOrderPageVO implements Serializable { public class LicenceOrderPageVO implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 订单id * 订单id
*/ */
private Long orderId; private Long orderId;
/** /**
* 订单类型，1：购买帐号，2：续期帐号 * 订单类型，1：购买帐号，2：续期帐号
*/ */
private Integer orderType; private Integer orderType;
/** /**
* 互通帐号个数 * 互通帐号个数
*/ */
private Integer externalContactCount; private Integer externalContactCount;
/** /**
* 基础帐号个数 * 基础帐号个数
*/ */
private Integer baseCount; private Integer baseCount;
/** /**
* 订单金额，单位分 * 订单金额，单位分
*/ */
private Integer price; private Integer price;
/** /**
* 购买时间类型 1：按月购买，2：按天购买 * 购买时间类型 1：按月购买，2：按天购买
*/ */
private Integer timeType; private Integer timeType;
/** /**
* 购买的时间数值 * 购买的时间数值
*/ */
private Integer timeValue; private Integer timeValue;
/** /**
* 支付类型 1在线支付 2对公转账 * 支付类型 1在线支付 2对公转账
*/ */
private Integer payType; private Integer payType;
/** /**
* 订单编号 * 订单编号
*/ */
private String orderNumber; private String orderNumber;
/** /**
* 订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：已退款，5：审核中 * 订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：已退款，5：审核中
*/ */
private Integer orderStatus; private Integer orderStatus;
/** /**
* 订单状态更改原因 * 订单状态更改原因
*/ */
private String orderStatusReason; private String orderStatusReason;
/** /**
* 支付时间 支付类型为1：微信支付时间 2：审核确认通过的时间 * 支付时间 支付类型为1：微信支付时间 2：审核确认通过的时间
*/ */
private Date payTime; private Date payTime;
/** /**
* 企业微信订单id * 企业微信订单id
*/ */
private String qywxOrderId; private String qywxOrderId;
/** /**
* 企业微信订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：退款中，5：退款被拒绝，6：已退款，7已失效 * 企业微信订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：退款中，5：退款被拒绝，6：已退款，7已失效
*/ */
private Integer qywxOrderStatus; private Integer qywxOrderStatus;
/** /**
* 企业微信订单更改原因 * 企业微信订单更改原因
*/ */
private String qywxOrderStatusReason; private String qywxOrderStatusReason;
/** /**
* 创建时间 * 创建时间
*/ */
private Date createTime; private Date createTime;
/** /**
* 创建人 * 创建人
*/ */
private String creatorId; private String creatorId;
/** /**
* 创建人名称 * 创建人名称
*/ */
private String creatorName; private String creatorName;
/** /**
* 企业微信支付时间 * 企业微信支付时间
*/ */
private Date qywxPayTime; private Date qywxPayTime;
/** /**
* gic商户Id * gic商户Id
*/ */
private String enterpriseId; private String enterpriseId;
/** /**
* gic品牌名称 * gic品牌名称
*/ */
private String enterpriseName; private String enterpriseName;
/** /**
* wx企业Id * wx企业Id
*/ */
private String wxEnterpriseId; private String wxEnterpriseId;
/** /**
* 微信商户名称 * 微信商户名称
*/ */
private String wxEnterpriseName; private String wxEnterpriseName;
/** /**
* 微信订单id * 微信订单id
*/ */
private String wxOrderId; private String wxOrderId;
/**
* 企业微信订单过期时间
} */
private Date qywxExpireTime;
/**
* 当前时间
*/
private Date nowTime;
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/licence/TabHaobanLicenceOrder.java
package com.gic.haoban.manage.service.entity.licence; package com.gic.haoban.manage.service.entity.licence;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
/** /**
* <p> * <p>
* *
* </p> * </p>
* *
* @author jx * @author jx
* @since 2023-03-09 * @since 2023-03-09
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
public class TabHaobanLicenceOrder implements Serializable { public class TabHaobanLicenceOrder implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 订单id * 订单id
*/ */
private Long orderId; private Long orderId;
/** /**
* gic商户Id * gic商户Id
*/ */
private String enterpriseId; private String enterpriseId;
/** /**
* wx企业Id * wx企业Id
*/ */
private String wxEnterpriseId; private String wxEnterpriseId;
/** /**
* 订单类型，1：购买帐号，2：续期帐号 * 订单类型，1：购买帐号，2：续期帐号
*/ */
private Integer orderType; private Integer orderType;
/** /**
* 互通帐号个数 * 互通帐号个数
*/ */
private Integer externalContactCount; private Integer externalContactCount;
/** /**
* 基础帐号个数 * 基础帐号个数
*/ */
private Integer baseCount; private Integer baseCount;
/** /**
* 订单金额，单位分 * 订单金额，单位分
*/ */
private Integer price; private Integer price;
/** /**
* 购买时间类型 1：按月购买，2：按天购买 * 购买时间类型 1：按月购买，2：按天购买
*/ */
private Integer timeType; private Integer timeType;
/** /**
* 购买的时间数值 * 购买的时间数值
*/ */
private Integer timeValue; private Integer timeValue;
/** /**
* 支付类型 1在线支付 2对公转账 * 支付类型 1在线支付 2对公转账
*/ */
private Integer payType; private Integer payType;
/** /**
* 订单编号 * 订单编号
*/ */
private String orderNumber; private String orderNumber;
/** /**
* 上传凭证url * 上传凭证url
*/ */
private String voucher; private String voucher;
/** /**
* 订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：已退款，5：审核中 * 订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：已退款，5：审核中
*/ */
private Integer orderStatus; private Integer orderStatus;
/** /**
* 订单状态更改原因 * 订单状态更改原因
*/ */
private String orderStatusReason; private String orderStatusReason;
/** /**
* 支付类型为1：微信支付时间 2：上传凭证时间 * 支付类型为1：微信支付时间 2：上传凭证时间
*/ */
private Date payTime; private Date payTime;
/** /**
* 退款时间 * 退款时间
*/ */
private Date refundTime; private Date refundTime;
/** /**
* 企业微信订单id * 企业微信订单id
*/ */
private String qywxOrderId; private String qywxOrderId;
/** /**
* 企业微信订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：退款中，5：退款被拒绝，6：已退款，7已失效 * 企业微信订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：退款中，5：退款被拒绝，6：已退款，7已失效
*/ */
private Integer qywxOrderStatus; private Integer qywxOrderStatus;
/** /**
* 企业微信订单更改原因 * 企业微信订单更改原因
*/ */
private String qywxOrderStatusReason; private String qywxOrderStatusReason;
/** /**
* 企业微信支付时间 * 企业微信支付时间
*/ */
private Date qywxPayTime; private Date qywxPayTime;
/** /**
* 企业微信退款时间 * 企业微信退款时间
*/ */
private Date qywxRefundTime; private Date qywxRefundTime;
/** /**
* 审核不通过原因 * 审核不通过原因
*/ */
private String reason; private String reason;
/** /**
* 逻辑删除，0未删除，1删除 * 逻辑删除，0未删除，1删除
*/ */
private Integer deleteFlag; private Integer deleteFlag;
/** /**
* 创建时间 * 创建时间
*/ */
private Date createTime; private Date createTime;
/** /**
* 更新时间 * 更新时间
*/ */
private Date updateTime; private Date updateTime;
/** /**
* 创建人 * 创建人
*/ */
private String creatorId; private String creatorId;
/** /**
* 创建人名称 * 创建人名称
*/ */
private String creatorName; private String creatorName;
/** /**
* 到期时间 * 到期时间
*/ */
private Date expireTime; private Date expireTime;
/** /**
* 微信预支付交易id * 微信预支付交易id
*/ */
private String prepayId; private String prepayId;
/** /**
* 微信支付id * 微信支付id
*/ */
private String wxOrderId; private String wxOrderId;
/** /**
* 微信url * 微信url
*/ */
private String wxUrl; private String wxUrl;
/**
* 企业微信订单过期时间
} */
private Date qywxExpireTime;
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/licence/impl/LicenceOrderServiceImpl.java
...@@ -86,6 +86,7 @@ public class LicenceOrderServiceImpl implements LicenceOrderService { ...@@ -86,6 +86,7 @@ public class LicenceOrderServiceImpl implements LicenceOrderService {
order.setQywxOrderStatus(0); order.setQywxOrderStatus(0);
order.setCreateTime(now); order.setCreateTime(now);
order.setUpdateTime(now); order.setUpdateTime(now);
order.setQywxExpireTime(DateUtil.addDay(now, 10));
//生成订单编号 //生成订单编号
String num = "ZH"+orderId; String num = "ZH"+orderId;
order.setOrderNumber(num); order.setOrderNumber(num);
...@@ -226,13 +227,6 @@ public class LicenceOrderServiceImpl implements LicenceOrderService { ...@@ -226,13 +227,6 @@ public class LicenceOrderServiceImpl implements LicenceOrderService {
} }
PageHelper.startPage(qdto); PageHelper.startPage(qdto);
List<TabHaobanLicenceOrder> licenceOrderPage = tabHaobanLicenceOrderMapper.getLicenceOrderPage(qdto); List<TabHaobanLicenceOrder> licenceOrderPage = tabHaobanLicenceOrderMapper.getLicenceOrderPage(qdto);
//判断订单状态，支付时间已过的订单的需要更改订单状态为已过期
for (TabHaobanLicenceOrder dto : licenceOrderPage){
if (dto.getExpireTime().before(new Date()) && dto.getOrderStatus() == 0){
dto.setOrderStatus(3);
updateLicenceOrderType(dto.getOrderId(), 3,dto.getEnterpriseId(), dto.getWxEnterpriseId(), "系统",1);
}
}
return PageHelperUtils.changePageHelperToCurrentPage(licenceOrderPage, LicenceOrderPageDTO.class); return PageHelperUtils.changePageHelperToCurrentPage(licenceOrderPage, LicenceOrderPageDTO.class);
} }
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/licence/LicenceOrderApiServiceImpl.java
...@@ -168,7 +168,26 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService { ...@@ -168,7 +168,26 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
@Override @Override
public ServiceResponse<Page<LicenceOrderPageDTO>> getLicenceOrderPage(LicenceOrderPageQDTO licenceOrderPageQDTO) { public ServiceResponse<Page<LicenceOrderPageDTO>> getLicenceOrderPage(LicenceOrderPageQDTO licenceOrderPageQDTO) {
Page<LicenceOrderPageDTO> licenceOrderPage = licenceOrderService.getLicenceOrderPage(licenceOrderPageQDTO); Page<LicenceOrderPageDTO> licenceOrderPage = licenceOrderService.getLicenceOrderPage(licenceOrderPageQDTO);
return ServiceResponse.success(licenceOrderPage); List<LicenceOrderPageDTO> list = licenceOrderPage.getResult();
if (CollUtil.isNotEmpty(list)){
//判断订单状态，支付时间已过的订单的需要更改订单状态为已过期
for (LicenceOrderPageDTO dto : list){
Date now = new Date();
if (dto.getExpireTime().before(now) && dto.getOrderStatus() == 0){
dto.setOrderStatus(3);
updateLicenceOrderType(dto.getOrderId(), 3,dto.getEnterpriseId(), dto.getWxEnterpriseId(), "系统",1);
//取消企业微信订单
cancelQywxOrder(dto.getOrderId());
}
if (dto.getQywxExpireTime().before(now) && dto.getQywxOrderStatus() == 0){
dto.setQywxOrderStatus(3);
updateLicenceOrderType(dto.getOrderId(), 3,dto.getEnterpriseId(), dto.getWxEnterpriseId(), "系统",0);
}
}
licenceOrderPage.setResult(list);
return ServiceResponse.success(licenceOrderPage);
}
return ServiceResponse.success(new Page<>());
} }
@Override @Override
...@@ -179,8 +198,11 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService { ...@@ -179,8 +198,11 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
@Override @Override
public ServiceResponse<Boolean> uploadLicenceOrderVoucher(Long orderId, String voucher, String enterpriseId, String wxEnterpriseId, String creatorName) { public ServiceResponse<Boolean> uploadLicenceOrderVoucher(Long orderId, String voucher, String enterpriseId, String wxEnterpriseId, String creatorName) {
licenceOrderService.uploadLicenceOrderVoucher(orderId, voucher, enterpriseId, wxEnterpriseId, creatorName); ServiceResponse<Boolean> response = checkQywxOrderStatus(orderId);
return ServiceResponse.success(true); if (response.isSuccess()){
licenceOrderService.uploadLicenceOrderVoucher(orderId, voucher, enterpriseId, wxEnterpriseId, creatorName);
}
return response;
} }
@Override @Override
...@@ -387,8 +409,8 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService { ...@@ -387,8 +409,8 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
licenceOrderService.updateLicenceOrderType(order.getOrderId(), 4, order.getEnterpriseId(), order.getWxEnterpriseId(), "系统", 1); licenceOrderService.updateLicenceOrderType(order.getOrderId(), 4, order.getEnterpriseId(), order.getWxEnterpriseId(), "系统", 1);
return ServiceResponse.success(true); return ServiceResponse.success(true);
} }
if (4 == order.getOrderStatus()){ if (1 != order.getOrderStatus()){
return ServiceResponse.failure("-9999", "该笔订单已退款！"); return ServiceResponse.failure("-9999", "该笔订单不是已支付状态！");
} }
RefundReqDataDTO reqData = new RefundReqDataDTO(order.getWxOrderId(), null, null, String.valueOf(orderId), order.getPrice(), RefundReqDataDTO reqData = new RefundReqDataDTO(order.getWxOrderId(), null, null, String.valueOf(orderId), order.getPrice(),
order.getPrice(), null, null); order.getPrice(), null, null);
...@@ -449,8 +471,8 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService { ...@@ -449,8 +471,8 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
if (wxEnterpriseDTO == null) { if (wxEnterpriseDTO == null) {
return ServiceResponse.failure("-9999", "微信企业不存在！！"); return ServiceResponse.failure("-9999", "微信企业不存在！！");
} }
//先申请微信退款，再取消企业微信订单 //取消企业微信订单,退款由财务人员手动触发
wxRefund(orderId); // wxRefund(orderId);
String openCorpid = wxEnterpriseDTO.getOpenCorpid(); String openCorpid = wxEnterpriseDTO.getOpenCorpid();
String serviceCorpid = config.getCorpid(); String serviceCorpid = config.getCorpid();
ServiceResponse<QywxResponseDTO> response = qywxOrderApiService.cancelOrder(serviceCorpid, openCorpid, order.getQywxOrderId()); ServiceResponse<QywxResponseDTO> response = qywxOrderApiService.cancelOrder(serviceCorpid, openCorpid, order.getQywxOrderId());
...@@ -487,4 +509,29 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService { ...@@ -487,4 +509,29 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
return ServiceResponse.success(map); return ServiceResponse.success(map);
} }
@Override
public ServiceResponse<Boolean> checkQywxOrderStatus(Long orderId) {
//查询企业微信订单状态是否过期，过期则不能上传订单支付凭证
TabHaobanLicenceOrder order = licenceOrderService.getLicenceOrderDetail(orderId);
if (null == order){
return ServiceResponse.failure("9999", "订单不存在！！");
}
WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseService.selectById(order.getWxEnterpriseId());
if (wxEnterpriseDTO == null) {
return ServiceResponse.failure("9999", "微信企业不存在！！");
}
String openCorpid = wxEnterpriseDTO.getOpenCorpid();
String serviceCorpid = config.getCorpid();
FeeOrderDeatilResponseDTO dto = qywxUserApiService.getOrder(openCorpid, serviceCorpid, order.getQywxOrderId());
if (null != dto && null != dto.getOrder() && dto.getOrder().getOrderStatus() == 3){
//订单失效，记录订单状态
licenceOrderService.updateLicenceOrderType(order.getOrderId(), 3, order.getEnterpriseId(),
order.getWxEnterpriseId(), "系统", 0);
licenceOrderService.updateLicenceOrderType(order.getOrderId(), 2, order.getEnterpriseId(),
order.getWxEnterpriseId(), "系统", 1);
return ServiceResponse.failure("-9999","企业微信订单已过期！");
}
return ServiceResponse.success();
}
} }
haoban-manage3-service/src/main/resources/mapper/licence/TabHaobanLicenceOrderMapper.xml
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<result column="prepay_id" property="prepayId"/> <result column="prepay_id" property="prepayId"/>
<result column="wx_order_id" property="wxOrderId"/> <result column="wx_order_id" property="wxOrderId"/>
<result column="wx_url" property="wxUrl"/> <result column="wx_url" property="wxUrl"/>
<result column="qywx_expire_time" property="qywxExpireTime"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
order_id, order_id,
...@@ -65,7 +66,8 @@ ...@@ -65,7 +66,8 @@
expire_time, expire_time,
prepay_id, prepay_id,
wx_order_id, wx_order_id,
wx_url wx_url,
qywx_expire_time
</sql> </sql>
<!-- ===================== 新增 ======================== --> <!-- ===================== 新增 ======================== -->
<insert id="insert" parameterType="com.gic.haoban.manage.service.entity.licence.TabHaobanLicenceOrder" <insert id="insert" parameterType="com.gic.haoban.manage.service.entity.licence.TabHaobanLicenceOrder"
......
haoban-manage3-service/src/test/java/LicenceOrderServiceTest.java
...@@ -5,6 +5,7 @@ import com.gic.api.base.commons.ServiceResponse; ...@@ -5,6 +5,7 @@ import com.gic.api.base.commons.ServiceResponse;
import com.gic.haoban.manage.api.dto.licence.LicenceOrderDTO; import com.gic.haoban.manage.api.dto.licence.LicenceOrderDTO;
import com.gic.haoban.manage.api.dto.licence.LicenceOrderPageDTO; import com.gic.haoban.manage.api.dto.licence.LicenceOrderPageDTO;
import com.gic.haoban.manage.api.dto.qdto.licence.LicenceOrderPageQDTO; import com.gic.haoban.manage.api.dto.qdto.licence.LicenceOrderPageQDTO;
import com.gic.haoban.manage.api.dto.qdto.licence.LicenceOrderQDTO;
import com.gic.haoban.manage.api.service.licence.LicenceOrderApiService; import com.gic.haoban.manage.api.service.licence.LicenceOrderApiService;
import com.gic.haoban.manage.service.entity.licence.TabHaobanLicenceOrder; 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;
...@@ -68,4 +69,18 @@ public class LicenceOrderServiceTest { ...@@ -68,4 +69,18 @@ public class LicenceOrderServiceTest {
public void test7(){ public void test7(){
licenceOrderApiService.hasPopup("ca66a01b79474c40b3e7c7f93daf1a3b"); licenceOrderApiService.hasPopup("ca66a01b79474c40b3e7c7f93daf1a3b");
} }
@Test
public void test8(){
LicenceOrderQDTO licenceOrderQDTO = new LicenceOrderQDTO();
licenceOrderQDTO.setEnterpriseId("ff8080815dacd3a2015dacd3ef5c0000");
licenceOrderQDTO.setWxEnterpriseId("ca66a01b79474c40b3e7c7f93daf1a3b");
licenceOrderQDTO.setOrderType(1);
licenceOrderQDTO.setExternalContactCount(10);
licenceOrderQDTO.setTimeType(1);
licenceOrderQDTO.setTimeValue(2);
licenceOrderQDTO.setPayType(1);
ServiceResponse<String> stringServiceResponse = licenceOrderApiService.saveOrUpdateLicenceOrder(licenceOrderQDTO);
}
} }
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/licence/LicenceOrderController.java
...@@ -154,7 +154,7 @@ public class LicenceOrderController { ...@@ -154,7 +154,7 @@ public class LicenceOrderController {
} }
/** /**
* 取消订单/订单已经过期 * 取消订单
*/ */
@RequestMapping("licence-order-cancel") @RequestMapping("licence-order-cancel")
@GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.HB_LICENCE_ORDER, @GicLogRecord(value = "${#logValue}", category = GicLogRecordCategoryEnum.HB_LICENCE_ORDER,
...@@ -172,10 +172,17 @@ public class LicenceOrderController { ...@@ -172,10 +172,17 @@ public class LicenceOrderController {
String enterpriseId = loginUser.getEnterpriseId(); String enterpriseId = loginUser.getEnterpriseId();
String wxEnterpriseId = loginUser.getWxEnterpriseId(); String wxEnterpriseId = loginUser.getWxEnterpriseId();
String clerkName = loginUser.getClerkName(); String clerkName = loginUser.getClerkName();
Boolean result = licenceOrderApiService.updateLicenceOrderType(orderId, type, enterpriseId, wxEnterpriseId, clerkName, 1).getResult(); //取消企业微信订单
String logValue = "【取消购买企微许可账号订单】：订单编号" + dto.getOrderNumber() + "，取消时间" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATETIME_19); ServiceResponse<Boolean> response = licenceOrderApiService.cancelQywxOrder(orderId);
GicLogRecordEvaluationContext.putAttribute("logValue", logValue); if (response.isSuccess()){
return RestResponse.successResult(result); Boolean result = licenceOrderApiService.updateLicenceOrderType(orderId, type, enterpriseId, wxEnterpriseId, clerkName, 1).getResult();
//操作日志记录
String logValue = "【取消购买企微许可账号订单】：订单编号" + dto.getOrderNumber() + "，取消时间" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATETIME_19);
GicLogRecordEvaluationContext.putAttribute("logValue", logValue);
return RestResponse.successResult(result);
}
return RestResponse.failure(response.getCode(),response.getMessage());
} }
/** /**
...@@ -197,10 +204,13 @@ public class LicenceOrderController { ...@@ -197,10 +204,13 @@ public class LicenceOrderController {
String enterpriseId = loginUser.getEnterpriseId(); String enterpriseId = loginUser.getEnterpriseId();
String wxEnterpriseId = loginUser.getWxEnterpriseId(); String wxEnterpriseId = loginUser.getWxEnterpriseId();
String clerkName = loginUser.getClerkName(); String clerkName = loginUser.getClerkName();
Boolean result = licenceOrderApiService.uploadLicenceOrderVoucher(orderId, voucher, enterpriseId, wxEnterpriseId, clerkName).getResult(); ServiceResponse<Boolean> response = licenceOrderApiService.uploadLicenceOrderVoucher(orderId, voucher, enterpriseId, wxEnterpriseId, clerkName);
String logValue = "【上传购买企微许可账号支付凭证】：订单编号" + dto.getOrderNumber() + "，上传时间" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATETIME_19); if(response.isSuccess()){
GicLogRecordEvaluationContext.putAttribute("logValue", logValue); String logValue = "【上传购买企微许可账号支付凭证】：订单编号" + dto.getOrderNumber() + "，上传时间" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATETIME_19);
return RestResponse.successResult(result); GicLogRecordEvaluationContext.putAttribute("logValue", logValue);
return RestResponse.successResult(true);
}
return RestResponse.failure(response.getCode(),response.getMessage());
} }
/** /**
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/licence/LicenceOrderVO.java
package com.gic.haoban.manage.web.vo.licence; package com.gic.haoban.manage.web.vo.licence;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
/** /**
* <p> * <p>
* *
* </p> * </p>
* *
* @author jx * @author jx
* @since 2023-03-09 * @since 2023-03-09
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
public class LicenceOrderVO implements Serializable { public class LicenceOrderVO implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 订单id * 订单id
*/ */
private Long orderId; private Long orderId;
/** /**
* gic商户Id * gic商户Id
*/ */
private String enterpriseId; private String enterpriseId;
/** /**
* gic品牌名称 * gic品牌名称
*/ */
private String enterpriseName; private String enterpriseName;
/** /**
* wx企业Id * wx企业Id
*/ */
private String wxEnterpriseId; private String wxEnterpriseId;
/** /**
* 微信商户名称 * 微信商户名称
*/ */
private String wxEnterpriseName; private String wxEnterpriseName;
/** /**
* 订单类型，1：购买帐号，2：续期帐号 * 订单类型，1：购买帐号，2：续期帐号
*/ */
private Integer orderType; private Integer orderType;
/** /**
* 互通帐号个数 * 互通帐号个数
*/ */
private Integer externalContactCount; private Integer externalContactCount;
/** /**
* 基础帐号个数 * 基础帐号个数
*/ */
private Integer baseCount; private Integer baseCount;
/** /**
* 订单金额，单位分 * 订单金额，单位分
*/ */
private Integer price; private Integer price;
/** /**
* 购买时间类型 1：按月购买，2：按天购买 * 购买时间类型 1：按月购买，2：按天购买
*/ */
private Integer timeType; private Integer timeType;
/** /**
* 购买的时间数值 * 购买的时间数值
*/ */
private Integer timeValue; private Integer timeValue;
/** /**
* 支付类型 1在线支付 2对公转账 * 支付类型 1在线支付 2对公转账
*/ */
private Integer payType; private Integer payType;
/** /**
* 订单编号 * 订单编号
*/ */
private String orderNumber; private String orderNumber;
/** /**
* 上传凭证url * 上传凭证url
*/ */
private String voucher; private String voucher;
/** /**
* 订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：已退款，5：审核中 * 订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：已退款，5：审核中
*/ */
private Integer orderStatus; private Integer orderStatus;
/** /**
* 订单状态更改原因 * 订单状态更改原因
*/ */
private String orderStatusReason; private String orderStatusReason;
/** /**
* 支付时间 支付类型为1：微信支付时间 2：上传凭证时间 * 支付时间 支付类型为1：微信支付时间 2：上传凭证时间
*/ */
private Date payTime; private Date payTime;
/** /**
* 退款时间 * 退款时间
*/ */
private Date refundTime; private Date refundTime;
/** /**
* 企业微信订单id * 企业微信订单id
*/ */
private String qywxOrderId; private String qywxOrderId;
/** /**
* 企业微信订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：退款中，5：退款被拒绝，6：已退款，7已失效 * 企业微信订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：退款中，5：退款被拒绝，6：已退款，7已失效
*/ */
private Integer qywxOrderStatus; private Integer qywxOrderStatus;
/** /**
* 企业微信订单更改原因 * 企业微信订单更改原因
*/ */
private String qywxOrderStatusReason; private String qywxOrderStatusReason;
/** /**
* 企业微信支付时间 * 企业微信支付时间
*/ */
private Date qywxPayTime; private Date qywxPayTime;
/** /**
* 企业微信退款时间 * 企业微信退款时间
*/ */
private Date qywxRefundTime; private Date qywxRefundTime;
/** /**
* 审核不通过原因 * 审核不通过原因
*/ */
private String reason; private String reason;
/** /**
* 创建时间 * 创建时间
*/ */
private Date createTime; private Date createTime;
/** /**
* 到期时间 * 到期时间
*/ */
private Date expireTime; private Date expireTime;
/** /**
* 当前时间 * 当前时间
*/ */
private Date nowTime; private Date nowTime;
/** /**
* 订单进度list * 订单进度list
*/ */
private List<LicenceOrderProgressVO> OrderProgressList; private List<LicenceOrderProgressVO> OrderProgressList;
/**
} * 企业微信订单过期时间
*/
private Date qywxExpireTime;
}
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