|
|
@@ -1442,15 +1442,15 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
TOrderPublicReleaseCount out = tOrderPublicReleaseCountMapper.selectByOrderNo(e.getOrderNo());
|
|
|
if(!expenseAccounts.isEmpty()){
|
|
|
for (ExpenseAccount ea : expenseAccounts) {
|
|
|
- count=count.add(ea.getAmount());
|
|
|
+ count=count.add(ea.getRealAmount());
|
|
|
Admin admin = adminMapper.selectByPrimaryKey(ea.getAid());
|
|
|
if (admin.getPosition()!=null){
|
|
|
if (admin.getPosition().equals("1")){
|
|
|
- yxyCount=yxyCount.add(ea.getAmount());
|
|
|
+ yxyCount=yxyCount.add(ea.getRealAmount());
|
|
|
}else if (admin.getPosition().equals("0")){
|
|
|
- zxsCount=zxsCount.add(ea.getAmount());
|
|
|
+ zxsCount=zxsCount.add(ea.getRealAmount());
|
|
|
}else {
|
|
|
- qtCount=qtCount.add(ea.getAmount());
|
|
|
+ qtCount=qtCount.add(ea.getRealAmount());
|
|
|
}
|
|
|
}
|
|
|
}
|