优化代码

service-api/src/main/java/com/java110/api/listener/resourceStore/SaveStorehouseListener.java

@@ -6,6 +6,8 @@ import com.java110.api.listener.AbstractServiceApiPlusListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.dto.storehouse.StorehouseDto;
+import com.java110.intf.store.IStorehouseInnerServiceSMO;
 import com.java110.utils.constant.ServiceCodeStorehouseConstant;
 import com.java110.utils.util.Assert;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +23,9 @@ public class SaveStorehouseListener extends AbstractServiceApiPlusListener {
     @Autowired
     private IStorehouseBMO storehouseBMOImpl;
 
+    @Autowired
+    private IStorehouseInnerServiceSMO storehouseInnerServiceSMOImpl;
+
     @Override
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
         //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
@@ -29,6 +34,14 @@ public class SaveStorehouseListener extends AbstractServiceApiPlusListener {
         Assert.hasKeyAndValue(reqJson, "shType", "请求报文中未包含shType");
         Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含storeId");
 
+        StorehouseDto storehouseDto = new StorehouseDto();
+        storehouseDto.setShName(reqJson.getString("shName"));
+        storehouseDto.setStoreId(reqJson.getString("storeId"));
+        int flag  =  storehouseInnerServiceSMOImpl.queryStorehousesCount(storehouseDto);
+
+        if(flag < 1){
+            throw new IllegalArgumentException("已存在仓库");
+        }
     }
 
     @Override

service-api/src/main/java/com/java110/api/listener/resourceStoreType/SaveResourceStoreTypeListener.java

@@ -6,6 +6,8 @@ import com.java110.api.listener.AbstractServiceApiPlusListener;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.dto.resourceStoreType.ResourceStoreTypeDto;
+import com.java110.intf.store.IResourceStoreTypeV1InnerServiceSMO;
 import com.java110.utils.constant.ServiceCodeResourceStoreTypeConstant;
 import com.java110.utils.util.Assert;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +23,9 @@ public class SaveResourceStoreTypeListener extends AbstractServiceApiPlusListene
     @Autowired
     private IResourceStoreTypeBMO resourceStoreTypeBMOImpl;
 
+    @Autowired
+    private IResourceStoreTypeV1InnerServiceSMO resourceStoreTypeV1InnerServiceSMOImpl;
+
     @Override
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
         //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
@@ -31,8 +36,16 @@ public class SaveResourceStoreTypeListener extends AbstractServiceApiPlusListene
             String storeId = event.getDataFlowContext().getRequestCurrentHeaders().get("store-id");
             reqJson.put("storeId", storeId);
         }
-
         Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含storeId");
+        ResourceStoreTypeDto resourceStoreTypeDto = new ResourceStoreTypeDto();
+        resourceStoreTypeDto.setStoreId(reqJson.getString("storeId"));
+        resourceStoreTypeDto.setName(reqJson.getString("name"));
+        int flag = resourceStoreTypeV1InnerServiceSMOImpl.queryResourceStoreTypesCount(resourceStoreTypeDto);
+
+        if(flag > 0){
+            throw new IllegalArgumentException("类型名称已存在");
+        }
+
     }
 
     @Override

service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeMonthStatisticsInnerServiceSMOImpl.java

@@ -551,13 +551,19 @@ public class GeneratorFeeMonthStatisticsInnerServiceSMOImpl implements IGenerato
         BigDecimal feePriceDec = new BigDecimal(tmpReportFeeDto.getFeePrice());
 
         Date curDate = DateUtil.getFirstDate();
+        Date nowDate = DateUtil.getCurrentDate();
         double month = 0.0;
         //已经超过截止时间 和 还没有到开始时间
         if (curDate.getTime() > tmpReportFeeDto.getDeadlineTime().getTime()
-                || curDate.getTime() < tmpReportFeeDto.getEndTime().getTime()) {
+                || nowDate.getTime() < tmpReportFeeDto.getEndTime().getTime()) {
             return 0.0;
         }
 
+        //如果 1号小于 计费起始时间 那么 将curDate 改为 当前时间
+        if (curDate.getTime() < tmpReportFeeDto.getEndTime().getTime()) {
+            curDate = tmpReportFeeDto.getEndTime();
+        }
+
         //这里需要判断 结束时间 是否 大于了当月最后一天，当月天数 * 每天金额
         Calendar nextDateC = Calendar.getInstance();
         nextDateC.setTime(curDate);