推货

src/main/java/com/minpay/common/action/VendingMachineAction.java

@@ -70,6 +70,7 @@ public class VendingMachineAction implements IMINAction {
 			@MINParam(key = "deliveryNo") String deliveryNo,
 			@MINParam(key = "returnUrl") String returnUrl,
 			@MINParam(key = "channel") String channel,
+			@MINParam(key = "orderId") String orderId,
 			MINHttpServletRequestContext  MINRequest
 			) throws MINBusinessException, InterruptedException {
 		MINActionResult res = new MINActionResult();
@@ -134,17 +135,20 @@ public class VendingMachineAction implements IMINAction {
 		for(int i = 0; i < canPushNum; i++) {
 			//组装数据
 			List<String> restList = new ArrayList<String>();
-			String str = DataUtil.str10ToStr16(Integer.valueOf(cargoNo));
-			restList.add("9A");
-			restList.add("06");
-			restList.add("15");
-			restList.add(str);
-			String parama = "06".concat("15").concat(str);
-			String checkAnd = DataUtil.checkAnd(parama);
-			restList.add(checkAnd);
-			restList.add("9B");
+			restList.add("[a|");
+
+			restList.add(imeiAddr);     //机台号
+			restList.add("|");
+			restList.add(orderId);	//订单号
+			restList.add("]");
+			restList.add("(bFA 00 06 00 24");
+			String cargoNo16 = DataUtil.str10ToStr16(Integer.valueOf(cargoNo));
+			if(cargoNo16.length() == 1){
+				cargoNo16 = "0".concat(cargoNo16);
+			}
+			restList.add(" ".concat(cargoNo16));
+			restList.add(")");
 			String param  = DataUtil.listToString(restList);
-			
 			try {//进行通知
 				code = Service.lookup(IClientService.class).sendMsg(param, imeiAddr);
 				if(!"200".equals(code)){
@@ -176,6 +180,7 @@ public class VendingMachineAction implements IMINAction {
 			vpn.setPushType("00");
 			vpn.setChannel("V01");
 			vpn.setType("00");
+			//订单号
 			Service.lookup(IMINDataBaseService.class) 
 					.getMybatisMapper(VmPushNewsMapper.class)
 					.insertSelective(vpn);

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

@@ -49,7 +49,7 @@ public class VendingMachineServiceImpl implements IVendingMachineService {
 		String imei = strArr[1];
 		System.out.println(imei);
 		VmEquipmentInfExample veExample = new VmEquipmentInfExample();
-		veExample.createCriteria().andMachineNoEqualTo(imei);
+		veExample.createCriteria().andImeiAddrEqualTo(imei).andStateEqualTo("00");
 		//查询是否有此设备
 		List<VmEquipmentInf> list = Service.lookup(IMINDataBaseService.class)
 											.getMybatisMapper(VmEquipmentInfMapper.class)
@@ -91,7 +91,7 @@ public class VendingMachineServiceImpl implements IVendingMachineService {
 			List<String> stateList = new ArrayList<String>();
 			stateList.add("00");
 			stateList.add("01");
-			veExample.createCriteria().andMachineNoEqualTo(im).andStateIn(stateList);
+			veExample.createCriteria().andImeiAddrEqualTo(im).andStateIn(stateList);
 			//查询是否有此设备
 			List<VmEquipmentInf> list = Service.lookup(IMINDataBaseService.class)
 												.getMybatisMapper(VmEquipmentInfMapper.class)