md
This commit is contained in:
parent
5bfeb2e344
commit
7e8949fad7
@ -279,6 +279,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
|
|||||||
EmisTransLine transLine=getTransLineByCode(waybill.getTransLineType());
|
EmisTransLine transLine=getTransLineByCode(waybill.getTransLineType());
|
||||||
|
|
||||||
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
|
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
|
||||||
|
emisCommissionQuote.setSendSiteCode(waybill.getSendSiteCode());
|
||||||
emisCommissionQuote.setCountry(waybill.getReceiveCountry());
|
emisCommissionQuote.setCountry(waybill.getReceiveCountry());
|
||||||
emisCommissionQuote.setFromCountry(waybill.getSendCountry());
|
emisCommissionQuote.setFromCountry(waybill.getSendCountry());
|
||||||
emisCommissionQuote.setTransLine(waybill.getTransLineType());
|
emisCommissionQuote.setTransLine(waybill.getTransLineType());
|
||||||
@ -401,6 +402,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
|
|||||||
EmisTransLine transLine=getTransLineByCode(waybill.getTransLineType());
|
EmisTransLine transLine=getTransLineByCode(waybill.getTransLineType());
|
||||||
|
|
||||||
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
|
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
|
||||||
|
emisCommissionQuote.setSendSiteCode(waybill.getSendSiteCode());
|
||||||
emisCommissionQuote.setCountry(waybill.getReceiveCountry());
|
emisCommissionQuote.setCountry(waybill.getReceiveCountry());
|
||||||
emisCommissionQuote.setFromCountry(waybill.getSendCountry());
|
emisCommissionQuote.setFromCountry(waybill.getSendCountry());
|
||||||
emisCommissionQuote.setTransLine(waybill.getTransLineType());
|
emisCommissionQuote.setTransLine(waybill.getTransLineType());
|
||||||
@ -585,7 +587,6 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
|
|||||||
profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString());
|
profitMoney = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// 插入提成
|
// 插入提成
|
||||||
if(BigDecimal.valueOf(profitMoney).compareTo(BigDecimal.ZERO)>0) {
|
if(BigDecimal.valueOf(profitMoney).compareTo(BigDecimal.ZERO)>0) {
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user