From c772a1d7194910153e1eb3c678880c1b2226c319 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Jul 2021 17:09:50 +0800
Subject: [PATCH] 20210707

---
 gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderItemsMapper.java |    1 
 gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java         |   15 +------
 gc-user/src/main/java/com/xzx/gc/user/vo/CategaryVo.java              |    8 ++++
 gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java         |    3 +
 gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml        |   11 +++++
 gc-user/src/main/java/com/xzx/gc/user/service/UserService.java        |   12 +++++
 gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java     |    2 
 gc-user/src/main/resources/mapper/user/OrderMapper.xml                |   22 ++++++++++
 gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java         |    6 +++
 9 files changed, 65 insertions(+), 15 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 33037ac..cdc0b6b 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
@@ -11,4 +11,5 @@
 
     List<JhyOrderItemsVo> selectByOrderId(@Param("orderId")Long id);
 
+    List<JhyOrderItemsVo> selectJhyOrderItemListByOrderId(@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 a27445d..dcf4277 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
@@ -74,24 +74,15 @@
         String decode = StringUtils.decode(viewJhyOrderVo.getNickName());
         viewJhyOrderVo.setNickName(decode);
 
-        Example exampleItems = new Example(JhyOrderItems.class);
-        Example.Criteria criteriaItems = exampleItems.createCriteria();
-        criteriaItems.andEqualTo("orderId",id);
-        ArrayList<JhyOrderItemsVo> jhyOrderItemsVolist = new ArrayList<>();
-        List<JhyOrderItems> jhyOrderItemsList = jhyOrderItemsMapper.selectByExample(exampleItems);
+        List<JhyOrderItemsVo> jhyOrderItemsList = jhyOrderItemsMapper.selectJhyOrderItemListByOrderId(id);
         if(CollUtil.isNotEmpty(jhyOrderItemsList)){
-            for(JhyOrderItems jhyOrderItems : jhyOrderItemsList){
-                JhyOrderItemsVo jhyOrderItemsVo = BeanUtil.copyProperties(jhyOrderItems, JhyOrderItemsVo.class);
+            for(JhyOrderItemsVo jhyOrderItemsVo : jhyOrderItemsList){
                 BigDecimal multiply = jhyOrderItemsVo.getPrice().multiply(new BigDecimal(40));
-//                BigDecimal multiplyScore = jhyOrderItemsVo.getPrice()
-//                        .multiply(jhyOrderItemsVo.getWeight()==null?BigDecimal.ZERO :jhyOrderItemsVo.getWeight())
-//                        .multiply(new BigDecimal(40));
                 jhyOrderItemsVo.setPrice(multiply);
                 jhyOrderItemsVo.setAllPrice(new BigDecimal(StrUtil.isEmpty(jhyOrderItemsVo.getScore())?"0":jhyOrderItemsVo.getScore()).setScale( 2, BigDecimal.ROUND_DOWN ));
-                jhyOrderItemsVolist.add(jhyOrderItemsVo);
             }
         }
-        viewJhyOrderVo.setJhyOrderItems(jhyOrderItemsVolist);
+        viewJhyOrderVo.setJhyOrderItems(jhyOrderItemsList);
 
         return viewJhyOrderVo;
     }
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java
index 5c1ebb8..f48ec66 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/JhyOrderItemsVo.java
@@ -33,6 +33,9 @@
     @ApiModelProperty(value="积分")
     private String score;
 
+    @ApiModelProperty(value="台数")
+    private String recycleTai;
+
     @ApiModelProperty(value="类型")
     private Long itemType;
 }
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 05d43d3..bb8660d 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
@@ -39,7 +39,7 @@
     @ApiModelProperty(value="备注")
     private String remark;
 
-    @ApiModelProperty(value="备注")
+    @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 b2a13fc..422caad 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml
@@ -10,5 +10,16 @@
         WHERE a.order_id=#{orderId}
     </select>
 
+    <select id="selectJhyOrderItemListByOrderId" resultType="com.xzx.gc.shop.vo.JhyOrderItemsVo">
+        SELECT
+            a.*
+             ,IFNULL(case when d.item_unit = '台' then a.weight
+                          else 0 end, 0) recycleTai
+        FROM
+            xzx_jhy_order_items a
+                left join xzx_sys_environmental_info d on a.item_type = d.id
+        WHERE a.order_id=#{orderId}
+    </select>
+
 
 </mapper>
diff --git a/gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java b/gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java
index c972db9..de5a947 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java
@@ -1,11 +1,13 @@
 package com.xzx.gc.user.mapper;
 
 import com.xzx.gc.entity.JhyOrder;
+import com.xzx.gc.entity.JhyOrderItems;
 import com.xzx.gc.entity.OrderInfo;
 import com.xzx.gc.entity.OrderItemInfo;
 import com.xzx.gc.model.admin.PromoterModel;
 import com.xzx.gc.model.admin.XzxCityPartnerModel;
 import com.xzx.gc.model.order.OrderInfoVo;
+import com.xzx.gc.user.vo.CategaryVo;
 import com.xzx.gc.util.GcMapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -60,5 +62,9 @@
     List<JhyOrder> selectJhyOrderByUserId(@Param("userId")String userId);
 
     List<OrderInfo> selectOrderByUserId(String userId, int i);
+
+    List<CategaryVo> selectListByOrderId(String orderId);
+
+    List<CategaryVo> selectJHYListByOrderId(String orderId);
 }
 
diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/UserService.java b/gc-user/src/main/java/com/xzx/gc/user/service/UserService.java
index b172628..4a13f5f 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/service/UserService.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/service/UserService.java
@@ -24,6 +24,7 @@
 import com.xzx.gc.user.dto.AddressDto;
 import com.xzx.gc.user.dto.RayaltyDto;
 import com.xzx.gc.user.mapper.*;
+import com.xzx.gc.user.vo.CategaryVo;
 import com.xzx.gc.util.DoubleUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
@@ -862,9 +863,18 @@
             map.put("money", DoubleUtil.roundTwo(String.valueOf(map.get("money"))));
             map.put("score", DoubleUtil.roundTwo(String.valueOf(map.get("score"))));
             map.put("weight", DoubleUtil.roundThree(String.valueOf(map.get("weight"))));
-
             map.put("name", String.valueOf((ObjectUtil.isEmpty(map.get("name"))?"-":m.get("name"))));
             map.put("createtime", String.valueOf(map.get("createTime")));
+
+            String type = String.valueOf(map.get("type"));
+            if("1".equals(type)){
+                List<CategaryVo> categaryVos = orderMapper.selectListByOrderId(String.valueOf(map.get("orderId")));
+                map.put("categary",categaryVos);
+            }
+            if("2".equals(type)){
+                List<CategaryVo> categaryVos = orderMapper.selectJHYListByOrderId(String.valueOf(map.get("orderId")));
+                map.put("categary",categaryVos);
+            }
         }
         m.put("orderList", odlist);
         m.put("count", pageInfo.getTotal());
diff --git a/gc-user/src/main/java/com/xzx/gc/user/vo/CategaryVo.java b/gc-user/src/main/java/com/xzx/gc/user/vo/CategaryVo.java
new file mode 100644
index 0000000..d2bbfc4
--- /dev/null
+++ b/gc-user/src/main/java/com/xzx/gc/user/vo/CategaryVo.java
@@ -0,0 +1,8 @@
+package com.xzx.gc.user.vo;
+
+import lombok.Data;
+
+@Data
+public class CategaryVo {
+    private String title;
+}
diff --git a/gc-user/src/main/resources/mapper/user/OrderMapper.xml b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
index 49052a2..76dbbc7 100644
--- a/gc-user/src/main/resources/mapper/user/OrderMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/OrderMapper.xml
@@ -418,7 +418,7 @@
                 UNION
                 (
                     SELECT
-                        a.id orderId,
+                        a.order_no orderId,
                         a. STATUS STATUS,
                         '2' type,
                         '0' money,
@@ -588,4 +588,24 @@
             a.order_status != '6'
             and a.create_user_id = #{userId}
     </select>
+
+    <select id="selectListByOrderId" resultType="com.xzx.gc.user.vo.CategaryVo">
+        SELECT
+            b.title
+        FROM
+            xzx_order_item_info a
+                LEFT JOIN xzx_sys_environmental_info b ON a.item_type = b.item_type
+        where  a.order_id = #{orderId}
+          and a.weight >0
+        GROUP BY a.item_type
+    </select>
+
+    <select id="selectJHYListByOrderId" resultType="com.xzx.gc.user.vo.CategaryVo">
+        SELECT
+            a.title title
+        FROM
+            xzx_jhy_order_items a
+        WHERE
+          and a.order_no = #{orderId}
+    </select>
 </mapper>

--
Gitblit v1.9.1