优化代码

java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java

@@ -130,6 +130,8 @@ public class FeeDto extends PageDto implements Serializable {
     private double feeTotalPrice;
     private String batchId;
 
+    private String offlinePayFeeSwitch;
+
     public String getAmount() {
         return amount;
     }
@@ -626,4 +628,12 @@ public class FeeDto extends PageDto implements Serializable {
     public void setBatchId(String batchId) {
         this.batchId = batchId;
     }
+
+    public String getOfflinePayFeeSwitch() {
+        return offlinePayFeeSwitch;
+    }
+
+    public void setOfflinePayFeeSwitch(String offlinePayFeeSwitch) {
+        this.offlinePayFeeSwitch = offlinePayFeeSwitch;
+    }
 }

service-fee/src/main/java/com/java110/fee/bmo/impl/QueryOweFeeImpl.java

@@ -71,6 +71,9 @@ public class QueryOweFeeImpl implements IQueryOweFee {
     //键
     public static final String RECEIVED_AMOUNT_SWITCH = "RECEIVED_AMOUNT_SWITCH";
 
+    //禁用电脑端提交收费按钮
+    public static final String OFFLINE_PAY_FEE_SWITCH = "OFFLINE_PAY_FEE_SWITCH";
+
     @Override
     public ResponseEntity<String> query(FeeDto feeDto) {
 
@@ -171,12 +174,23 @@ public class QueryOweFeeImpl implements IQueryOweFee {
             val = MappingCache.getValue(DOMAIN_COMMON, TOTAL_FEE_PRICE);
         }
         feeDto.setVal(val);
-        String received_amount_switch = MappingCache.getValue(DOMAIN_COMMON, RECEIVED_AMOUNT_SWITCH);
+        //先取单小区的如果没有配置 取 全局的
+        String received_amount_switch = CommunitySettingFactory.getValue(feeDto.getCommunityId(),RECEIVED_AMOUNT_SWITCH);
+        if(StringUtil.isEmpty(received_amount_switch)){
+             received_amount_switch = MappingCache.getValue(DOMAIN_COMMON, RECEIVED_AMOUNT_SWITCH);
+        }
+        //关闭 线下收银功能
         if (StringUtil.isEmpty(received_amount_switch)) {
             feeDto.setReceivedAmountSwitch("1");//默认启用实收款输入框
         } else {
             feeDto.setReceivedAmountSwitch(received_amount_switch);
         }
+        //先取单小区的如果没有配置 取 全局的
+        String offlinePayFeeSwitch = CommunitySettingFactory.getValue(feeDto.getCommunityId(),OFFLINE_PAY_FEE_SWITCH);
+        if(StringUtil.isEmpty(offlinePayFeeSwitch)){
+            offlinePayFeeSwitch = MappingCache.getValue(DOMAIN_COMMON, OFFLINE_PAY_FEE_SWITCH);
+        }
+        feeDto.setOfflinePayFeeSwitch(offlinePayFeeSwitch);
         return ResultVo.createResponseEntity(feeDto);
     }