oneos-v5/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- 添加 退货订单列表

Browse Source
This commit is contained in:
sin
2019-05-06 23:25:00 +08:00
parent a454ef415f
commit 2890af6311
11 changed files with 370 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/convert/OrderReturnConvert.java
View File

@@ -1,6 +1,7 @@
package cn.iocoder.mall.order.biz.convert;
import cn.iocoder.mall.order.api.bo.OrderReturnInfoBO;
import cn.iocoder.mall.order.api.bo.OrderReturnListBO;
import cn.iocoder.mall.order.api.dto.OrderReturnApplyDTO;
import cn.iocoder.mall.order.api.dto.OrderReturnCreateDTO;
import cn.iocoder.mall.order.biz.dataobject.OrderItemDO;
@@ -33,4 +34,7 @@ public interface OrderReturnConvert {
@Mappings({})
List<OrderReturnInfoBO.OrderItem> convert(List<OrderItemDO> orderItemDOList);
@Mappings({})
List<OrderReturnListBO.OrderReturn> convertListBO(List<OrderReturnDO> orderReturnDOList);
}

19
order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/dao/OrderReturnMapper.java
View File

@@ -1,9 +1,12 @@
package cn.iocoder.mall.order.biz.dao;
import cn.iocoder.mall.order.api.dto.OrderReturnQueryDTO;
import cn.iocoder.mall.order.biz.dataobject.OrderReturnDO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* 订单退货 mapper
*
@@ -38,4 +41,20 @@ public interface OrderReturnMapper {
OrderReturnDO selectByOrderId(
@Param("orderId") Integer orderId
);
/**
* 列表查询 - queryDTO
*
* @param queryDTO
* @return
*/
int selectListCount(OrderReturnQueryDTO queryDTO);
/**
* 列表查询 - queryDTO
*
* @param queryDTO
* @return
*/
List<OrderReturnDO> selectList(OrderReturnQueryDTO queryDTO);
}

28
order/order-service-impl/src/main/java/cn/iocoder/mall/order/biz/service/OrderReturnServiceImpl.java
View File

@@ -7,9 +7,11 @@ import cn.iocoder.mall.order.api.OrderLogisticsService;
import cn.iocoder.mall.order.api.OrderReturnService;
import cn.iocoder.mall.order.api.bo.OrderLastLogisticsInfoBO;
import cn.iocoder.mall.order.api.bo.OrderReturnInfoBO;
import cn.iocoder.mall.order.api.bo.OrderReturnListBO;
import cn.iocoder.mall.order.api.constant.OrderErrorCodeEnum;
import cn.iocoder.mall.order.api.constant.OrderReturnStatusEnum;
import cn.iocoder.mall.order.api.dto.OrderReturnApplyDTO;
import cn.iocoder.mall.order.api.dto.OrderReturnQueryDTO;
import cn.iocoder.mall.order.biz.convert.OrderReturnConvert;
import cn.iocoder.mall.order.biz.dao.OrderItemMapper;
import cn.iocoder.mall.order.biz.dao.OrderMapper;
@@ -22,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@@ -112,4 +115,29 @@ public class OrderReturnServiceImpl implements OrderReturnService {
return CommonResult.success(orderReturnInfoBO);
}
@Override
public CommonResult<OrderReturnListBO> orderReturnList(OrderReturnQueryDTO queryDTO) {
int totalCount = orderReturnMapper.selectListCount(queryDTO);
if (totalCount <= 0) {
return CommonResult.success(
new OrderReturnListBO()
.setData(Collections.EMPTY_LIST)
.setIndex(queryDTO.getIndex())
.setPageSize(queryDTO.getPageSize())
.setTotalCount(0)
);
}
List<OrderReturnDO> orderReturnDOList = orderReturnMapper.selectList(queryDTO);
List<OrderReturnListBO.OrderReturn> orderReturnListBOList
= OrderReturnConvert.INSTANCE.convertListBO(orderReturnDOList);
return CommonResult.success(
new OrderReturnListBO()
.setData(orderReturnListBOList)
.setIndex(queryDTO.getIndex())
.setPageSize(queryDTO.getPageSize())
.setTotalCount(totalCount)
);
}
}

40
order/order-service-impl/src/main/resources/mapper/OrderReturnMapper.xml
View File

@@ -105,4 +105,44 @@
LIMIT 1
</select>
<!--
列表查询 - where
-->
<sql id="selectListWhere">
<if test="orderId != null">
AND order_id = #{orderId}
</if>
<if test="orderId != null">
AND order_no = #{orderNo}
</if>
<if test="startCreateTime != null and endCreateTime != null">
AND create_time &gt;= #{startCreateTime}
AND create_time &lt;= #{endCreateTime}
</if>
</sql>
<!--
列表查询 - count
-->
<select id="selectListCount" resultType="java.lang.Integer">
SELECT
COUNT(*)
FROM `order_return`
WHERE 1 = 1
<include refid="selectListWhere" />
</select>
<!--
列表查询 - queryDTO
-->
<select id="selectList" resultType="cn.iocoder.mall.order.biz.dataobject.OrderReturnDO">
SELECT
<include refid="FIELDS"/>
FROM `order_return`
WHERE 1 = 1
<include refid="selectListWhere" />
<bind name="limitIndex" value="pageSize * (index - 1)"/>
LIMIT #{limitIndex}, #{pageSize}
</select>
</mapper>