RentalOrders(update)

src/main/java/com/mmc/oms/controller/RentalOrdersController.java

@@ -3,6 +3,7 @@ package com.mmc.oms.controller;
 import com.mmc.oms.common.publicinterface.Send;
 import com.mmc.oms.common.result.ResultBody;
 import com.mmc.oms.model.dto.order.OrderInfoDTO;
+import com.mmc.oms.model.dto.order.OrderVcuDTO;
 import com.mmc.oms.model.dto.transtatus.TranStatusDicDTO;
 import com.mmc.oms.model.qo.OrderInfoQO;
 import com.mmc.oms.model.vo.order.LeaseOrderVO;
@@ -70,6 +71,14 @@ public class RentalOrdersController extends BaseController {
     }
 
 
+    @ApiOperation(value = "web/小程序——订单详情相关图片信息")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = OrderVcuDTO.class)})
+    @GetMapping("orderImageDetail")
+    public ResultBody<OrderVcuDTO> orderImageDetail(
+            @ApiParam(value = "订单id") @RequestParam(required = true) String orderInfoId) {
+        return rentalOrdersService.orderImageDetail(orderInfoId);
+    }
+
     @ApiOperation(value = "小程序————订单分页列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = OrderInfoDTO.class)})
     @PostMapping("listPageWechatOrder")

src/main/java/com/mmc/oms/dao/RentalOrdersDao.java

@@ -61,4 +61,6 @@ public interface RentalOrdersDao {
     List<TranStatusDicDO> listTranStatus();
 
     List<OrderInfoDO> listPcOrderInfoRental(OrderInfoQO param);
+
+    List<OrderVcuDO> orderImageDetail(String orderInfoId);
 }

src/main/java/com/mmc/oms/service/Impl/RentalOrdersServiceImpl.java

@@ -18,10 +18,7 @@ import com.mmc.oms.entity.order.OrderReceiptDO;
 import com.mmc.oms.entity.order.OrderRefundDO;
 import com.mmc.oms.entity.order.OrderVcuDO;
 import com.mmc.oms.entity.ware.WareInfoDO;
-import com.mmc.oms.model.dto.order.OrderInfoDTO;
-import com.mmc.oms.model.dto.order.OrderReceiptDTO;
-import com.mmc.oms.model.dto.order.OrderRefundDTO;
-import com.mmc.oms.model.dto.order.SkuOrderDTO;
+import com.mmc.oms.model.dto.order.*;
 import com.mmc.oms.model.dto.repo.RepoAccountDTO;
 import com.mmc.oms.model.dto.transtatus.TranStatusDicDTO;
 import com.mmc.oms.model.dto.user.BaseAccountDTO;
@@ -305,6 +302,15 @@ public class RentalOrdersServiceImpl implements RentalOrdersService {
     }
 
     @Override
+    public ResultBody orderImageDetail(String orderInfoId) {
+        List<OrderVcuDO> orderVcuDOS = rentalOrdersDao.orderImageDetail(orderInfoId);
+        List<OrderVcuDTO> collect = orderVcuDOS.stream().map(t -> {
+            return t.buildOrderVcuDTO();
+        }).collect(Collectors.toList());
+        return ResultBody.success(collect);
+    }
+
+    @Override
     public PageResult listPcOrderInfo(OrderInfoQO param, BaseAccountDTO cuser) {
 
         Integer count = rentalOrdersDao.countPcOrderInfo(param);

src/main/java/com/mmc/oms/service/RentalOrdersService.java

@@ -19,6 +19,8 @@ public interface RentalOrdersService {
 
     ResultBody getOrderDetail(String orderNo);
 
+    ResultBody orderImageDetail(String orderInfoId);
+
     ResultBody feignAddLease(BaseAccountDTO user, LeaseOrderVO param);
 
     PageResult listPcOrderInfo(OrderInfoQO param, BaseAccountDTO cuser);

src/main/resources/mapper/RentalOrdersDao.xml

@@ -396,6 +396,21 @@
         order by o.create_time DESC
         limit #{pageNo},#{pageSize}
     </select>
+
+    <select id="orderImageDetail" resultType="com.mmc.oms.entity.order.OrderVcuDO">
+        SELECT id,
+               order_info_id   AS orderInfoId,
+               order_refund_id AS orderRefundId,
+               vcu_type        AS vcuType,
+               vcu_satus       AS vcuSatus,
+               imgs,
+               video_url       AS videoUrl,
+               remark,
+               create_time     AS createTime
+        FROM order_vcu
+        WHERE order_info_id = #{orderInfoId}
+    </select>
+
     <select id="countPageOrderInfo" resultType="java.lang.Integer" parameterType="com.mmc.oms.model.qo.OrderInfoQO">
         select count(*)
         from order_info o