From bca1629b96a41a4f669663eda6a881a6eca403ff Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Thu, 08 Jul 2021 16:14:31 +0800 Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop --- gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 1 gc-shop/src/main/java/com/xzx/gc/shop/mapper/JhyOrderItemsMapper.java | 8 ++ gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 22 +++---- 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 | 6 ++ gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml | 21 +++++++ gc-user/src/main/java/com/xzx/gc/user/service/UserService.java | 14 ++++ gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryJhyOrderListVo.java | 6 ++ gc-user/src/main/resources/mapper/user/OrderMapper.xml | 35 ++++++++++- gc-user/src/main/java/com/xzx/gc/user/mapper/OrderMapper.java | 6 ++ 10 files changed, 108 insertions(+), 19 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..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 @@ -1,7 +1,15 @@ 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); + + 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 92a0721..f2bdae2 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 @@ -55,6 +55,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()); @@ -77,24 +84,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..cfaf04e 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,12 @@ @ApiModelProperty(value="积分") private String score; + @ApiModelProperty(value="台数") + private String recycleTai; + + @ApiModelProperty(value="KG数") + private String recycleKg; + @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 db16d16..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 @@ -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..6a075a8 100644 --- a/gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml +++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderItemsMapper.xml @@ -2,5 +2,26 @@ <!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> + + <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 + ,IFNULL(case when d.item_unit = 'kg' then a.weight + else 0 end, 0) recycleKg + 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-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml index aff9f1e..c9d3c40 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/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..b783a35 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("name", String.valueOf((ObjectUtil.isEmpty(map.get("name"))?"-":map.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 5db6cb8..b141ed5 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 ) @@ -399,9 +401,9 @@ '1' type, ifnull(sum(d.money), 0) money, '0' score, - a.address address, + CONCAT(a.address_area, a.address) address, ifnull(sum(d.weight), 0) weight, - e.NAME NAME, + e.NAME name, a.create_time createTime FROM xzx_order_info a @@ -409,26 +411,29 @@ 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 ) UNION ( SELECT - a.id orderId, + a.order_no orderId, a. STATUS STATUS, '2' type, '0' money, ifnull(sum(d.score), 0) score, - a.address address, + CONCAT(a.area, a.address) address, ifnull(sum(d.weight), 0) weight, - a.username NAME, + e.username name, a.CREATED_TIME createTime FROM xzx_jhy_order a LEFT JOIN xzx_jhy_order_items d ON a.id = d.order_id + LEFT JOIN xzx_jhy_info e ON a.jhy_id = e.user_id WHERE a.user_id = #{userId} + and a.status = 3 GROUP BY a.id ) @@ -584,4 +589,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 a.order_id = (select b.id from xzx_jhy_order b where b.order_no = #{orderId}) + </select> </mapper> -- Gitblit v1.9.1