售货机 推货和推送

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

@@ -212,10 +212,9 @@ public class VendingMachineServiceImpl implements IVendingMachineService {
 		VmOrderDetails vod = Service.lookup(IMINDataBaseService.class)
 									.getMybatisMapper(VmOrderDetailsMapper.class)
 									.selectByPrimaryKey(orddetid);
-
 		String cargoState = "";
 		//成功的不在处理
-		if(vdi!= null && !vdi.equals("2")){
+		if(vdi!= null && !"2".equals(vdi.getStatus())){
 			if("01".equals(state)){
 				cargoState ="00";
 				// 提货状态:0未出货1部分出货2已出货3卡货4清零5处理中
@@ -240,7 +239,7 @@ public class VendingMachineServiceImpl implements IVendingMachineService {
 				if(deliveryNums.equals(vdi.getProNums())){//都提完了
 					VmOrderDetails vmOrderDetails = new VmOrderDetails();
 					vmOrderDetails.setDetailsId(orddetid);
-					vmOrderDetails.setIsDelivery("03");
+					vmOrderDetails.setIsDelivery("01");
 					Service.lookup(IMINDataBaseService.class)
 							.getMybatisMapper(VmOrderDetailsMapper.class)
 							.updateByPrimaryKeySelective(vmOrderDetails);
@@ -268,7 +267,7 @@ public class VendingMachineServiceImpl implements IVendingMachineService {
 			if(vmOrderDetailsList.size() == 0){
 				VmOrderInf vmOrderInf = new VmOrderInf();
 				vmOrderInf.setId(vod.getOrderId());
-				vmOrderInf.setPickupStt("03");
+				vmOrderInf.setPickupStt("01");
 				Service.lookup(IMINDataBaseService.class)
 						.getMybatisMapper(VmOrderInfMapper.class)
 						.updateByPrimaryKeySelective(vmOrderInf);