推货调整

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

@@ -8,15 +8,8 @@ import com.minpay.common.exception.BusinessCodeException;
 import com.minpay.common.service.IOrderService;
 import com.minpay.common.service.IPublicService;
 import com.minpay.common.util.DateUtil;
-import com.minpay.db.table.mapper.VmEquipmentInfMapper;
-import com.minpay.db.table.mapper.VmOrderDetailsMapper;
-import com.minpay.db.table.mapper.VmOrderInfMapper;
-import com.minpay.db.table.mapper.VmProEquRelMapper;
-import com.minpay.db.table.model.VmEquipmentInf;
-import com.minpay.db.table.model.VmOrderDetails;
-import com.minpay.db.table.model.VmOrderInf;
-import com.minpay.db.table.model.VmPersonInf;
-import com.minpay.db.table.model.VmProEquRel;
+import com.minpay.db.table.mapper.*;
+import com.minpay.db.table.model.*;
 import com.startup.minpay.frame.exception.MINBusinessException;
 import com.startup.minpay.frame.service.base.IMINDataBaseService;
 import com.startup.minpay.frame.service.base.Service;
@@ -161,6 +154,13 @@ public class OrderServiceImpl implements IOrderService {
 								proPrice = String.valueOf(proInf.getGamePrice());
 							}
 						}
+						//查询商品详情
+						VmProductInf vmProductInf = Service.lookup(IMINDataBaseService.class).getMybatisMapper(VmProductInfMapper.class).selectByPrimaryKey(proInf.getProductId());
+						if(proInf == null) {
+							throw new MINBusinessException("无此货");
+						}
+
+
 						// 计算总金额
 						String amount = CommonUtil.multiply(proPrice, proNumsAndPayNum);
 						//初始化订单详情信息
@@ -172,7 +172,7 @@ public class OrderServiceImpl implements IOrderService {
 						ordetInf.setProductId(proInf.getProductId());	//商品编号
 						ordetInf.setCargoWay(cargoWay);					//商品所在售货机货道编号
 						ordetInf.setProType(proType);					//商品类型:00正常商品01抽奖商品
-						ordetInf.setProName(map.get("proName"));		//尚品名称
+						ordetInf.setProName(vmProductInf.getName());		//尚品名称
 						ordetInf.setProPrice(proPrice);					//商品单价
 						ordetInf.setProNums(proNums);					//下单数量
 						ordetInf.setAmount(amount);						//总金额

src/main/java/com/minpay/shouhuo/deliveryaction/DeliveryAction.java

@@ -197,7 +197,7 @@ public class DeliveryAction implements IMINAction{
 		}
 		
 		if(!deliveryInf.getStatus().equals("0") 
-				&& !deliveryInf.getStatus().equals("1")){
+				&& !deliveryInf.getStatus().equals("1") && !deliveryInf.getStatus().equals("5")){
 			throw new MINBusinessException("提货处理中，请稍后!");
 		}
 		
@@ -295,11 +295,13 @@ public class DeliveryAction implements IMINAction{
 			throw new MINBusinessException(msg);//操作失败!
 		}else if("200".equals(String.valueOf(stateNew.get("code")))){
 			//改变提货状态为2成功....
-			delInf.setStatus("2");
+			delInf.setStatus("5");
 			//处理提货状态
 			Service.lookup(IMINDataBaseService.class)
 					.getMybatisMapper(VmDeliveryInfMapper.class)
 					.updateByPrimaryKeySelective(delInf);
+
+
 			//修改货道商品数量
 			String proEquRelId = delInf.getProEquRelId();
 			VmProEquRel vmProEquRel = Service.lookup(IMINDataBaseService.class)
@@ -314,7 +316,7 @@ public class DeliveryAction implements IMINAction{
 
 			VmOrderDetails vmOrderDetails = new VmOrderDetails();
 			vmOrderDetails.setDetailsId(delInf.getOrdDetId());
-			vmOrderDetails.setIsDelivery("01");
+			vmOrderDetails.setIsDelivery("03");
 			Service.lookup(IMINDataBaseService.class)
 					.getMybatisMapper(VmOrderDetailsMapper.class)
 					.updateByPrimaryKeySelective(vmOrderDetails);
@@ -328,7 +330,7 @@ public class DeliveryAction implements IMINAction{
 			if(vmOrderDetailsList.size() == 0){
 				VmOrderInf vmOrderInf = new VmOrderInf();
 				vmOrderInf.setId(orderNo);
-				vmOrderInf.setPickupStt("01");
+				vmOrderInf.setPickupStt("03");
 				Service.lookup(IMINDataBaseService.class)
 						.getMybatisMapper(VmOrderInfMapper.class)
 						.updateByPrimaryKeySelective(vmOrderInf);