Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/overheadline/service/OverheadLineService.java

@@ -650,6 +650,7 @@ public List<JkxlDetailFee> findList(String id,String type){
                  for (JkxlDetailFee jkxlDetailFee1 : list) {
                     double rate = jkxlDetailFee1.getOriginalFbrCost() / fbrfee;
                     jkxlDetailFee1.setOriginalFbrCost(jkxlDetailFee1.getOriginalFbrCost() + cs * rate);
+                     jkxlDetailFee1.setTex(jkxlDetailFee1.getTex() - (cs * rate)*texRate);
                     jkxlDetailFee1.setTotalFee(jkxlDetailFee1.getTotalFee() - cs * rate);
                   }
                }
@@ -735,6 +736,7 @@ public List<JkxlDetailFee> findList(String id,String type){
                     for (JkxlDetailFee jkxlDetailFee1 : list) {
                         double rate = jkxlDetailFee1.getOriginalFbrCost() / fbrfee;
                         jkxlDetailFee1.setOriginalFbrCost(jkxlDetailFee1.getOriginalFbrCost() + cs * rate);
+                        jkxlDetailFee1.setTex(jkxlDetailFee1.getTex() - (cs * rate)*texRate);
                         jkxlDetailFee1.setTotalFee(jkxlDetailFee1.getTotalFee() - cs * rate);
                     }
                 }
@@ -887,6 +889,7 @@ public List<JkxlDetailFee> findList(String id,String type){
                     for (JkxlDetailFee jkxlDetailFee1 : list) {
                         double rate = jkxlDetailFee1.getOriginalFbrCost() / fbrfee;
                         jkxlDetailFee1.setOriginalFbrCost(jkxlDetailFee1.getOriginalFbrCost() + cs * rate);
+                        jkxlDetailFee1.setTex(jkxlDetailFee1.getTex() - (cs * rate)*texRate);
                         jkxlDetailFee1.setTotalFee(jkxlDetailFee1.getTotalFee() - cs * rate);
                     }
                 }