chunping 3 years ago
parent
commit
de546c57e7

+ 3 - 1
mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelOrderController.java

@@ -108,7 +108,9 @@ public class ChannelOrderController extends BaseApiController {
       channelOrderVO.setItems(channelOrderItemService.list(new LambdaQueryWrapper<ChannelOrderItem>()
           .eq(ChannelOrderItem::getOrderId, channelOrderVO.getOrderId())));
     }
-    return getDataTable(channelOrderVOList);
+    TableDataInfo rspData = getDataTable(channelOrders);
+    rspData.setRows(channelOrderVOList);
+    return rspData;
   }
 
   /**

+ 3 - 1
mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelTicketController.java

@@ -66,7 +66,9 @@ public class ChannelTicketController extends BaseApiController {
             .eq(null != param.getCategoryId() && 0 != param.getCategoryId(), TicketBox::getCategoryId, param.getCategoryId())
             .eq(TicketBox::getStatus, TicketBoxStatusEnum.PUT_ON));
     List<TicketBoxListVO> ticketBoxListVOList = mapperFacade.mapAsList(ticketBoxes, TicketBoxListVO.class);
-    return getDataTable(ticketBoxListVOList);
+    TableDataInfo rspData = getDataTable(ticketBoxes);
+    rspData.setRows(ticketBoxListVOList);
+    return rspData;
   }
 
 

+ 6 - 0
mp-service/src/main/java/com/qs/mp/channel/domain/ChannelOrderItem.java

@@ -61,6 +61,12 @@ public class ChannelOrderItem implements Serializable {
   @TableField("properties")
   private String properties;
 
+  /**
+   * 每包盲票张数
+   */
+  @TableField("pkg_unit")
+  private Integer pkgUnit;
+
   /**
    * 盲票面值
    */

+ 1 - 0
mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelOrderServiceImpl.java

@@ -78,6 +78,7 @@ public class ChannelOrderServiceImpl extends ServiceImpl<ChannelOrderMapper, Cha
       item.setPicUrl(ticketBox.getPicUrl());
       item.setBoxId(channelCartVO.getBoxId());
       item.setProperties(ticketBox.getProperties());
+      item.setPkgUnit(ticketBox.getPkgUnit());
       item.setFacePrice(ticketBox.getFacePrice());
       item.setOrderNum(channelCartVO.getOrderNum());
       item.setPkgSalePrice(ticketBox.getPkgSalePrice());

+ 2 - 1
mp-service/src/main/resources/mapper/channel/ChannelOrderItemMapper.xml

@@ -11,6 +11,7 @@
         <result column="pic_url" property="picUrl" />
         <result column="box_id" property="boxId" />
         <result column="properties" property="properties" />
+        <result column="pkg_unit" property="pkgUnit" />
         <result column="face_price" property="facePrice" />
         <result column="order_num" property="orderNum" />
         <result column="pkg_sale_price" property="pkgSalePrice" />
@@ -20,7 +21,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, order_id, channel_id, title, pic_url, box_id, properties, face_price, order_num, sale_price, created_time, updated_time
+        id, order_id, channel_id, title, pic_url, box_id, properties, pkg_unit, face_price, order_num, sale_price, created_time, updated_time
     </sql>
 
 </mapper>