From 13f17e5f0f2bc304dbfbfd62e31786fd5ec26dd9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Jun 2021 10:38:35 +0800
Subject: [PATCH] 20210628 集物员审核
---
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 2 +-
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 5 +++++
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 2 +-
gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java | 3 +++
gc-user/src/main/resources/mapper/user/JhyInfoMapper.xml | 3 ++-
5 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java b/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java
index 1023b43..8ad8d67 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/dto/QueryJhyOrderListDto.java
@@ -15,6 +15,9 @@
@ApiModelProperty(value="联系人/手机号")
private String account;
+ @ApiModelProperty(value="手机号")
+ private String accountPhone;
+
@ApiModelProperty(value="状态 1-待接单2-服务中3-已收款4-待入库5-已完成6-已取消")
private Integer status;
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
index 858f0ce..e073a68 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
@@ -3,6 +3,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.xzx.gc.common.utils.StringUtils;
@@ -36,6 +37,10 @@
public Map<String, Object> queryOrderList(QueryJhyOrderListDto model) {
PageHelper.startPage(model.getPage(), model.getLimit());
+ String accountPhone = model.getAccount();
+ String name = StrUtil.isEmpty(model.getAccount())?model.getAccount():StringUtils.encode(model.getAccount());
+ model.setAccount(name);
+ model.setAccountPhone(accountPhone);
List<QueryJhyOrderListVo> maps = jhyOrderMapper.queryOrderList(model);
if(CollUtil.isNotEmpty(maps)){
for(QueryJhyOrderListVo queryJhyOrderListVo : maps){
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
index 022caf0..1ecd9e8 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java
@@ -61,7 +61,7 @@
private IdUtils idUtils;
public Map<String, Object> queryOrderList(QueryOrderListDto model) {
- String name = model.getName();
+ String name = StrUtil.isEmpty(model.getName())?model.getName():StringUtils.encode(model.getName());
String orderNo = model.getOrderNo();
Integer status = model.getStatus() == null ? 0 : model.getStatus();
Date createdTimeStart = model.getCreatedTimeStart();
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index 11e51cc..b1ff9e4 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -29,7 +29,7 @@
</if>
<if test="record.account != null and record.account != ''">
and ( b.nick_name like concat('%',#{record.account},'%')
- or b.mobile_phone like concat('%',#{record.account},'%') )
+ or b.mobile_phone like concat('%',#{record.accountPhone},'%') )
</if>
<if test="record.reserveTimeStart != null">
and a.reserve_time >= #{record.reserveTimeStart}
diff --git a/gc-user/src/main/resources/mapper/user/JhyInfoMapper.xml b/gc-user/src/main/resources/mapper/user/JhyInfoMapper.xml
index 43c85d5..de9f4f6 100644
--- a/gc-user/src/main/resources/mapper/user/JhyInfoMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/JhyInfoMapper.xml
@@ -23,7 +23,8 @@
<where>
1=1
<if test="record.name != null and record.name != ''">
- and (username like CONCAT(CONCAT(#{record.name}, '%'), '%') or phone=#{record.phone})
+ and (username like concat('%',#{record.name},'%')
+ or phone like concat('%',#{record.phone},'%') )
</if>
<if test="record.isJhy != null and record.isJhy != ''">
and is_jhy=#{record.isJhy}
--
Gitblit v1.9.1