Browse Source

优化创建临时收费

java110 3 years ago
parent
commit
6576659aae

+ 7 - 2
java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java

@@ -40,6 +40,7 @@ public class FeeConfigDto extends PageDto implements Serializable {
     public static final String PAYMENT_CD_PRE = "1200";
     public static final String PAYMENT_CD_PRE = "1200";
     public static final String PAYMENT_CD_AFTER = "2100";
     public static final String PAYMENT_CD_AFTER = "2100";
 
 
+    public static final String DEDUCT_FROM_N = "N";
 
 
 
 
     private String feeTypeCd;
     private String feeTypeCd;
@@ -283,9 +284,13 @@ public class FeeConfigDto extends PageDto implements Serializable {
         this.amount = amount;
         this.amount = amount;
     }
     }
 
 
-    public String getDeductFrom() { return deductFrom; }
+    public String getDeductFrom() {
+        return deductFrom;
+    }
 
 
-    public void setDeductFrom(String deductFrom) { this.deductFrom = deductFrom; }
+    public void setDeductFrom(String deductFrom) {
+        this.deductFrom = deductFrom;
+    }
 
 
     public String getComputingFormulaName() {
     public String getComputingFormulaName() {
         return computingFormulaName;
         return computingFormulaName;

+ 1 - 0
service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java

@@ -666,6 +666,7 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
         payFeeConfigPo.setSquarePrice("0");
         payFeeConfigPo.setSquarePrice("0");
         payFeeConfigPo.setPaymentCycle("1");
         payFeeConfigPo.setPaymentCycle("1");
         payFeeConfigPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         payFeeConfigPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        payFeeConfigPo.setDeductFrom(FeeConfigDto.DEDUCT_FROM_N);
         int saveFlag = feeConfigInnerServiceSMOImpl.saveFeeConfig(payFeeConfigPo);
         int saveFlag = feeConfigInnerServiceSMOImpl.saveFeeConfig(payFeeConfigPo);
 
 
         if (saveFlag < 1) {
         if (saveFlag < 1) {

+ 1 - 0
service-fee/src/main/java/com/java110/fee/bmo/importFee/impl/FeeSharingBMOImpl.java

@@ -449,6 +449,7 @@ public class FeeSharingBMOImpl implements IFeeSharingBMO {
         payFeeConfigPo.setSquarePrice("0");
         payFeeConfigPo.setSquarePrice("0");
         payFeeConfigPo.setPaymentCycle("1");
         payFeeConfigPo.setPaymentCycle("1");
         payFeeConfigPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         payFeeConfigPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        payFeeConfigPo.setDeductFrom(FeeConfigDto.DEDUCT_FROM_N);
         int saveFlag = feeConfigInnerServiceSMOImpl.saveFeeConfig(payFeeConfigPo);
         int saveFlag = feeConfigInnerServiceSMOImpl.saveFeeConfig(payFeeConfigPo);
 
 
         if (saveFlag < 1) {
         if (saveFlag < 1) {