From 43a738ff1ff0ccdcbde0f8d96dc516e141fb5be3 Mon Sep 17 00:00:00 2001 From: yuyang Date: Thu, 23 Dec 2021 09:37:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E3=80=81=E9=80=80=E6=AC=BE?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E8=AE=A2=E5=8D=95=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhpc/payment/domain/XhpcRechargeOrder.java | 15 ++++++++++++++- .../xhpc/payment/domain/XhpcRefundOrder.java | 15 ++++++++++++++- .../mapper/XhpcRechargeOrderMapper.xml | 15 +++++++++++---- .../resources/mapper/XhpcRefundOrderMapper.xml | 17 ++++++++++++----- 4 files changed, 51 insertions(+), 11 deletions(-) diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/domain/XhpcRechargeOrder.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/domain/XhpcRechargeOrder.java index fd4bb4eb..ac7ff9d2 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/domain/XhpcRechargeOrder.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/domain/XhpcRechargeOrder.java @@ -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; + } } diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/domain/XhpcRefundOrder.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/domain/XhpcRefundOrder.java index cb0d6886..1e5ade8d 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/domain/XhpcRefundOrder.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/domain/XhpcRefundOrder.java @@ -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; + } } diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml index e32c9a90..a25f1d23 100644 --- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml +++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRechargeOrderMapper.xml @@ -19,6 +19,7 @@ + - remark + remark, + + + source @@ -103,7 +107,10 @@ #{updateBy}, - #{remark} + #{remark}, + + + #{source} @@ -133,7 +140,7 @@ 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` diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml index 7fba0ea9..004b8166 100644 --- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml +++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOrderMapper.xml @@ -20,6 +20,7 @@ + - remark + remark, + + + source @@ -110,7 +114,10 @@ #{updateBy}, - #{remark} + #{remark}, + + + #{source} @@ -158,7 +165,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, + 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`