Commit 1bf5b79d authored by knight's avatar knight

需求 客户端-订单详情的包裹Tag

parent c2cd6e73
......@@ -22,5 +22,7 @@ public interface ConsAppMapper extends AbstractMapper<ConsDO> {
ConsBackVO selectInfoById(Long id);
List<ConsBackVO> selectAppPage(@Param("start") int start, @Param("size") int size, @Param("query") ConsQueryVO query);
List<ConsBackVO> selectListByQuery(@Param("query") ConsQueryVO query);
}
......@@ -68,6 +68,8 @@ public interface ConsService extends IService<ConsDO> {
*/
ConsBackVO getConsInfo(Long id);
List<ConsBackVO> getConsListByQuery(ConsQueryVO query);
ConsBackVO getConsById(Long id);
/**
......
......@@ -390,6 +390,11 @@ public class ConsServiceImpl extends AbstractService<ConsMapper, ConsDO> impleme
return consAppMapper.selectInfoById(id);
}
@Override
public List<ConsBackVO> getConsListByQuery(ConsQueryVO query) {
return consAppMapper.selectListByQuery(query);
}
@Override
public PageResult<ConsBackVO> getMyConsPage(ConsQueryVO query, PageVO pageVO) {
// 设置当前语言
......
......@@ -245,6 +245,44 @@
LIMIT #{start}, #{size}
</select>
<resultMap id="consListResultMap" type="cn.iocoder.yudao.module.order.vo.cons.ConsBackVO">
<id property="id" column="id"/>
<result property="expressNo" column="express_no"/>
<result property="signedTime" column="signed_time"/>
<result property="orderId" column="order_id"/>
<!-- 获取包裹明细 -->
<collection property="consItem" ofType="cn.iocoder.yudao.module.order.vo.consItem.ConsItemBaseVO" >
<id property="id" column="cons_item_id" />
<result property="prodId" column="prod_id"/>
<result property="quantity" column="quantity"/>
<!-- 获取商品名称 -->
<association property="product" javaType="cn.iocoder.yudao.module.product.vo.product.ProductBaseVO">
<id property="id" column="product_id" />
<result property="titleZh" column="title_zh"/>
<result property="titleEn" column="title_en"/>
<result property="titleFr" column="title_fr"/>
</association>
</collection>
</resultMap>
<select id="selectListByQuery" parameterType="cn.iocoder.yudao.module.order.vo.cons.ConsQueryVO" resultMap="consListResultMap">
SELECT c.id,
c.express_no,
c.signed_time,
c.order_id,
ci.id as cons_item_id,
ci.prod_id,
ci.quantity,
p.id as product_id,
p.title_zh,
p.title_en,
p.title_fr
FROM ecw_cons as c
LEFT JOIN ecw_cons_item as ci ON ci.cons_id = c.id AND ci.deleted = 0
LEFT JOIN ecw_product as p ON p.id = ci.prod_id AND p.deleted = 0
WHERE c.deleted = 0 AND c.order_id = #{query.orderId}
</select>
<sql id="consQuery">
<!-- 根据包裹状态查询 -->
<if test="query.status != null" >
......
......@@ -100,4 +100,11 @@ public class AppConsController {
return success(myConsPage);
}
@GetMapping("/list")
@ApiOperation("获取集运包裹列表")
public CommonResult<List<ConsBackVO>> getConsList(ConsQueryVO query){
List<ConsBackVO> list = consService.getConsListByQuery(query);
return success(list);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment