cuixinpeng пре 2 година
родитељ
комит
fdf48c6681

+ 18 - 0
src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceImpl.java

@@ -1592,6 +1592,12 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         feeResultVo7.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getFirstRetailPremiums()!=null?syOrderFeeVo.getFirstRetailPremiums():"-");
         feeResultVo7.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getFirstRetailProportion()!=null?fcOrderFeeVo.getFirstRetailProportion():"-");
         feeResultVo7.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getFirstRetailPremiums()!=null?fcOrderFeeVo.getFirstRetailPremiums():"-");
+        feeResultVo7.setJqFeeRateAll(feeResultVo7.getJqFeeRate());
+        feeResultVo7.setJqFeeAmountAll(feeResultVo7.getJqFeeAmount());
+        feeResultVo7.setSyFeeRateAll(feeResultVo7.getSyFeeRate());
+        feeResultVo7.setSyFeeAmountAll(feeResultVo7.getSyFeeAmount());
+        feeResultVo7.setFcFeeRateAll(feeResultVo7.getFcFeeRate());
+        feeResultVo7.setFcFeeAmountAll(feeResultVo7.getFcFeeAmount());
         resultList.add(feeResultVo7);
         //二级分销费
         QueryOrderFeeResultVo feeResultVo8=new QueryOrderFeeResultVo();
@@ -1603,6 +1609,12 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         feeResultVo8.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getSecondRetailPremiums()!=null?syOrderFeeVo.getSecondRetailPremiums():"-");
         feeResultVo8.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getSecondRetailProportion()!=null?fcOrderFeeVo.getSecondRetailProportion():"-");
         feeResultVo8.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getSecondRetailPremiums()!=null?fcOrderFeeVo.getSecondRetailPremiums():"-");
+        feeResultVo8.setJqFeeRateAll(feeResultVo8.getJqFeeRate());
+        feeResultVo8.setJqFeeAmountAll(feeResultVo8.getJqFeeAmount());
+        feeResultVo8.setSyFeeRateAll(feeResultVo8.getSyFeeRate());
+        feeResultVo8.setSyFeeAmountAll(feeResultVo8.getSyFeeAmount());
+        feeResultVo8.setFcFeeRateAll(feeResultVo8.getFcFeeRate());
+        feeResultVo8.setFcFeeAmountAll(feeResultVo8.getFcFeeAmount());
         resultList.add(feeResultVo8);
         //三级分销费
         QueryOrderFeeResultVo feeResultVo9=new QueryOrderFeeResultVo();
@@ -1614,6 +1626,12 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         feeResultVo9.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getThirdRetailPremiums()!=null?syOrderFeeVo.getThirdRetailPremiums():"-");
         feeResultVo9.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getThirdRetailProportion()!=null?fcOrderFeeVo.getThirdRetailProportion():"-");
         feeResultVo9.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getThirdRetailPremiums()!=null?fcOrderFeeVo.getThirdRetailPremiums():"-");
+        feeResultVo9.setJqFeeRateAll(feeResultVo9.getJqFeeRate());
+        feeResultVo9.setJqFeeAmountAll(feeResultVo9.getJqFeeAmount());
+        feeResultVo9.setSyFeeRateAll(feeResultVo9.getSyFeeRate());
+        feeResultVo9.setSyFeeAmountAll(feeResultVo9.getSyFeeAmount());
+        feeResultVo9.setFcFeeRateAll(feeResultVo9.getFcFeeRate());
+        feeResultVo9.setFcFeeAmountAll(feeResultVo9.getFcFeeAmount());
         resultList.add(feeResultVo9);
         return resultList;
     }