yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

充值、退款 新增订单来源

Browse Source
This commit is contained in:
yuyang 2021-12-23 09:37:28 +08:00
parent bb996d64c7
commit 43a738ff1f
4 changed files with 51 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/domain/XhpcRechargeOrder.java
View File

@ -44,7 +44,7 @@ public class XhpcRechargeOrder extends BaseEntity {
private BigDecimal amount;
/**
* 充值渠道（1微信 2支付宝）
* 充值渠道（1微信 2支付宝 3平台）
*/
private Integer type;
@ -59,6 +59,11 @@ public class XhpcRechargeOrder extends BaseEntity {
*/
private Integer delFlag;
/**
* 订单来源（0 C端用户 1 流量方用户 2社区用户 3B端用户）
*/
private Integer source;
public Long getRechargeOrderId() {
return rechargeOrderId;
}
@ -130,4 +135,12 @@ public class XhpcRechargeOrder extends BaseEntity {
public void setRechargeOrderNumber(String rechargeOrderNumber) {
this.rechargeOrderNumber = rechargeOrderNumber;
}
public Integer getSource() {
return source;
}
public void setSource(Integer source) {
this.source = source;
}
}

15
xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/domain/XhpcRefundOrder.java
View File

@ -44,7 +44,7 @@ public class XhpcRefundOrder extends BaseEntity {
private BigDecimal amount;
/**
* 退款渠道（1微信 2支付宝）
* 退款渠道（1微信 2支付宝 3平台）
*/
private Integer type;
@ -63,6 +63,11 @@ public class XhpcRefundOrder extends BaseEntity {
*/
private Integer delFlag;
/**
* 订单来源（0 C端用户 1 流量方用户 2社区用户 3B端用户）
*/
private Integer source;
public Long getRefundOrderId() {
return refundOrderId;
}
@ -142,4 +147,12 @@ public class XhpcRefundOrder extends BaseEntity {
public void setExamineStatus(Integer examineStatus) {
this.examineStatus = examineStatus;
}
public Integer getSource() {
return source;
}
public void setSource(Integer source) {
this.source = source;
}
}

15
xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml
View File

@ -19,6 +19,7 @@
<result column="update_time" property="updateTime" />
<result column="update_by" property="updateBy" />
<result column="remark" property="remark" />
<result column="source" property="source" />
</resultMap>
<insert id="insert" parameterType="com.xhpc.payment.domain.XhpcRechargeOrder" useGeneratedKeys="true"
@ -62,7 +63,10 @@
update_by,
</if>
<if test="null != remark and '' != remark">
remark
remark,
</if>
<if test="null != source">
source
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@ -103,7 +107,10 @@
#{updateBy},
</if>
<if test="null != remark and '' != remark">
#{remark}
#{remark},
</if>
<if test="null != source">
#{source}
</if>
</trim>
</insert>
@ -133,7 +140,7 @@
<select id="info" parameterType="java.lang.Long" resultType="java.util.Map">
select xro.recharge_order_id rechargeOrderId ,xro.recharge_order_number rechargeOrderNumber,
xro.alipay_number alipayNumber ,xro.prepay_id prepayid,xro.user_id userId,xro.amount,
xro.type ,xro.`status`,xro.create_time createTime,xau.phone,sdd.dict_label statusName
xro.type ,xro.`status`,xro.create_time createTime,xro.source source,xau.phone,sdd.dict_label statusName
from xhpc_recharge_order xro
LEFT JOIN xhpc_app_user xau on xau.app_user_id = xro.user_id
LEFT JOIN sys_dict_data sdd on sdd.`dict_type` = 'recharge_order_status' and sdd.dict_value = xro.`status`
@ -143,7 +150,7 @@
<select id="page" parameterType="java.lang.Long" resultType="java.util.Map">
select xro.recharge_order_id rechargeOrderId ,xro.recharge_order_number rechargeOrderNumber,
xro.alipay_number alipayNumber ,xro.prepay_id prepayid,xro.user_id userId,xro.amount,
xro.type ,xro.`status`,xro.create_time createTime,xau.phone,sdd.dict_label statusName
xro.type ,xro.`status`,xro.create_time createTime,xro.source source,xau.phone,sdd.dict_label statusName
from xhpc_recharge_order xro
LEFT JOIN xhpc_app_user xau on xau.app_user_id = xro.user_id
LEFT JOIN sys_dict_data sdd on sdd.`dict_type` = 'recharge_order_status' and sdd.dict_value = xro.`status`

17
xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml
View File

@ -20,6 +20,7 @@
<result column="update_time" property="updateTime"/>
<result column="update_by" property="updateBy"/>
<result column="remark" property="remark"/>
<result column="source" property="source" />
</resultMap>
<insert id="insert" parameterType="com.xhpc.payment.domain.XhpcRefundOrder" useGeneratedKeys="true"
@ -66,7 +67,10 @@
update_by,
</if>
<if test="null != remark and '' != remark">
remark
remark,
</if>
<if test="null != source">
source
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@ -110,7 +114,10 @@
#{updateBy},
</if>
<if test="null != remark and '' != remark">
#{remark}
#{remark},
</if>
<if test="null != source">
#{source}
</if>
</trim>
</insert>
@ -158,7 +165,7 @@
<select id="info" parameterType="java.lang.Long" resultType="java.util.Map">
select xro.refund_order_id refundOrderId ,xro.refund_order_number refundOrderNumber,
xro.alipay_id alipayId ,xro.open_id openId,xro.user_id userId,xro.amount,
xro.type,xro.examine_status examineStatus,xro.`status`,xro.create_time createTime,xau.phone,
xro.type,xro.examine_status examineStatus,xro.`status`,xro.source source,xro.create_time createTime,xau.phone,
sdd.dict_label statusName,sdds.dict_label examineStatusName
from xhpc_refund_order xro
LEFT JOIN xhpc_app_user xau on xau.app_user_id = xro.user_id
@ -170,7 +177,7 @@
<select id="page" parameterType="java.lang.String" resultType="java.util.Map">
select xro.refund_order_id refundOrderId ,xro.refund_order_number refundOrderNumber,
xro.alipay_id alipayId ,xro.open_id openId,xro.user_id userId,xro.amount,
xro.type,xro.examine_status examineStatus,xro.`status`,xro.create_time createTime,
xro.type,xro.examine_status examineStatus,xro.`status`,xro.source source,xro.create_time createTime,
xau.phone,sdd.dict_label statusName,sdds.dict_label examineStatusName
from xhpc_refund_order xro
LEFT JOIN xhpc_app_user xau on xau.app_user_id = xro.user_id
@ -242,7 +249,7 @@
select xro.refund_order_id refundOrderId ,xro.refund_order_number refundOrderNumber,
xro.alipay_id alipayId ,xro.open_id openId,xro.user_id userId,xro.amount,
xro.type,xro.examine_status examineStatus,xro.`status`,xro.create_time createTime,
xau.phone,sdd.dict_label statusName,sdds.dict_label examineStatusName
xro.source source,xau.phone,sdd.dict_label statusName,sdds.dict_label examineStatusName
from xhpc_refund_order xro
LEFT JOIN xhpc_app_user xau on xau.app_user_id = xro.user_id
LEFT JOIN sys_dict_data sdd on sdd.`dict_type` = 'refund_order_status' and sdd.dict_value = xro.`status`