From 2eff39a10917e141d2a61ff9f0763c10858cd0b5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 28 Sep 2021 21:07:07 +0800
Subject: [PATCH] 20210928
---
src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java | 2 ++
src/main/resources/mapper/modules/MallMemberMapper.xml | 1 +
src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html | 3 ++-
src/main/resources/templates/febs/views/modules/order/refundList.html | 3 ++-
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 5 ++++-
src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java | 2 ++
src/main/resources/templates/febs/views/modules/mallMember/agentList.html | 3 ++-
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 3 ++-
src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html | 3 ++-
src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderRefundVo.java | 2 ++
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 2 ++
src/main/resources/templates/febs/views/modules/order/orderList.html | 3 ++-
src/main/java/cc/mrbird/febs/mall/vo/AdminAgentVo.java | 2 ++
src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyFlowListVo.java | 2 ++
src/main/resources/mapper/modules/MallOrderRefundMapper.xml | 8 +++++++-
15 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminAgentVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminAgentVo.java
index 14f4c5c..c9ace57 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminAgentVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminAgentVo.java
@@ -15,6 +15,8 @@
private String phone;
+ private String bindPhone;
+
private String level;
private String levelName;
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
index 782b3f8..86233cd 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderInfoVo.java
@@ -66,5 +66,7 @@
private String memberPhone;
+ private String memberBindPhone;
+
private String memberEmail;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderRefundVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderRefundVo.java
index a8fd141..7ea3d44 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderRefundVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallOrderRefundVo.java
@@ -17,6 +17,8 @@
private String buyPhone;
+ private String buyBindPhone;
+
private String addressDetail;
private Long orderId;
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java
index 05dfcab..3b5663a 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyChargeListVo.java
@@ -30,5 +30,7 @@
private String phone;
+ private String bindPhone;
+
private Integer status;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyFlowListVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyFlowListVo.java
index bdb8173..d70b1a9 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyFlowListVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMoneyFlowListVo.java
@@ -34,4 +34,6 @@
private String payMethod;
+ private String bindPhone;
+
}
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 4549420..1ce8ddf 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -13,6 +13,7 @@
and (
m.phone like concat('%', #{record.account},'%')
or m.email like concat('%', #{record.account},'%')
+ or m.bind_phone like concat('%', #{record.account},'%')
or m.invite_id like concat('%', #{record.account},'%')
)
</if>
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 4250bd6..e84f635 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -35,6 +35,7 @@
select
a.*,
b.name,
+ b.bind_phone bindPhone,
c.pay_method payMethod,
b.phone
from mall_money_flow a
@@ -60,6 +61,7 @@
select
a.*,
b.name,
+ b.bind_phone bindPhone,
b.phone
from mall_money_flow a
inner join mall_member b on a.member_id=b.id
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index 40d89d5..116f9ab 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -7,7 +7,10 @@
</select>
<select id="selectOrderListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderInfoVo">
- select *,b.name memberName,b.phone memberPhone
+ select *,
+ b.name memberName,
+ b.bind_phone memberBindPhone,
+ b.phone memberPhone
from mall_order_info a
left join mall_member b on a.member_id = b.id
<where>
diff --git a/src/main/resources/mapper/modules/MallOrderRefundMapper.xml b/src/main/resources/mapper/modules/MallOrderRefundMapper.xml
index cc6ebec..b04e04a 100644
--- a/src/main/resources/mapper/modules/MallOrderRefundMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderRefundMapper.xml
@@ -7,7 +7,13 @@
</select>
<select id="selectRefundListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallOrderRefundVo">
- select a.*,b.name buyName ,b.phone buyPhone,c.order_no,c.amount,CONCAT(a.name,a.phone,a.address) addressDetail
+ select a.*,
+ b.name buyName ,
+ b.phone buyPhone,
+ b.bind_phone buyBindPhone,
+ c.order_no,
+ c.amount,
+ CONCAT(a.phone,a.bind_phone,a.address) addressDetail
from mall_order_refund a
left join mall_member b on b.id = a.member_id
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/agentList.html b/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
index 435aa5d..40c4b82 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/agentList.html
@@ -107,7 +107,8 @@
id: 'userAgentTable',
url: ctx + 'admin/mallMember/getAgentList',
cols: [[
- {field: 'phone', title: '手机号', minWidth: 150,align:'left'},
+ {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
+ {field: 'phone', title: '账号', minWidth: 150,align:'left'},
{field: 'name', title: '名称', minWidth: 100,align:'left'},
{field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
{field: 'levelName', title: '代理层级', minWidth: 100,align:'left'},
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
index ff44032..4f60714 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/chargeFlowList.html
@@ -120,7 +120,8 @@
url: ctx + 'admin/mallMember/getMoneyChargeList',
cols: [[
{field: 'name', title: '名称', minWidth: 100,align:'left'},
- {field: 'phone', title: '手机号', minWidth: 150,align:'left'},
+ {field: 'phone', title: '账号', minWidth: 150,align:'left'},
+ {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
{field: 'amount', title: '金额', minWidth: 150,align:'left'},
{field: 'status', title: '状态',
templet: function (d) {
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
index 6f8ef47..b74872a 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -131,7 +131,8 @@
id: 'userTable',
url: ctx + 'admin/mallMember/getMallMemberList',
cols: [[
- {field: 'phone', title: '手机号', minWidth: 150,align:'left'},
+ {field: 'phone', title: '账号', minWidth: 150,align:'left'},
+ {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
// {field: 'email', title: '邮箱', minWidth: 150,align:'left'},
{field: 'name', title: '名称', minWidth: 100,align:'left'},
{field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
index ace7df4..64db874 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -96,7 +96,8 @@
url: ctx + 'admin/mallMember/getMoneyFlowList',
cols: [[
{field: 'name', title: '名称', minWidth: 100,align:'left'},
- {field: 'phone', title: '手机号', minWidth: 150,align:'left'},
+ {field: 'phone', title: '账号', minWidth: 150,align:'left'},
+ {field: 'bindPhone', title: '手机号', minWidth: 150,align:'left'},
{field: 'amount', title: '金额', minWidth: 150,align:'left'},
{field: 'type', title: '流水类型',
templet: function (d) {
diff --git a/src/main/resources/templates/febs/views/modules/order/orderList.html b/src/main/resources/templates/febs/views/modules/order/orderList.html
index 6de219c..292174c 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -174,7 +174,8 @@
cols: [[
{field: 'orderNo', title: '订单编号', minWidth: 200,align:'left'},
{field: 'memberName', title: '购买人', minWidth: 120,align:'left'},
- {field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
+ {field: 'memberPhone', title: '账号', minWidth: 120,align:'left'},
+ {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
{field: 'amount', title: '订单金额', minWidth: 120,align:'left'},
{field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
{field: 'payMethod', title: '支付方式', minWidth: 120,align:'left'},
diff --git a/src/main/resources/templates/febs/views/modules/order/refundList.html b/src/main/resources/templates/febs/views/modules/order/refundList.html
index 9015dbf..71eea50 100644
--- a/src/main/resources/templates/febs/views/modules/order/refundList.html
+++ b/src/main/resources/templates/febs/views/modules/order/refundList.html
@@ -170,7 +170,8 @@
cols: [[
{field: 'orderNo', title: '订单编号', minWidth: 150,align:'left'},
{field: 'buyName', title: '用户名', minWidth: 150,align:'left'},
- {field: 'buyPhone', title: '电话', minWidth: 150,align:'left'},
+ {field: 'buyPhone', title: '账号', minWidth: 150,align:'left'},
+ {field: 'buyBindPhone', title: '手机号', minWidth: 150,align:'left'},
{field: 'beforeStatus', title: '发货状态',
templet: function (d) {
if (d.status === 1) {
--
Gitblit v1.9.1