From a411058cc47109680fa9fa4d2bd7c03d46949a5e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 17 Feb 2023 15:26:04 +0800
Subject: [PATCH] 合伙人权益的后台编辑上传 接口
---
src/main/resources/mapper/modules/MallSalesmanMapper.xml | 3 +++
src/main/java/cc/mrbird/febs/mall/vo/AdminSalesmanAchieveVo.java | 2 ++
src/main/resources/templates/febs/views/modules/mallMember/salesmanAchieveList.html | 25 ++++++++++++++++++++-----
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 1 +
4 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
index 0d6c11c..1c9fa79 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -741,6 +741,7 @@
for(AdminSalesmanAchieveVo adminSalesmanAchieveVo : records){
Long salesmanId = adminSalesmanAchieveVo.getSalesmanId();
List<AdminMemberOrderVo> adminMemberOrderVos = mallSalesmanMapper.selectAdminMemberOrderVoBySalesmanId(salesmanId);
+ adminSalesmanAchieveVo.setOrderCnt(adminMemberOrderVos.size());
adminSalesmanAchieveVo.setAdminMemberOrderVos(adminMemberOrderVos);
}
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminSalesmanAchieveVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminSalesmanAchieveVo.java
index b3b8b52..af4a7b1 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminSalesmanAchieveVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminSalesmanAchieveVo.java
@@ -21,6 +21,8 @@
private Integer memberCnt;
+ private Integer orderCnt;
+
private List<AdminMemberOrderVo> adminMemberOrderVos;
diff --git a/src/main/resources/mapper/modules/MallSalesmanMapper.xml b/src/main/resources/mapper/modules/MallSalesmanMapper.xml
index 74f1db7..c9c0038 100644
--- a/src/main/resources/mapper/modules/MallSalesmanMapper.xml
+++ b/src/main/resources/mapper/modules/MallSalesmanMapper.xml
@@ -113,6 +113,9 @@
<if test="record.city != null and record.city != ''">
and a.city = #{record.city}
</if>
+ <if test="record.name != null and record.name != ''">
+ and a.name like concat('%', #{record.name},'%')
+ </if>
</if>
</where>
ORDER BY
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/salesmanAchieveList.html b/src/main/resources/templates/febs/views/modules/mallMember/salesmanAchieveList.html
index 3d6068e..947bac7 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/salesmanAchieveList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/salesmanAchieveList.html
@@ -6,12 +6,19 @@
<form class="layui-form layui-table-form" lay-filter="salesman-achieve-table-form">
<div class="layui-row">
<div class="layui-col-md10">
- <div class="layui-form-item">
+ <div class="layui-inline">
<label class="layui-form-label">省：</label>
<div class="layui-input-inline">
<select name="province" class="province-select-category" id="provinceSelect">
<option value="">请选择</option>
</select>
+ </div>
+ </div>
+
+ <div class="layui-inline">
+ <label class="layui-form-label">推销员：</label>
+ <div class="layui-input-inline">
+ <input type="text" placeholder="推销员" name="name" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -108,9 +115,17 @@
{field: 'province', title: '省', width: 200,align:'center'},
{field: 'city', title: '市', width: 200,align:'center'},
{field: 'salesmanName', title: '推销员', width: 200,align:'center'},
- {field: 'memberCnt', title: '总人数', width: 200,align:'center'},
- {width: 200,align:'center'},
- {width: 200,align:'center'},
+ {field: 'memberCnt', title: '推荐注册人数', width: 200,align:'center'},
+ {field: 'orderCnt', title: '下单总数', width: 200,align:'center'},
+ {title: '操作',
+ templet: function (d) {
+ if(d.orderCnt > 0){
+ return '<button class="layui-btn layui-btn-normal layui-btn-xs" >点击查看</button>'
+ }else{
+ return ''
+ }
+
+ },width: 200,align:'center', fixed:'right'},
{width: 200,align:'center'},
{width: 200,align:'center'}
]]
@@ -165,7 +180,7 @@
return {
province: $searchForm.find("select[name='province']").val(),
// memberName: $searchForm.find('input[name="memberName"]').val().trim(),
- // name: $searchForm.find('input[name="name"]').val().trim(),
+ name: $searchForm.find('input[name="name"]').val().trim(),
// phone: $searchForm.find('input[name="phone"]').val().trim(),
// state: $searchForm.find("select[name='state']").val()
};
--
Gitblit v1.9.1