Merge branch 'master' of http://gitea.yxtsoft.com/yxt_group/mallplus

mallplus-admin/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java

@@ -1,10 +1,12 @@
 package com.zscat.mallplus.oms.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zscat.mallplus.enums.OrderStatus;
 import com.zscat.mallplus.enums.StatusEnum;
 import com.zscat.mallplus.oms.entity.OmsOrder;
+import com.zscat.mallplus.oms.entity.OmsOrderItem;
 import com.zscat.mallplus.oms.entity.OmsOrderLocation;
 import com.zscat.mallplus.oms.entity.OmsOrderOperateHistory;
 import com.zscat.mallplus.oms.mapper.OmsOrderMapper;
@@ -401,7 +403,18 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         } else {
             orders = orderMapper.listExcel(qw.eq("omo.status", omsOrderQuery.getStatus()));
         }
-        return orders;
+        List<OrderExcelVo> list = new ArrayList<>();
+        for (OrderExcelVo orderExcelVo : orders){
+            List<OmsOrderItem> omsOrderItemList = baseMapper.selectOmsOrderItem(orderExcelVo.getOrderSn());
+            for (OmsOrderItem omsOrderItem : omsOrderItemList){
+                OrderExcelVo excelVo = new OrderExcelVo();
+                BeanUtil.copyProperties(orderExcelVo,excelVo);
+                excelVo.setGoodsName(omsOrderItem.getProductName());
+                excelVo.setProductQuantity(omsOrderItem.getProductQuantity().toString());
+                list.add(excelVo);
+            }
+        }
+        return list;
     }
 
     @Override
@@ -423,6 +436,17 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         } else {
             orders = orderMapper.listExcel(qw.eq("omo.status", omsOrderLocationQuery.getStatus()));
         }
-        return orders;
+        List<OrderExcelVo> list = new ArrayList<>();
+        for (OrderExcelVo orderExcelVo : orders){
+            List<OmsOrderItem> omsOrderItemList = baseMapper.selectOmsOrderItem(orderExcelVo.getOrderSn());
+            for (OmsOrderItem omsOrderItem : omsOrderItemList){
+                OrderExcelVo excelVo = new OrderExcelVo();
+                BeanUtil.copyProperties(orderExcelVo,excelVo);
+                excelVo.setGoodsName(omsOrderItem.getProductName());
+                excelVo.setProductQuantity(omsOrderItem.getProductQuantity().toString());
+                list.add(excelVo);
+            }
+        }
+        return list;
     }
 }

mallplus-mbg/src/main/java/com/zscat/mallplus/oms/mapper/OmsOrderMapper.java

@@ -91,4 +91,6 @@ public interface OmsOrderMapper extends BaseMapper<OmsOrder> {
     List<OmsOrderLocation> getPickupPoint(String id);
 
     List<OrderExcelVo> listExcel(@Param(Constants.WRAPPER) QueryWrapper<OmsOrder> qw);
+
+    List<OmsOrderItem> selectOmsOrderItem(String orderSn);
 }

mallplus-mbg/src/main/resources/mapper/oms/OmsOrderDao.xml

@@ -345,7 +345,7 @@
     </select>
 
     <select id="listExcel" resultType="com.zscat.mallplus.oms.vo.OrderExcelVo">
-        select omo.order_sn                orderSn,
+        select distinct omo.order_sn                orderSn,
                         omo.create_time             createTime,
                         omo.receiver_phone          receiverPhone,
                         omo.member_username         memberUsername,
@@ -367,12 +367,16 @@
                             when 16 then '无效订单'
                             when 17 then '已删除'
                             when 12 then '待付款'
-                   end as                  statusName,
-               ooi.product_quantity        productQuantity
+                            end as                  statusName
         from oms_order omo
-                 left join oms_order_item ooi on ooi.order_sn = omo.order_sn
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="selectOmsOrderItem" resultType="com.zscat.mallplus.oms.entity.OmsOrderItem">
+        select *
+        from oms_order_item
+        where order_sn = #{orderSn}
+    </select>
 </mapper>