优化代码

service-acct/src/main/java/com/java110/acct/smo/impl/NotifyPaymentV1InnerServiceSMOImpl.java

@@ -76,6 +76,10 @@ public class NotifyPaymentV1InnerServiceSMOImpl extends BaseServiceSMO implement
 
             String paramIn = CommonCache.getAndRemoveValue("unifiedPayment_" + paymentOrderDto.getOrderId());
 
+            if (StringUtil.isEmpty(paramIn)) {
+                throw new IllegalArgumentException("未找到业务数据");
+            }
+
             JSONObject reqJson = JSONObject.parseObject(paramIn);
 
             IPaymentBusiness paymentBusiness = ApplicationContextFactory.getBean(reqJson.getString("business"), IPaymentBusiness.class);

service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java

@@ -400,8 +400,8 @@ public class ChargeCoreImpl implements IChargeCore {
         chargeMachinePortV1InnerServiceSMOImpl.updateChargeMachinePort(chargeMachinePortPo);
 
         ChargeMachineOrderDto chargeMachineOrderDto = new ChargeMachineOrderDto();
-        chargeMachineOrderDto.setMachineId(chargeMachineDto.getMachineId());
-        chargeMachineOrderDto.setPortId(chargeMachinePortDto.getPortId());
+        chargeMachineOrderDto.setMachineId(chargeMachineDtos.get(0).getMachineId());
+        chargeMachineOrderDto.setPortId(chargeMachinePortDtos.get(0).getPortId());
         chargeMachineOrderDto.setState(ChargeMachineOrderDto.STATE_DOING);
         List<ChargeMachineOrderDto> chargeMachineOrderDtos = chargeMachineOrderV1InnerServiceSMOImpl.queryChargeMachineOrders(chargeMachineOrderDto);