Merge branch 'dev' of http://113.31.163.91:7777/quanshu/mp-server.git

into dev

Conflicts:
	mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelOrderServiceImpl.java

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

@@ -68,10 +68,10 @@ public class ChannelOrderServiceImpl extends
 
   @Autowired
   private IChannelCartService channelCartService;
-  
+
   @Autowired
   private ITicketPackageService ticketPackageService;
-  
+
   @Autowired
   private IChannelOrderDetailService channelOrderDetailervice;
 
@@ -256,12 +256,12 @@ public class ChannelOrderServiceImpl extends
 			if(null != orderItem && StringUtils.isNotBlank(orderItem.getBoxId()) ) {
 				long totalNum = ticketPkgList.stream().filter(TicketPackage -> TicketPackage.getBoxId().equals(orderItem.getBoxId())).count();
 				if(totalNum != orderItem.getOrderNum()) {
-					String msg = "票组"+orderItem.getTitle()+"盲票包" + (totalNum > orderItem.getOrderNum()?"少于":"已超出")+"订单购买的盲票包数量";
+					String msg = "票组"+orderItem.getTitle()+"盲票包" + (totalNum < orderItem.getOrderNum()?"少于":"已超出")+"订单购买的盲票包数量";
 					throw new ServiceException(msg);
 				}
 			}
 		}
-		
+
 		boolean res = channelOrderDetailervice.saveBatch(detailList);
 		if(res) {
 			// 修改票包已销售状态
@@ -282,8 +282,4 @@ public class ChannelOrderServiceImpl extends
 	public List<ChannelOrderVO> selectChannelOrderVoList(Wrapper<ChannelOrder> wrapper) {
 		return getBaseMapper().selectChannelOrderVoList(wrapper);
 	}
-	
-	
-	  
-  
 }