查询经销商订单盲票组列表接口更新

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/ChannelOrderMgrController.java

@@ -14,6 +14,7 @@ import com.qs.mp.admin.service.ITicketPackageService;
 import com.qs.mp.channel.domain.ChannelOrder;
 import com.qs.mp.channel.domain.ChannelOrderDetail;
 import com.qs.mp.channel.domain.ChannelOrderItem;
+import com.qs.mp.channel.domain.vo.ChannelOrderItemVO;
 import com.qs.mp.channel.domain.vo.ChannelOrderVO;
 import com.qs.mp.channel.service.IChannelOrderDetailService;
 import com.qs.mp.channel.service.IChannelOrderItemService;
@@ -137,27 +138,14 @@ public class ChannelOrderMgrController extends BaseApiController {
 		return AjaxResult.error("发货失败");
   }
   
-	@PostMapping("/ticket/box/list")
+	@PostMapping("/item/list")
 	@ApiOperation(value = "获取经销商订单盲票组列表", notes = "")
 	public AjaxResult list(@RequestBody ChannelOrder order) {
-		List<TicketBox> list = new ArrayList<TicketBox>();
+		List<ChannelOrderItemVO> list = new ArrayList<ChannelOrderItemVO>();
 		if (null != order && StringUtils.isNotBlank(order.getOrderId())) {
-			// 查询订单明细
-			List<ChannelOrderItem> itemList = channelOrderItemService.list(
-					new LambdaQueryWrapper<ChannelOrderItem>().eq(ChannelOrderItem::getOrderId, order.getOrderId()));
-			if (null != itemList && itemList.size() > 0) {
-				List<String> boxIds = new ArrayList<String>();
-				for (ChannelOrderItem item : itemList) {
-					if (null != item && StringUtils.isNotBlank(item.getBoxId())) {
-						boxIds.add(item.getBoxId());
-					}
-				}
-				if (null != boxIds && boxIds.size() > 0) {
-					LambdaQueryWrapper<TicketBox> queryWrapper = new LambdaQueryWrapper<TicketBox>();
-					queryWrapper.in(TicketBox::getBoxId, boxIds);
-					list = ticketBoxService.list(queryWrapper);
-				}
-			}
+			QueryWrapper<ChannelOrderItem> queryWrapper = new QueryWrapper<ChannelOrderItem>();
+			queryWrapper.eq("t1.order_id", order.getOrderId());
+			list = channelOrderItemService.listChannelOrderItemVO(queryWrapper);
 		}
 		return AjaxResult.success(list);
 	}

mp-service/src/main/java/com/qs/mp/channel/domain/vo/ChannelOrderItemVO.java

@@ -0,0 +1,15 @@
+package com.qs.mp.channel.domain.vo;
+
+import com.qs.mp.channel.domain.ChannelOrderItem;
+import lombok.Data;
+
+/**
+ * @author liugl
+ * @Date 2022/3/3
+ */
+@Data
+public class ChannelOrderItemVO extends ChannelOrderItem {
+	
+	// 盲票组编号
+	private String boxNo;
+}

mp-service/src/main/java/com/qs/mp/channel/mapper/ChannelOrderItemMapper.java

@@ -1,7 +1,17 @@
 package com.qs.mp.channel.mapper;
 
+import com.qs.mp.admin.domain.TicketPackage;
+import com.qs.mp.admin.domain.vo.TicketPackageVO;
 import com.qs.mp.channel.domain.ChannelOrderItem;
+import com.qs.mp.channel.domain.vo.ChannelOrderItemVO;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 
 /**
  * @auther quanshu
@@ -10,4 +20,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ChannelOrderItemMapper extends BaseMapper<ChannelOrderItem> {
 
+	List<ChannelOrderItemVO> listChannelOrderItemVO(@Param(Constants.WRAPPER) Wrapper<ChannelOrderItem> queryWrapper);
 }

mp-service/src/main/java/com/qs/mp/channel/service/IChannelOrderItemService.java

@@ -1,6 +1,14 @@
 package com.qs.mp.channel.service;
 
 import com.qs.mp.channel.domain.ChannelOrderItem;
+import com.qs.mp.channel.domain.vo.ChannelOrderItemVO;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -13,4 +21,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IChannelOrderItemService extends IService<ChannelOrderItem> {
 
+	/**
+	 * 查询明细
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<ChannelOrderItemVO> listChannelOrderItemVO(Wrapper<ChannelOrderItem> queryWrapper);
 }

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelOrderItemServiceImpl.java

@@ -1,9 +1,14 @@
 package com.qs.mp.channel.service.impl;
 
 import com.qs.mp.channel.domain.ChannelOrderItem;
+import com.qs.mp.channel.domain.vo.ChannelOrderItemVO;
 import com.qs.mp.channel.mapper.ChannelOrderItemMapper;
 import com.qs.mp.channel.service.IChannelOrderItemService;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.List;
+
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +22,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class ChannelOrderItemServiceImpl extends ServiceImpl<ChannelOrderItemMapper, ChannelOrderItem> implements IChannelOrderItemService {
 
+	@Override
+	public List<ChannelOrderItemVO> listChannelOrderItemVO(Wrapper<ChannelOrderItem> queryWrapper) {
+		return getBaseMapper().listChannelOrderItemVO(queryWrapper);
+	}
+
+	
 }

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

@@ -24,4 +24,13 @@
         id, order_id, channel_id, title, pic_url, box_id, properties, pkg_unit, face_price, order_num, sale_price, created_time, updated_time
     </sql>
 
+
+    <!-- 查询订单明细列表 -->
+    <select id="listChannelOrderItemVO" resultType="com.qs.mp.channel.domain.vo.ChannelOrderItemVO">
+		select t1.* , t2.box_no boxNo
+		from mp_channel_order_item t1
+		left join mp_ticket_box t2 on t1.box_id = t2.box_id
+		${ew.customSqlSegment}
+	</select>
+	
 </mapper>