From d4801f6c6d821c3b1ebd6174498149ee0e0159ee Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Sep 2022 14:49:04 +0800
Subject: [PATCH] 20220902
---
src/main/resources/templates/febs/views/modules/leader/leaderUpdate.html | 18 +++++++++---------
src/main/resources/mapper/modules/MallTeamLeaderMapper.xml | 1 +
src/main/resources/templates/febs/views/modules/leader/addLeader.html | 16 ++++++++--------
src/main/resources/application-dev.yml | 2 +-
src/main/resources/application-prod.yml | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java | 8 ++++----
src/main/resources/templates/febs/views/modules/leader/leaderList.html | 4 ++--
src/main/resources/application-test.yml | 2 +-
src/main/resources/templates/febs/views/modules/order/orderList.html | 1 +
9 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java
index d34825d..8164048 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java
@@ -340,10 +340,10 @@
if(1!=state){
return new FebsResponse().fail().message("目前还不是团长，无法操作");
}
- MallElectronicFence mallElectronicFence = mallElectronicFenceMapper.selectByTeamLeaderCode(mallTeamLeader.getUniqueCode());
- if(ObjectUtil.isEmpty(mallElectronicFence)){
- return new FebsResponse().fail().message("请先设置配送范围");
- }
+// MallElectronicFence mallElectronicFence = mallElectronicFenceMapper.selectByTeamLeaderCode(mallTeamLeader.getUniqueCode());
+// if(ObjectUtil.isEmpty(mallElectronicFence)){
+// return new FebsResponse().fail().message("请先设置配送范围");
+// }
mallTeamLeader.setOnlineState(1);
this.baseMapper.updateById(mallTeamLeader);
return new FebsResponse().success();
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 7ebf254..12d500b 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -22,7 +22,7 @@
username: db_yyg
password: yyg123!@#
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://localhost:3306/db_yyg?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://121.37.162.173:3306/db_yyg?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
# username: db_mall
# password: mall!@#123
# driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 5f079da..0d0e947 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -22,7 +22,7 @@
username: db_yyg
password: yyg123!@#
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://localhost:3306/db_yyg?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://121.37.162.173:3306/db_yyg?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
redis:
# Redis数据库索引（默认为 0）
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 6547a11..8aa6088 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -22,7 +22,7 @@
username: db_yyg
password: yyg123!@#
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://localhost:3306/db_yyg?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ url: jdbc:mysql://121.37.162.173:3306/db_yyg?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
redis:
# Redis数据库索引（默认为 0）
diff --git a/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml b/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
index d200f3b..16de05e 100644
--- a/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
+++ b/src/main/resources/mapper/modules/MallTeamLeaderMapper.xml
@@ -119,6 +119,7 @@
and ( a.name like CONCAT('%', CONCAT(#{record.query}, '%'))
or a.phone like CONCAT('%', CONCAT(#{record.query}, '%'))
or a.take_code like CONCAT('%', CONCAT(#{record.query}, '%'))
+ or b.goods_name like CONCAT('%', CONCAT(#{record.query}, '%'))
)
</if>
<if test="record.status == 4 and record.status != 0">
diff --git a/src/main/resources/templates/febs/views/modules/leader/addLeader.html b/src/main/resources/templates/febs/views/modules/leader/addLeader.html
index 2cf9004..f7484f1 100644
--- a/src/main/resources/templates/febs/views/modules/leader/addLeader.html
+++ b/src/main/resources/templates/febs/views/modules/leader/addLeader.html
@@ -46,14 +46,14 @@
<input type="text" name="uniqueCode" lay-verify="required" placeholder="" autocomplete="off" class="layui-input" readonly>
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label febs-form-item-require">收益率：</label>
- <div class="layui-input-block">
- <input type="text" name="bonusPercent"
- lay-verify="text" autocomplete="off" class="layui-input" >
- <div class="layui-form-mid layui-word-aux">请输入0到1之间的小数,团长收益百分比如0.15表示15%</div>
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label febs-form-item-require">收益率：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="bonusPercent"-->
+<!-- lay-verify="text" autocomplete="off" class="layui-input" >-->
+<!-- <div class="layui-form-mid layui-word-aux">请输入0到1之间的小数,团长收益百分比如0.15表示15%</div>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">自提点名称：</label>
<div class="layui-input-block">
diff --git a/src/main/resources/templates/febs/views/modules/leader/leaderList.html b/src/main/resources/templates/febs/views/modules/leader/leaderList.html
index 758748a..eaadad9 100644
--- a/src/main/resources/templates/febs/views/modules/leader/leaderList.html
+++ b/src/main/resources/templates/febs/views/modules/leader/leaderList.html
@@ -195,8 +195,8 @@
{field: 'detailAddress', title: '自提点地址', minWidth: 150,align:'left'},
{field: 'totalProfit', title: '收益', minWidth: 150,align:'left'},
{field: 'onlineState', title: '在线状态', templet: '#onlineStateSwitch', minWidth: 100,align:'center'},
- {field: 'profitSwitch', title: '是否返利', templet: '#profitSwitch', minWidth: 100,align:'center'},
- {field: 'bonusPercent', title: '返利比例', minWidth: 150,align:'left'},
+ // {field: 'profitSwitch', title: '是否返利', templet: '#profitSwitch', minWidth: 100,align:'center'},
+ // {field: 'bonusPercent', title: '返利比例', minWidth: 150,align:'left'},
// {field: 'phone', title: '电话', minWidth: 150,align:'left'},
{field: 'state', title: '状态',
templet: function (d) {
diff --git a/src/main/resources/templates/febs/views/modules/leader/leaderUpdate.html b/src/main/resources/templates/febs/views/modules/leader/leaderUpdate.html
index dcc9b30..b7c033b 100644
--- a/src/main/resources/templates/febs/views/modules/leader/leaderUpdate.html
+++ b/src/main/resources/templates/febs/views/modules/leader/leaderUpdate.html
@@ -44,14 +44,14 @@
<input type="text" name="phone" class="layui-input">
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label febs-form-item-require">收益率：</label>
- <div class="layui-input-block">
- <input type="text" name="bonusPercent"
- lay-verify="text" autocomplete="off" class="layui-input" >
- <div class="layui-form-mid layui-word-aux">请输入0到1之间的小数,团长收益百分比如0.15表示15%</div>
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label febs-form-item-require">收益率：</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input type="text" name="bonusPercent"-->
+<!-- lay-verify="text" autocomplete="off" class="layui-input" >-->
+<!-- <div class="layui-form-mid layui-word-aux">请输入0到1之间的小数,团长收益百分比如0.15表示15%</div>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">详细地址：</label>
<div class="layui-input-block">
@@ -219,7 +219,7 @@
"addressArea": leaderInfo.addressArea,
"detailAddress": leaderInfo.detailAddress,
"longitude": leaderInfo.longitude,
- "bonusPercent": leaderInfo.bonusPercent,
+ // "bonusPercent": leaderInfo.bonusPercent,
"latitude": leaderInfo.latitude
});
}
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 172a151..8ba4368 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -200,6 +200,7 @@
return;
}
window.location.href = ctx + "admin/order/exportOrderListOne?orderType=1&status=2&deliveryType=1&takeUniqueCode="+uniqueCodeValue;
+ $query.click();
}
if (event == 'exportDeliverTwo') {
--
Gitblit v1.9.1