other_project/mallplus
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
guoxing
2023-03-27 18:25:28 +08:00
parent f2a3c1daf9 9a50926aa2
commit 4eb257bc2a
3 changed files with 57 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}
}

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

@@ -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);
}

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

@@ -345,34 +345,38 @@
</select>
<select id="listExcel" resultType="com.zscat.mallplus.oms.vo.OrderExcelVo">
select omo.order_sn orderSn,
omo.create_time createTime,
omo.receiver_phone receiverPhone,
omo.member_username memberUsername,
omo.goods_name goodsName,
omo.total_amount totalAmount,
omo.receiver_detail_address receiverDetailAddress,
case omo.status
when 1 then '支付成功，没有回调'
when 2 then '待发货'
when 3 then '待收货'
when 4 then '待评价'
when 5 then '已完成'
when 6 then '维权中'
when 7 then '维权已完成'
when 8 then '待分享'
when 13 then '申请退款'
when 14 then '已退款'
when 15 then '已关闭'
when 16 then '无效订单'
when 17 then '已删除'
when 12 then '待付款'
end as statusName,
ooi.product_quantity productQuantity
select distinct omo.order_sn orderSn,
omo.create_time createTime,
omo.receiver_phone receiverPhone,
omo.member_username memberUsername,
omo.goods_name goodsName,
omo.total_amount totalAmount,
omo.receiver_detail_address receiverDetailAddress,
case omo.status
when 1 then '支付成功，没有回调'
when 2 then '待发货'
when 3 then '待收货'
when 4 then '待评价'
when 5 then '已完成'
when 6 then '维权中'
when 7 then '维权已完成'
when 8 then '待分享'
when 13 then '申请退款'
when 14 then '已退款'
when 15 then '已关闭'
when 16 then '无效订单'
when 17 then '已删除'
when 12 then '待付款'
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>