|
|
@@ -206,15 +206,16 @@ public class VendingMachineServiceImpl implements IVendingMachineService {
|
|
|
VmDeliveryInf vdi = Service.lookup(IMINDataBaseService.class)
|
|
|
.getMybatisMapper(VmDeliveryInfMapper.class)
|
|
|
.selectByPrimaryKey(deliveryId);
|
|
|
- //订单详情编号
|
|
|
- String orddetid = vdi.getOrdDetId();
|
|
|
- //查询订单详情
|
|
|
- VmOrderDetails vod = Service.lookup(IMINDataBaseService.class)
|
|
|
- .getMybatisMapper(VmOrderDetailsMapper.class)
|
|
|
- .selectByPrimaryKey(orddetid);
|
|
|
+
|
|
|
String cargoState = "";
|
|
|
//成功的不在处理
|
|
|
if(vdi!= null && !"2".equals(vdi.getStatus())){
|
|
|
+ //订单详情编号
|
|
|
+ String orddetid = vdi.getOrdDetId();
|
|
|
+ //查询订单详情
|
|
|
+ VmOrderDetails vod = Service.lookup(IMINDataBaseService.class)
|
|
|
+ .getMybatisMapper(VmOrderDetailsMapper.class)
|
|
|
+ .selectByPrimaryKey(orddetid);
|
|
|
if("01".equals(state)){
|
|
|
cargoState ="00";
|
|
|
// 提货状态:0未出货1部分出货2已出货3卡货4清零5处理中
|
