1.新增提货卡查询

2.只有盒子售货机下单时判断机器在不在线

src/main/java/com/minpay/common/service/impl/OrderServiceImpl.java

@@ -50,10 +50,12 @@ public class OrderServiceImpl implements IOrderService {
 										.selectByPrimaryKey(equNo);
 		if(equInf == null){
 			throw new BusinessCodeException("JINM1101");//售货机异常,请联系工作人员
-		} 
-		
-		if(!"00".equals(equInf.getState())){
-			throw new BusinessCodeException("JINM1102");//售货机运行异常,请联系工作人员
+		}
+		//只有机器类型为支付盒子售货机才校验售货机是否在线
+		if (equInf.getEquType().equals("00")) {
+			if (!"00".equals(equInf.getState())) {
+				throw new BusinessCodeException("JINM1102");//售货机运行异常,请联系工作人员
+			}
 		}
 		//获取购买商品信息--验证
 		if(CommonUtil.isEmpty(detData)){

src/main/resources/com/minpay/db/table/own/mapper/DeliveryMapper.xml

@@ -8,7 +8,6 @@
   			d.VDI_EQUIPMENT_ID 	  	'equNo',
   			e.VEQ_NAME 	  			'equName',
   			e.VEQ_ADDRESS 			'equAddress',
-  			u.USR_NAME 	  			'supName',
   			d.VDI_PERSON_ID 	  	'personNo',
   			s.VCI_NAME 	  			'personName',
   			o.VOI_ID		 	 	'ordNo',
@@ -33,8 +32,6 @@
 				  AND	p.VCI_CHANNEL = d.VDI_CHANNEL
 			LEFT JOIN  vm_equipment_inf	e ON	d.VDI_EQUIPMENT_ID = e.VEQ_ID
 				  AND	d.VDI_CHANNEL = e.VEQ_CHANNEL
-			LEFT JOIN  im_user			u ON	e.VEQ_USER_ID = u.USR_ID
-				  AND	d.VDI_CHANNEL = u.USR_CHANNEL
 			LEFT JOIN  vm_order_details	oD ON	oD.VOD_DETAILS_ID = d.VDI_ORD_DET_ID
 				  AND	d.VDI_CHANNEL = oD.VOD_CHANNEL
 			LEFT JOIN  vm_order_inf		o  ON	oD.VOD_ORDER_ID = o.VOI_ID
@@ -53,9 +50,6 @@
 			<if test="orderNo != null and orderNo != ''"> 
 		    	and o.VOI_ID = #{orderNo,jdbcType=VARCHAR}
 			</if>
-			<if test="userNo != null and userNo != ''"> 
-		    	and e.VEQ_USER_ID = #{userNo,jdbcType=VARCHAR}
-			</if>
 			<if test="equNo != null and equNo != ''"> 
 		    	and d.VDI_EQUIPMENT_ID = #{equNo,jdbcType=VARCHAR}
 			</if>