查询展览纪念馆

src/main/java/com/atlgroupasia/servicecenter/controller/ApiOshServicesOrderController.java

@@ -68,7 +68,7 @@ public class ApiOshServicesOrderController {
             Date createTime = (Date) map.get("createTime");
             map.put("createTimeStamp", createTime.getTime());
             map.put("createTime", createTime.getTime());
-            Long id = (Long) map.get("id");
+            Long id = Long.valueOf( map.get("id")+"");
             OshServicesOrderItemVo itemVo = new OshServicesOrderItemVo();
             itemVo.setOrderId(id);
             List<Map<String, Object>> itemList = oshServicesOrderItemSerice.findList(itemVo);
@@ -111,7 +111,7 @@ public class ApiOshServicesOrderController {
                 }
             }
             if ("3".equals(status)) {
-                List<Map<String, Object>> videoList = oshServicesOrderSerice.videoAndImageList((Long) map.get("id"));
+                List<Map<String, Object>> videoList = oshServicesOrderSerice.videoAndImageList(Long.valueOf( map.get("id")+""));
                 for (Map<String, Object> item : videoList) {
                     List<String> imageList = Lists.newArrayList();
                     String imageUrls = item.get("imageUrls").toString();

src/main/java/com/atlgroupasia/servicecenter/dto/OshServicesOrderDTO.java

@@ -32,7 +32,6 @@ public class OshServicesOrderDTO implements Serializable {
     private String payWay;
     @ApiModelProperty(value = "下单人头像")
     private String pic;
-
     @ApiModelProperty(value = "订单item详情List")
     private List<OshServicesOrderItemDTO> oshServicesOrderItemDTOList;
 

src/main/java/com/atlgroupasia/servicecenter/service/OshServicesOrderSerice.java

@@ -465,7 +465,10 @@ public class OshServicesOrderSerice {
         List<OshServicesOrderDTO> oshServicesOrderDTOList = this.oshServicesOrderMapper.selectOrderListGroupByUserId(queryOrderRelationTimeParam);
         //记录下 pagehelper第一次分页查询的 返回得总条数 等信息
         PageInfo<OshServicesOrderDTO> pageInfo = new PageInfo<>(oshServicesOrderDTOList);
-
+        oshServicesOrderDTOList = oshServicesOrderDTOList.stream().map(item -> {
+            item.setOshServicesOrderItemDTOList(this.oshServicesOrderMapper.selectOrderItemListByOrderId(item.getId()));
+            return item;
+        }).collect(Collectors.toList());
         //因为进行了第二次查询 所以pageHelp得分页总数得到了变化 导致不准确 因此我们需要手动校准一下
         CommonPage<OshServicesOrderDTO> result = new CommonPage<OshServicesOrderDTO>();
         result.setTotalPage(pageInfo.getPages());

src/main/resources/mapper/OshServicesOrderMapper.xml

@@ -200,7 +200,7 @@
 
     <select id="selectOrderItemListByOrderId" parameterType="java.lang.Long" resultType="com.atlgroupasia.servicecenter.dto.OshServicesOrderItemDTO">
         select
-              a.id.a.name,a.num,aprice
+              a.id,a.name,a.num,a.price
         from  osh_services_order_item a
         where a.order_id = #{orderId}
     </select>
@@ -226,6 +226,7 @@
     <select id="selectOrderListGroupByUserId" parameterType="com.atlgroupasia.servicecenter.queryparam.QueryOrderRelationTimeParam" resultType="com.atlgroupasia.servicecenter.dto.OshServicesOrderDTO">
         select
               a.id,a.create_time createTime,a.status,a.remark,a.total_price totalPrice,a.pay_way payWay,a.pic,
+              a.nick_name nickName,
               IFNULL(count(*),0) times,IFNULL(sum(total_price),0) sumTotalPrice
         from osh_services_order a
         where a.relation_time_id =#{relationTimeId}