增加两个接口

1、获取经销商订单盲票组列表
2、经销商订单发货筛选盲票包列表

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

@@ -2,9 +2,15 @@ package com.qs.mp.web.controller.api.admin;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.qs.mp.admin.domain.TicketBox;
 import com.qs.mp.admin.domain.TicketPackage;
+import com.qs.mp.admin.domain.param.ChannelOrderPkgParam;
 import com.qs.mp.admin.domain.param.ChannelOrderShipParam;
 import com.qs.mp.admin.domain.param.UserDeliverOrderShipParam;
+import com.qs.mp.admin.domain.vo.TicketPackageVO;
+import com.qs.mp.admin.service.ITicketBoxService;
+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;
@@ -16,8 +22,10 @@ import com.qs.mp.common.annotation.Log;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.core.redis.RedisCache;
+import com.qs.mp.common.domain.DeliveryCompany;
 import com.qs.mp.common.enums.BusinessType;
 import com.qs.mp.common.enums.ErrorCodeEnum;
+import com.qs.mp.common.enums.TicketPkgStatusEnum;
 import com.qs.mp.user.domain.UserDeliverOrderItem;
 import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
@@ -51,6 +59,12 @@ public class ChannelOrderMgrController extends BaseApiController {
 
   @Autowired
   private IChannelOrderDetailService channelOrderDetailService;
+  
+  @Autowired
+  private ITicketBoxService ticketBoxService;
+  
+  @Autowired
+  private ITicketPackageService ticketPackageService;
 
   @Autowired
   private MapperFacade mapperFacade;
@@ -102,8 +116,7 @@ public class ChannelOrderMgrController extends BaseApiController {
         .eq(ChannelOrderItem::getOrderId, channelOrderVO.getOrderId())));
     return AjaxResult.success(channelOrderVO);
   }
-
-
+  
 
   /**
    * 订单发货
@@ -122,6 +135,65 @@ public class ChannelOrderMgrController extends BaseApiController {
 			return rtn ? AjaxResult.success() : AjaxResult.error("发货失败");
 		}
 		return AjaxResult.error("发货失败");
+  }
+  
+	@PostMapping("/ticket/box/list")
+	@ApiOperation(value = "获取经销商订单盲票组列表", notes = "")
+	public AjaxResult list(@RequestBody ChannelOrder order) {
+		List<TicketBox> list = new ArrayList<TicketBox>();
+		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);
+				}
+			}
+		}
+		return AjaxResult.success(list);
 	}
 
+	@PostMapping("/ticket/pkg/list")
+	@ApiOperation(value = "经销商订单发货筛选盲票包列表", notes = "")
+	public AjaxResult list(@RequestBody ChannelOrderPkgParam orderPkgParam) {
+		List<TicketPackageVO> list = new ArrayList<TicketPackageVO>();
+		QueryWrapper<TicketPackage> queryWrapper = new QueryWrapper<TicketPackage>();
+		queryWrapper.eq("t1.`status`", TicketPkgStatusEnum.FOR_SALE); // 筛选待售
+		if (null != orderPkgParam && StringUtils.isNotBlank(orderPkgParam.getPkgNo())) {
+			queryWrapper.like("t1.pkg_no", orderPkgParam.getPkgNo());
+		}
+		if (null != orderPkgParam && StringUtils.isNotBlank(orderPkgParam.getBoxId())) {
+			queryWrapper.eq("t1.box_id", orderPkgParam.getBoxId());
+			list = ticketPackageService.listTicketPackageVO(queryWrapper);
+		} else {
+			if (null != orderPkgParam && StringUtils.isNotBlank(orderPkgParam.getOrderId())) {
+				// 查询订单明细
+				List<ChannelOrderItem> itemList = channelOrderItemService
+						.list(new LambdaQueryWrapper<ChannelOrderItem>().eq(ChannelOrderItem::getOrderId,
+								orderPkgParam.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) {
+						queryWrapper.in("t1.box_id", boxIds);
+						list = ticketPackageService.listTicketPackageVO(queryWrapper);
+					}
+				}
+			}
+		}
+		return AjaxResult.success(list);
+	}
 }

mp-service/src/main/java/com/qs/mp/admin/domain/param/ChannelOrderPkgParam.java

@@ -0,0 +1,28 @@
+package com.qs.mp.admin.domain.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * @describe 道发货订单可选择的票包列表筛选参数
+ * @auther quanshu
+ * @create 2022-03-022 20:43:44
+ */
+@ApiModel(value = "渠道发货订单可选择的票包列表筛选参数")
+@Data
+public class ChannelOrderPkgParam {
+
+	@ApiModelProperty(value = "订单编号", required = false)
+	private String orderId;
+
+
+	@ApiModelProperty(value = "盲票组ID", required = false)
+	private String boxId;
+	
+	
+	@ApiModelProperty(value = "盲票包编号", required = false)
+	private String pkgNo;
+
+}

mp-service/src/main/java/com/qs/mp/admin/domain/vo/TicketPackageVO.java

@@ -0,0 +1,16 @@
+package com.qs.mp.admin.domain.vo;
+
+import com.qs.mp.admin.domain.TicketPackage;
+
+import lombok.Data;
+
+/**
+ * @author liugl
+ * @Date 2022/3/22
+ */
+@Data
+public class TicketPackageVO extends TicketPackage {
+  
+  // 盲票组名称
+  private String title;
+}

mp-service/src/main/java/com/qs/mp/admin/mapper/TicketPackageMapper.java

@@ -1,7 +1,15 @@
 package com.qs.mp.admin.mapper;
 
 import com.qs.mp.admin.domain.TicketPackage;
+import com.qs.mp.admin.domain.vo.TicketPackageVO;
+
+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 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TicketPackageMapper extends BaseMapper<TicketPackage> {
 
+	List<TicketPackageVO> listTicketPackageVO(@Param(Constants.WRAPPER) Wrapper<TicketPackage> queryWrapper);
 }

mp-service/src/main/java/com/qs/mp/admin/service/ITicketPackageService.java

@@ -1,6 +1,11 @@
 package com.qs.mp.admin.service;
 
 import com.qs.mp.admin.domain.TicketPackage;
+import com.qs.mp.admin.domain.vo.TicketPackageVO;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -13,4 +18,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITicketPackageService extends IService<TicketPackage> {
 
+	List<TicketPackageVO> listTicketPackageVO(Wrapper<TicketPackage> queryWrapper);
 }

mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketPackageServiceImpl.java

@@ -1,9 +1,14 @@
 package com.qs.mp.admin.service.impl;
 
 import com.qs.mp.admin.domain.TicketPackage;
+import com.qs.mp.admin.domain.vo.TicketPackageVO;
 import com.qs.mp.admin.mapper.TicketPackageMapper;
 import com.qs.mp.admin.service.ITicketPackageService;
+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 TicketPackageServiceImpl extends ServiceImpl<TicketPackageMapper, TicketPackage> implements ITicketPackageService {
 
+	@Override
+	public List<TicketPackageVO> listTicketPackageVO(Wrapper<TicketPackage> queryWrapper) {
+		return getBaseMapper().listTicketPackageVO(queryWrapper);
+	}
+
+	
 }

mp-service/src/main/resources/mapper/admin/TicketPackageMapper.xml

@@ -18,5 +18,14 @@
     <sql id="Base_Column_List">
         pkg_id, box_id, pkg_no, start_sn, end_sn, status, created_time, updated_time
     </sql>
+    
+    
+    <!-- 查询盲票包列表 -->
+    <select id="listTicketPackageVO" resultType="com.qs.mp.admin.domain.vo.TicketPackageVO">
+		select t1.* , t2.title
+		from mp_ticket_package t1
+		left join mp_ticket_box t2 on t1.box_id = t2.box_id
+		${ew.customSqlSegment}
+	</select>
 
 </mapper>