优化代码

java110-bean/src/main/java/com/java110/dto/machine/CarInoutDetailDto.java

@@ -32,6 +32,7 @@ public class CarInoutDetailDto extends CarInoutDto implements Serializable {
 
     private String remark;
     private String state;
+    private String inState;
 
     private String carType;
     private String carTypeName;
@@ -155,4 +156,12 @@ public class CarInoutDetailDto extends CarInoutDto implements Serializable {
     public void setCarTypeName(String carTypeName) {
         this.carTypeName = carTypeName;
     }
+
+    public String getInState() {
+        return inState;
+    }
+
+    public void setInState(String inState) {
+        this.inState = inState;
+    }
 }

java110-db/src/main/resources/mapper/common/CarInoutDetailV1ServiceDaoImplMapper.xml

@@ -21,7 +21,7 @@
         machineCode,t.car_inout,t.car_inout carInout,t.pa_id,t.pa_id paId,t.detail_id,t.detail_id
         detailId,t.car_num,t.car_num carNum,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.state,
         ci.in_time inTime,ci.out_time outTime,max(cip.real_charge) realCharge,ci.pa_id paId,td.name stateName,t.remark,t.car_type carType
-        ,pa.num areaNum,tcfc.fee_name feeName,tcfc.config_id configId,t.car_type_name carTypeName
+        ,pa.num areaNum,tcfc.fee_name feeName,tcfc.config_id configId,t.car_type_name carTypeName,ci.state inState
         from car_inout_detail t
         left join car_inout ci on t.inout_id = ci.inout_id and ci.status_cd = '0' and t.community_id = ci.community_id
         left join car_inout_payment cip on cip.inout_id = ci.inout_id and cip.community_id = ci.community_id
@@ -29,6 +29,7 @@
         left join parking_area pa on ci.pa_id = pa.pa_id and pa.status_cd = '0'
         left join temp_car_fee_config tcfc on pa.pa_id = tcfc.pa_id and tcfc.status_cd = '0'
         where 1 =1
+
         <if test="inoutId !=null and inoutId != ''">
             and t.inout_id= #{inoutId}
         </if>

service-fee/src/main/java/com/java110/fee/smo/impl/TempCarFeeConfigInnerServiceSMOImpl.java

@@ -165,7 +165,7 @@ public class TempCarFeeConfigInnerServiceSMOImpl extends BaseServiceSMO implemen
         IComputeTempCarFee computeTempCarFee = ApplicationContextFactory.getBean(tempCarFeeConfigDtos.get(0).getRuleId(), IComputeTempCarFee.class);
         for (CarInoutDetailDto carInoutDto : carInoutDtos) {
             try {
-                if (CarInoutDetailDto.CAR_INOUT_IN.equals(carInoutDto.getCarInout())) {
+                if (CarInoutDetailDto.CAR_INOUT_IN.equals(carInoutDto.getCarInout())  && !CarInoutDetailDto.STATE_OUT.equals(carInoutDto.getInState())) {
                     TempCarFeeResult result = computeTempCarFee.computeTempCarFee(carInoutDto, tempCarFeeConfigDtos.get(0), tempCarFeeConfigAttrDtos);
                     carInoutDto.setMin(result.getMin());
                     carInoutDto.setHours(result.getHours());