Skip to content

H
haoban-manage3.0
Commit cf253e98 by jinxin
Options

企业微信许可账号购买

parent 11ff2c40
Showing with 923 additions and 334 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/LicenceOrderDTO.java → haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/licence/LicenceOrderDTO.java
package com.gic.haoban.manage.api.dto; 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;
/** /**
* <p> * <p>
...@@ -24,11 +25,18 @@ public class LicenceOrderDTO implements Serializable { ...@@ -24,11 +25,18 @@ public class LicenceOrderDTO implements Serializable {
* gic商户Id * gic商户Id
*/ */
private String enterpriseId; private String enterpriseId;
/**
* gic品牌名称
*/
private String enterpriseName;
/** /**
* wx企业Id * wx企业Id
*/ */
private String wxEnterpriseId; private String wxEnterpriseId;
/**
* 微信商户名称
*/
private String wxEnterpriseName;
/** /**
* 订单类型，1：购买帐号，2：续期帐号 * 订单类型，1：购买帐号，2：续期帐号
...@@ -86,7 +94,7 @@ public class LicenceOrderDTO implements Serializable { ...@@ -86,7 +94,7 @@ public class LicenceOrderDTO implements Serializable {
private String orderStatusReason; private String orderStatusReason;
/** /**
* 支付类型为1：微信支付时间 2：上传凭证时间 * 支付时间 支付类型为1：微信支付时间 2：上传凭证时间
*/ */
private Date payTime; private Date payTime;
...@@ -126,29 +134,243 @@ public class LicenceOrderDTO implements Serializable { ...@@ -126,29 +134,243 @@ public class LicenceOrderDTO implements Serializable {
private String reason; private String reason;
/** /**
* 逻辑删除，0未删除，1删除
*/
private Integer deleteFlag;
/**
* 创建时间 * 创建时间
*/ */
private Date createTime; private Date createTime;
/** /**
* 更新时间 * 到期时间
*/ */
private Date updateTime; private Date expireTime;
/** /**
* 创建人 * 当前时间
*/ */
private String creatorId; private Date nowTime;
/** /**
* 创建人名称 * 订单进度list
*/ */
private String creatorName; private List<LicenceOrderProgressDTO> OrderProgressList;
public Long getOrderId() {
return orderId;
}
public void setOrderId(Long orderId) {
this.orderId = orderId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getEnterpriseName() {
return enterpriseName;
}
public void setEnterpriseName(String enterpriseName) {
this.enterpriseName = enterpriseName;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getWxEnterpriseName() {
return wxEnterpriseName;
}
public void setWxEnterpriseName(String wxEnterpriseName) {
this.wxEnterpriseName = wxEnterpriseName;
}
public Integer getOrderType() {
return orderType;
}
public void setOrderType(Integer orderType) {
this.orderType = orderType;
}
public Integer getExternalContactCount() {
return externalContactCount;
}
public void setExternalContactCount(Integer externalContactCount) {
this.externalContactCount = externalContactCount;
}
public Integer getBaseCount() {
return baseCount;
}
public void setBaseCount(Integer baseCount) {
this.baseCount = baseCount;
}
public Integer getPrice() {
return price;
}
public void setPrice(Integer price) {
this.price = price;
}
public Integer getTimeType() {
return timeType;
}
public void setTimeType(Integer timeType) {
this.timeType = timeType;
}
public Integer getTimeValue() {
return timeValue;
}
public void setTimeValue(Integer timeValue) {
this.timeValue = timeValue;
}
public Integer getPayType() {
return payType;
}
public void setPayType(Integer payType) {
this.payType = payType;
}
public String getTransactionId() {
return transactionId;
}
public void setTransactionId(String transactionId) {
this.transactionId = transactionId;
}
public String getVoucher() {
return voucher;
}
public void setVoucher(String voucher) {
this.voucher = voucher;
}
public Integer getOrderStatus() {
return orderStatus;
}
public void setOrderStatus(Integer orderStatus) {
this.orderStatus = orderStatus;
}
public String getOrderStatusReason() {
return orderStatusReason;
}
public void setOrderStatusReason(String orderStatusReason) {
this.orderStatusReason = orderStatusReason;
}
public Date getPayTime() {
return payTime;
}
public void setPayTime(Date payTime) {
this.payTime = payTime;
}
public Date getRefundTime() {
return refundTime;
}
public void setRefundTime(Date refundTime) {
this.refundTime = refundTime;
}
public String getQywxOrderId() {
return qywxOrderId;
}
public void setQywxOrderId(String qywxOrderId) {
this.qywxOrderId = qywxOrderId;
}
public Integer getQywxOrderStatus() {
return qywxOrderStatus;
}
public void setQywxOrderStatus(Integer qywxOrderStatus) {
this.qywxOrderStatus = qywxOrderStatus;
}
public String getQywxOrderStatusReason() {
return qywxOrderStatusReason;
}
public void setQywxOrderStatusReason(String qywxOrderStatusReason) {
this.qywxOrderStatusReason = qywxOrderStatusReason;
}
public Date getQywxPayTime() {
return qywxPayTime;
}
public void setQywxPayTime(Date qywxPayTime) {
this.qywxPayTime = qywxPayTime;
}
public Date getQywxRefundTime() {
return qywxRefundTime;
}
public void setQywxRefundTime(Date qywxRefundTime) {
this.qywxRefundTime = qywxRefundTime;
}
public String getReason() {
return reason;
}
public void setReason(String reason) {
this.reason = reason;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getExpireTime() {
return expireTime;
}
public void setExpireTime(Date expireTime) {
this.expireTime = expireTime;
}
public Date getNowTime() {
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/qdto/LicenceOrderQDTO.java → haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/licence/LicenceOrderPageDTO.java
package com.gic.haoban.manage.api.dto.qdto; package com.gic.haoban.manage.api.dto.licence;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
...@@ -11,8 +11,7 @@ import java.util.Date; ...@@ -11,8 +11,7 @@ import java.util.Date;
* @author jx * @author jx
* @since 2023-03-09 * @since 2023-03-09
*/ */
public class LicenceOrderPageDTO implements Serializable {
public class LicenceOrderQDTO implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -22,16 +21,6 @@ public class LicenceOrderQDTO implements Serializable { ...@@ -22,16 +21,6 @@ public class LicenceOrderQDTO implements Serializable {
private Long orderId; private Long orderId;
/** /**
* gic商户Id
*/
private String enterpriseId;
/**
* wx企业Id
*/
private String wxEnterpriseId;
/**
* 订单类型，1：购买帐号，2：续期帐号 * 订单类型，1：购买帐号，2：续期帐号
*/ */
private Integer orderType; private Integer orderType;
...@@ -72,11 +61,6 @@ public class LicenceOrderQDTO implements Serializable { ...@@ -72,11 +61,6 @@ public class LicenceOrderQDTO implements Serializable {
private String transactionId; private String transactionId;
/** /**
* 上传凭证url
*/
private String voucher;
/**
* 订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：已退款，5：审核中 * 订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：已退款，5：审核中
*/ */
private Integer orderStatus; private Integer orderStatus;
...@@ -87,16 +71,11 @@ public class LicenceOrderQDTO implements Serializable { ...@@ -87,16 +71,11 @@ public class LicenceOrderQDTO implements Serializable {
private String orderStatusReason; private String orderStatusReason;
/** /**
* 支付类型为1：微信支付时间 2：上传凭证时间 * 支付时间 支付类型为1：微信支付时间 2：审核确认通过的时间
*/ */
private Date payTime; private Date payTime;
/** /**
* 退款时间
*/
private Date refundTime;
/**
* 企业微信订单id * 企业微信订单id
*/ */
private String qywxOrderId; private String qywxOrderId;
...@@ -112,35 +91,9 @@ public class LicenceOrderQDTO implements Serializable { ...@@ -112,35 +91,9 @@ public class LicenceOrderQDTO implements Serializable {
private String qywxOrderStatusReason; private String qywxOrderStatusReason;
/** /**
* 企业微信支付时间
*/
private Date qywxPayTime;
/**
* 企业微信退款时间
*/
private Date qywxRefundTime;
/**
* 审核不通过原因
*/
private String reason;
/**
* 逻辑删除，0未删除，1删除
*/
private Integer deleteFlag;
/**
* 创建时间 * 创建时间
*/ */
private Date createTime; private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/** /**
* 创建人 * 创建人
*/ */
...@@ -151,5 +104,147 @@ public class LicenceOrderQDTO implements Serializable { ...@@ -151,5 +104,147 @@ public class LicenceOrderQDTO implements Serializable {
*/ */
private String creatorName; private String creatorName;
public Long getOrderId() {
return orderId;
}
public void setOrderId(Long orderId) {
this.orderId = orderId;
}
public Integer getOrderType() {
return orderType;
}
public void setOrderType(Integer orderType) {
this.orderType = orderType;
}
public Integer getExternalContactCount() {
return externalContactCount;
}
public void setExternalContactCount(Integer externalContactCount) {
this.externalContactCount = externalContactCount;
}
public Integer getBaseCount() {
return baseCount;
}
public void setBaseCount(Integer baseCount) {
this.baseCount = baseCount;
}
public Integer getPrice() {
return price;
}
public void setPrice(Integer price) {
this.price = price;
}
public Integer getTimeType() {
return timeType;
}
public void setTimeType(Integer timeType) {
this.timeType = timeType;
}
public Integer getTimeValue() {
return timeValue;
}
public void setTimeValue(Integer timeValue) {
this.timeValue = timeValue;
}
public Integer getPayType() {
return payType;
}
public void setPayType(Integer payType) {
this.payType = payType;
}
public String getTransactionId() {
return transactionId;
}
public void setTransactionId(String transactionId) {
this.transactionId = transactionId;
}
public Integer getOrderStatus() {
return orderStatus;
}
public void setOrderStatus(Integer orderStatus) {
this.orderStatus = orderStatus;
}
public String getOrderStatusReason() {
return orderStatusReason;
}
public void setOrderStatusReason(String orderStatusReason) {
this.orderStatusReason = orderStatusReason;
}
public Date getPayTime() {
return payTime;
}
public void setPayTime(Date payTime) {
this.payTime = payTime;
}
public String getQywxOrderId() {
return qywxOrderId;
}
public void setQywxOrderId(String qywxOrderId) {
this.qywxOrderId = qywxOrderId;
}
public Integer getQywxOrderStatus() {
return qywxOrderStatus;
}
public void setQywxOrderStatus(Integer qywxOrderStatus) {
this.qywxOrderStatus = qywxOrderStatus;
}
public String getQywxOrderStatusReason() {
return qywxOrderStatusReason;
}
public void setQywxOrderStatusReason(String qywxOrderStatusReason) {
this.qywxOrderStatusReason = qywxOrderStatusReason;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getCreatorId() {
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/dto/licence/LicenceOrderProgressDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto.licence;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
*
* </p>
*
* @author jx
* @since 2023-03-09
*/
public class LicenceOrderProgressDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
private Long id;
/**
* 订单状态
*/
private String orderStatus;
/**
* 标记字段 1好办后台
*/
private Integer type;
/**
* 上传凭证url
*/
private String voucher;
/**
* 原因
*/
private String reason;
/**
* 创建时间
*/
private Date createTime;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getOrderStatus() {
return orderStatus;
}
public void setOrderStatus(String orderStatus) {
this.orderStatus = orderStatus;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public String getVoucher() {
return voucher;
}
public void setVoucher(String voucher) {
this.voucher = voucher;
}
public String getReason() {
return reason;
}
public void setReason(String reason) {
this.reason = reason;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/licence/LicenceOrderPageQDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto.qdto.licence;
import com.gic.api.base.commons.BasePageInfo;
import java.io.Serializable;
/**
* <p>
*
* </p>
*
* @author jx
* @since 2023-03-09
*/
public class LicenceOrderPageQDTO extends BasePageInfo implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 订单编号
*/
private String transactionId;
/**
* 订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：已退款，5：审核中
*/
private Integer orderStatus;
/**
* 企业微信订单id
*/
private String qywxOrderId;
/**
* 企业微信订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：退款中，5：退款被拒绝，6：已退款，7已失效
*/
private Integer qywxOrderStatus;
/**
* 订单创建开始时间
*/
private String startTime;
/**
* 订单创建结束时间
*/
private String endTime;
public String getTransactionId() {
return transactionId;
}
public void setTransactionId(String transactionId) {
this.transactionId = transactionId;
}
public Integer getOrderStatus() {
return orderStatus;
}
public void setOrderStatus(Integer orderStatus) {
this.orderStatus = orderStatus;
}
public String getQywxOrderId() {
return qywxOrderId;
}
public void setQywxOrderId(String qywxOrderId) {
this.qywxOrderId = qywxOrderId;
}
public Integer getQywxOrderStatus() {
return qywxOrderStatus;
}
public void setQywxOrderStatus(Integer qywxOrderStatus) {
this.qywxOrderStatus = qywxOrderStatus;
}
public String getStartTime() {
return startTime;
}
public void setStartTime(String startTime) {
this.startTime = startTime;
}
public String getEndTime() {
return endTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/licence/LicenceOrderQDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto.qdto.licence;
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;
/**
* 订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：已退款，5：审核中
*/
private Integer orderStatus;
/**
* 逻辑删除，0未删除，1删除
*/
private Integer deleteFlag;
/**
* 创建时间
*/
private Date createTime;
/**
* 过期时间 类型为在线支付 30分钟；类型为对公转账 3天
*/
private Date expireTime;
/**
* 更新时间
*/
private Date updateTime;
/**
* 创建人
*/
private String creatorId;
/**
* 创建人名称
*/
private String creatorName;
public Long getOrderId() {
return orderId;
}
public void setOrderId(Long orderId) {
this.orderId = orderId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public Integer getOrderType() {
return orderType;
}
public void setOrderType(Integer orderType) {
this.orderType = orderType;
}
public Integer getExternalContactCount() {
return externalContactCount;
}
public void setExternalContactCount(Integer externalContactCount) {
this.externalContactCount = externalContactCount;
}
public Integer getBaseCount() {
return baseCount;
}
public void setBaseCount(Integer baseCount) {
this.baseCount = baseCount;
}
public Integer getPrice() {
return price;
}
public void setPrice(Integer price) {
this.price = price;
}
public Integer getTimeType() {
return timeType;
}
public void setTimeType(Integer timeType) {
this.timeType = timeType;
}
public Integer getTimeValue() {
return timeValue;
}
public void setTimeValue(Integer timeValue) {
this.timeValue = timeValue;
}
public Integer getPayType() {
return payType;
}
public void setPayType(Integer payType) {
this.payType = payType;
}
public String getTransactionId() {
return transactionId;
}
public void setTransactionId(String transactionId) {
this.transactionId = transactionId;
}
public Integer getOrderStatus() {
return orderStatus;
}
public void setOrderStatus(Integer orderStatus) {
this.orderStatus = orderStatus;
}
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getExpireTime() {
return expireTime;
}
public void setExpireTime(Date expireTime) {
this.expireTime = expireTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getCreatorId() {
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
package com.gic.haoban.manage.api.service.licence; package com.gic.haoban.manage.api.service.licence;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
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.qdto.licence.LicenceOrderPageQDTO;
import com.gic.haoban.manage.api.dto.qdto.licence.LicenceOrderQDTO;
/** /**
* <p> * <p>
* 服务类 * 服务类
...@@ -10,4 +17,46 @@ package com.gic.haoban.manage.api.service.licence; ...@@ -10,4 +17,46 @@ package com.gic.haoban.manage.api.service.licence;
*/ */
public interface LicenceOrderApiService { public interface LicenceOrderApiService {
/**
* 获取订单详情
*
* @param orderId 订单id
* @return LicenceOrderDTO
*/
ServiceResponse<LicenceOrderDTO> getLicenceOrderDetail(Long orderId);
/**
* 删除订单
*
* @param orderId 订单id
* @return
*/
ServiceResponse<Boolean> deleteLicenceOrder(Long orderId);
/**
* 新增或者修改订单详情
*
* @param licenceOrderQDTO
* @return
*/
ServiceResponse<Boolean> saveOrUpdateLicenceOrder(LicenceOrderQDTO licenceOrderQDTO);
/**
* 分页查询订单数据
*
* @param licenceOrderPageQDTO
* @return
*/
ServiceResponse<Page<LicenceOrderPageDTO>> getLicenceOrderPage(LicenceOrderPageQDTO licenceOrderPageQDTO);
/**
* 取消订单
*
* @param orderId 订单id
* @param type
* @return
*/
ServiceResponse<Boolean> cancelLicenceOrder(Long orderId, Integer type);
} }
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/licence/LicenceOrderService.java
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.api.dto.qdto.licence.LicenceOrderQDTO;
import com.gic.haoban.manage.service.entity.licence.TabHaobanLicenceOrder; import com.gic.haoban.manage.service.entity.licence.TabHaobanLicenceOrder;
/** /**
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/licence/impl/LicenceOrderServiceImpl.java
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.api.dto.qdto.licence.LicenceOrderQDTO;
import com.gic.haoban.manage.service.dao.mapper.licence.TabHaobanLicenceOrderMapper; 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.entity.licence.TabHaobanLicenceOrder;
import com.gic.haoban.manage.service.service.licence.LicenceOrderService; import com.gic.haoban.manage.service.service.licence.LicenceOrderService;
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/licence/LicenceOrderApiServiceImpl.java
package com.gic.haoban.manage.service.service.out.impl.licence; package com.gic.haoban.manage.service.service.out.impl.licence;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
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.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;
/** /**
...@@ -8,4 +14,28 @@ import com.gic.haoban.manage.api.service.licence.LicenceOrderApiService; ...@@ -8,4 +14,28 @@ import com.gic.haoban.manage.api.service.licence.LicenceOrderApiService;
* @Date: 2023/3/9 17:04 * @Date: 2023/3/9 17:04
*/ */
public class LicenceOrderApiServiceImpl implements LicenceOrderApiService { public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
@Override
public ServiceResponse<LicenceOrderDTO> getLicenceOrderDetail(Long orderId) {
return null;
}
@Override
public ServiceResponse<Boolean> deleteLicenceOrder(Long orderId) {
return null;
}
@Override
public ServiceResponse<Boolean> saveOrUpdateLicenceOrder(LicenceOrderQDTO licenceOrderQDTO) {
return null;
}
@Override
public ServiceResponse<Page<LicenceOrderPageDTO>> getLicenceOrderPage(LicenceOrderPageQDTO licenceOrderPageQDTO) {
return null;
}
@Override
public ServiceResponse<Boolean> cancelLicenceOrder(Long orderId, Integer type) {
return null;
}
} }
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/licence/LicenceOrderController.java
package com.gic.haoban.manage.web.controller.licence; package com.gic.haoban.manage.web.controller.licence;
import com.gic.api.base.commons.Page;
import com.gic.commons.webapi.reponse.RestResponse; import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.haoban.manage.api.service.licence.LicenceOrderApiService;
import com.gic.haoban.manage.web.qo.licence.LicenceOrderPageQO; import com.gic.haoban.manage.web.qo.licence.LicenceOrderPageQO;
import com.gic.haoban.manage.web.qo.licence.LicenceOrderQO; import com.gic.haoban.manage.web.qo.licence.LicenceOrderQO;
import com.gic.haoban.manage.web.vo.licence.LicenceOrderPageVO; import com.gic.haoban.manage.web.vo.licence.LicenceOrderPageVO;
import com.gic.haoban.manage.web.vo.licence.LicenceOrderVO; import com.gic.haoban.manage.web.vo.licence.LicenceOrderVO;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
...@@ -23,6 +28,11 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -23,6 +28,11 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/licence-order") @RequestMapping("/licence-order")
public class LicenceOrderController { public class LicenceOrderController {
private static Logger logger = LogManager.getLogger(LicenceOrderController.class);
@Autowired
private LicenceOrderApiService licenceOrderApiService;
/** /**
* 查询订单详情 * 查询订单详情
*/ */
...@@ -51,7 +61,7 @@ public class LicenceOrderController { ...@@ -51,7 +61,7 @@ public class LicenceOrderController {
* 分页查询订单列表 * 分页查询订单列表
*/ */
@RequestMapping("licence-order-page") @RequestMapping("licence-order-page")
public RestResponse<LicenceOrderPageVO> getLicenceOrderPage(@RequestBody LicenceOrderPageQO licenceOrderPageQO) { public RestResponse<Page<LicenceOrderPageVO>> getLicenceOrderPage(@RequestBody LicenceOrderPageQO licenceOrderPageQO) {
return null; return null;
} }
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/licence/LicenceOrderPageQO.java
package com.gic.haoban.manage.web.qo.licence; package com.gic.haoban.manage.web.qo.licence;
import com.gic.api.base.commons.BasePageInfo;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* <p> * <p>
...@@ -16,91 +16,21 @@ import java.util.Date; ...@@ -16,91 +16,21 @@ import java.util.Date;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
public class LicenceOrderPageQO implements Serializable { public class LicenceOrderPageQO extends BasePageInfo implements Serializable {
private static final long serialVersionUID = 1L; 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; private String transactionId;
/** /**
* 上传凭证url
*/
private String voucher;
/**
* 订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：已退款，5：审核中 * 订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：已退款，5：审核中
*/ */
private Integer orderStatus; private Integer orderStatus;
/** /**
* 订单状态更改原因
*/
private String orderStatusReason;
/**
* 支付类型为1：微信支付时间 2：上传凭证时间
*/
private Date payTime;
/**
* 退款时间
*/
private Date refundTime;
/**
* 企业微信订单id * 企业微信订单id
*/ */
private String qywxOrderId; private String qywxOrderId;
...@@ -111,49 +41,12 @@ public class LicenceOrderPageQO implements Serializable { ...@@ -111,49 +41,12 @@ public class LicenceOrderPageQO implements Serializable {
private Integer qywxOrderStatus; private Integer qywxOrderStatus;
/** /**
* 企业微信订单更改原因 * 订单创建开始时间
*/
private String qywxOrderStatusReason;
/**
* 企业微信支付时间
*/
private Date qywxPayTime;
/**
* 企业微信退款时间
*/
private Date qywxRefundTime;
/**
* 审核不通过原因
*/
private String reason;
/**
* 逻辑删除，0未删除，1删除
*/
private Integer deleteFlag;
/**
* 创建时间
*/ */
private Date createTime; private String startTime;
/**
* 更新时间
*/
private Date updateTime;
/** /**
* 创建人 * 订单创建结束时间
*/ */
private String creatorId; private String endTime;
/**
* 创建人名称
*/
private String creatorName;
} }
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/licence/LicenceOrderQO.java
...@@ -4,7 +4,6 @@ import lombok.Data; ...@@ -4,7 +4,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* <p> * <p>
...@@ -19,22 +18,6 @@ import java.util.Date; ...@@ -19,22 +18,6 @@ import java.util.Date;
public class LicenceOrderQO implements Serializable { public class LicenceOrderQO implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 订单id
*/
private Long orderId;
/**
* gic商户Id
*/
private String enterpriseId;
/**
* wx企业Id
*/
private String wxEnterpriseId;
/** /**
* 订单类型，1：购买帐号，2：续期帐号 * 订单类型，1：购买帐号，2：续期帐号
*/ */
...@@ -69,91 +52,4 @@ public class LicenceOrderQO implements Serializable { ...@@ -69,91 +52,4 @@ public class LicenceOrderQO implements Serializable {
* 支付类型 1在线支付 2对公转账 * 支付类型 1在线支付 2对公转账
*/ */
private Integer payType; 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;
} }
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/licence/LicenceOrderPageVO.java
...@@ -26,16 +26,6 @@ public class LicenceOrderPageVO implements Serializable { ...@@ -26,16 +26,6 @@ public class LicenceOrderPageVO implements Serializable {
private Long orderId; private Long orderId;
/** /**
* gic商户Id
*/
private String enterpriseId;
/**
* wx企业Id
*/
private String wxEnterpriseId;
/**
* 订单类型，1：购买帐号，2：续期帐号 * 订单类型，1：购买帐号，2：续期帐号
*/ */
private Integer orderType; private Integer orderType;
...@@ -76,11 +66,6 @@ public class LicenceOrderPageVO implements Serializable { ...@@ -76,11 +66,6 @@ public class LicenceOrderPageVO implements Serializable {
private String transactionId; private String transactionId;
/** /**
* 上传凭证url
*/
private String voucher;
/**
* 订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：已退款，5：审核中 * 订单状态，0：待支付，1：已支付，2：已取消，3：已过期，4：已退款，5：审核中
*/ */
private Integer orderStatus; private Integer orderStatus;
...@@ -91,16 +76,11 @@ public class LicenceOrderPageVO implements Serializable { ...@@ -91,16 +76,11 @@ public class LicenceOrderPageVO implements Serializable {
private String orderStatusReason; private String orderStatusReason;
/** /**
* 支付类型为1：微信支付时间 2：上传凭证时间 * 支付时间 支付类型为1：微信支付时间 2：审核确认通过的时间
*/ */
private Date payTime; private Date payTime;
/** /**
* 退款时间
*/
private Date refundTime;
/**
* 企业微信订单id * 企业微信订单id
*/ */
private String qywxOrderId; private String qywxOrderId;
...@@ -116,35 +96,9 @@ public class LicenceOrderPageVO implements Serializable { ...@@ -116,35 +96,9 @@ public class LicenceOrderPageVO implements Serializable {
private String qywxOrderStatusReason; private String qywxOrderStatusReason;
/** /**
* 企业微信支付时间
*/
private Date qywxPayTime;
/**
* 企业微信退款时间
*/
private Date qywxRefundTime;
/**
* 审核不通过原因
*/
private String reason;
/**
* 逻辑删除，0未删除，1删除
*/
private Integer deleteFlag;
/**
* 创建时间 * 创建时间
*/ */
private Date createTime; private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
/** /**
* 创建人 * 创建人
*/ */
......
haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml
...@@ -132,5 +132,6 @@ ...@@ -132,5 +132,6 @@
<dubbo:reference interface="com.gic.member.api.service.MemberService" id="memberService"/> <dubbo:reference interface="com.gic.member.api.service.MemberService" id="memberService"/>
<dubbo:reference interface="com.gic.search.engine.api.service.dynamic.ESDataDynamicOperationApiService" id="esApiService"/> <dubbo:reference interface="com.gic.search.engine.api.service.dynamic.ESDataDynamicOperationApiService" id="esApiService"/>
<dubbo:reference interface="com.gic.marketing.api.service.MemberTagMarketingApiService" id="memberTagMarketingApiService"/> <dubbo:reference interface="com.gic.marketing.api.service.MemberTagMarketingApiService" id="memberTagMarketingApiService"/>
<dubbo:reference interface="com.gic.haoban.manage.api.service.licence.LicenceOrderApiService" id="licenceOrderApiService"/>
</beans> </beans>
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