Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!255

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

@@ -66,10 +66,10 @@ public class ChannelOrderServiceImpl extends
 
   @Autowired
   private IChannelCartService channelCartService;
-  
+
   @Autowired
   private ITicketPackageService ticketPackageService;
-  
+
   @Autowired
   private IChannelOrderDetailService channelOrderDetailervice;
 
@@ -254,12 +254,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) {
 			// 修改票包已销售状态
@@ -273,9 +273,9 @@ public class ChannelOrderServiceImpl extends
 				return updateById(channelOrder);
 			}
 		}
-		
+
 		return false;
 	}
-	  
-  
+
+
 }