From a8bcdde0446f61fb41589a6238cf5699122fcc34 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Jul 2021 15:14:17 +0800
Subject: [PATCH] 20210707
---
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 1 +
gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderItemsMapper.java | 7 +++++++
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 7 +++++++
gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml | 8 ++++++++
gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java | 6 ++++++
gc-user/src/main/resources/mapper/user/OrderMapper.xml | 4 ++++
6 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderItemsMapper.java b/gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderItemsMapper.java
index 4013dbe..33037ac 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderItemsMapper.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderItemsMapper.java
@@ -1,7 +1,14 @@
package com.xzx.gc.shop.mapper;
import com.xzx.gc.entity.JhyOrderItems;
+import com.xzx.gc.shop.vo.JhyOrderItemsVo;
import com.xzx.gc.util.GcMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
public interface JhyOrderItemsMapper extends GcMapper<JhyOrderItems> {
+
+ List<JhyOrderItemsVo> selectByOrderId(@Param("orderId")Long id);
+
}
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 f7dafef..a27445d 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
@@ -45,6 +45,13 @@
model.setAccount(name);
model.setAccountPhone(accountPhone);
List<QueryJhyOrderListVo> maps = jhyOrderMapper.queryOrderList(model);
+ if(CollUtil.isNotEmpty(maps)){
+ for(QueryJhyOrderListVo queryJhyOrderListVo : maps){
+ Long id = queryJhyOrderListVo.getId();
+ List<JhyOrderItemsVo> jhyOrderItemsVos = jhyOrderItemsMapper.selectByOrderId(id);
+ queryJhyOrderListVo.setJhyOrderItemsVos(jhyOrderItemsVos);
+ }
+ }
// if(CollUtil.isNotEmpty(maps)){
// for(QueryJhyOrderListVo queryJhyOrderListVo : maps){
// String decode = StringUtils.decode(queryJhyOrderListVo.getName());
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 db16d16..05d43d3 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
@@ -5,6 +5,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
@Data
@ApiModel(value = "QueryJhyOrderListVo", description = "返回")
@@ -17,6 +18,8 @@
private String name;
@ApiModelProperty(value="手机号")
private String mobilePhone;
+ @ApiModelProperty(value="集物员手机号")
+ private String jhyMobilePhone;
@ApiModelProperty(value="区域地址")
private String area;
@ApiModelProperty(value="详细地址")
@@ -36,4 +39,7 @@
@ApiModelProperty(value="备注")
private String remark;
+ @ApiModelProperty(value="备注")
+ private List<JhyOrderItemsVo> jhyOrderItemsVos;
+
}
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml
index 4bd86f6..b2a13fc 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml
@@ -2,5 +2,13 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xzx.gc.shop.mapper.JhyOrderItemsMapper">
+ <select id="selectByOrderId" resultType="com.xzx.gc.shop.vo.JhyOrderItemsVo">
+ SELECT
+ *
+ FROM
+ xzx_jhy_order_items a
+ WHERE a.order_id=#{orderId}
+ </select>
+
</mapper>
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index 1dd0fa0..6c58953 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -14,6 +14,7 @@
a.remark remark,
a.username name,
b.mobile_phone mobilePhone,
+ d.mobile jhyMobilePhone,
(select ifnull(sum(score),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
diff --git a/gc-user/src/main/resources/mapper/user/OrderMapper.xml b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
index 5db6cb8..49052a2 100644
--- a/gc-user/src/main/resources/mapper/user/OrderMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
@@ -211,6 +211,7 @@
LEFT JOIN xzx_user_info e ON e.user_id = a.receiver
WHERE
a.create_user_id=#{userId}
+ and a.order_status in (4,5,7)
GROUP BY
a.order_id
)
@@ -231,6 +232,7 @@
LEFT JOIN xzx_jhy_order_items d ON a.id = d.order_id
WHERE
a.user_id = #{userId}
+ and a.status = 3
GROUP BY
a.id
)
@@ -409,6 +411,7 @@
LEFT JOIN xzx_user_info e ON e.user_id = a.receiver
WHERE
a.create_user_id = #{userId}
+ and a.order_status in (4,5,7)
GROUP BY
a.order_id
)
@@ -429,6 +432,7 @@
LEFT JOIN xzx_jhy_order_items d ON a.id = d.order_id
WHERE
a.user_id = #{userId}
+ and a.status = 3
GROUP BY
a.id
)
--
Gitblit v1.9.1