From 866da0eb49d74ad53440a52b19caf7c2aceb8aa9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Jun 2021 10:54:53 +0800
Subject: [PATCH] 20210628 集物员审核
---
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 1 +
gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java | 2 ++
gc-user/src/main/resources/mapper/user/JhyInfoMapper.xml | 2 +-
3 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
index b9c1aeb..8259788 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java
@@ -27,6 +27,8 @@
private String reserveTime;
@ApiModelProperty(value="订单总金额")
private BigDecimal totalPrice;
+ @ApiModelProperty(value="总重")
+ private BigDecimal totalWeight;
@ApiModelProperty(value="状态 1-待接单2-服务中3-已收款4-待入库5-已完成6-已取消")
private Integer status;
@ApiModelProperty(value="集物员")
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index b1ff9e4..10bf81e 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -15,6 +15,7 @@
b.nick_name name,
b.mobile_phone mobilePhone,
(select ifnull(sum(price*weight*40),0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
+ (select ifnull(sum(weight),0) from xzx_jhy_order_items where order_id = a.id) totalWeight,
d.username username
FROM
xzx_jhy_order a
diff --git a/gc-user/src/main/resources/mapper/user/JhyInfoMapper.xml b/gc-user/src/main/resources/mapper/user/JhyInfoMapper.xml
index de9f4f6..c94ed1e 100644
--- a/gc-user/src/main/resources/mapper/user/JhyInfoMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/JhyInfoMapper.xml
@@ -24,7 +24,7 @@
1=1
<if test="record.name != null and record.name != ''">
and (username like concat('%',#{record.name},'%')
- or phone like concat('%',#{record.phone},'%') )
+ or mobile like concat('%',#{record.name},'%') )
</if>
<if test="record.isJhy != null and record.isJhy != ''">
and is_jhy=#{record.isJhy}
--
Gitblit v1.9.1