优化报表功能

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

@@ -130,7 +130,7 @@ public class ChargeCoreImpl implements IChargeCore {
         double usedHours = Math.ceil((calendar.getTime().getTime() - startTime.getTime()) / (60 * 60 * 1000.00));
         // 计算平均功率
         String power = energy;
-        if (usedHours < 0) {
+        if (usedHours <= 0) {
             usedHours = 0;
         } else {
             BigDecimal powerDec = new BigDecimal(Double.parseDouble(energy)).divide(new BigDecimal(usedHours), 2, BigDecimal.ROUND_HALF_UP);

service-common/src/main/java/com/java110/common/smo/impl/NotifyChargeV1InnerServiceSMOImpl.java

@@ -41,7 +41,6 @@ public class NotifyChargeV1InnerServiceSMOImpl extends BaseServiceSMO implements
     private static final Logger logger = LoggerFactory.getLogger(NotifyChargeV1InnerServiceSMOImpl.class);
 
 
-
     @Autowired
     private IChargeCore chargeCoreImpl;
 
@@ -49,8 +48,15 @@ public class NotifyChargeV1InnerServiceSMOImpl extends BaseServiceSMO implements
     @Override
     public ResultVo finishCharge(@RequestBody NotifyChargeOrderDto notifyChargeOrderDto) {
 
-       return chargeCoreImpl.finishCharge(notifyChargeOrderDto);
-
+        ResultVo resultVo = null;
+        try {
+            resultVo = chargeCoreImpl.finishCharge(notifyChargeOrderDto);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("停止充电失败", e);
+            throw e;
+        }
+        return resultVo;
     }
 
     @Override