|
|
@@ -121,7 +121,8 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
|
|
|
int i=tOrderInvoiceMapper.updateByPrimaryKeySelective(o);
|
|
|
pushOrderInvoiceExamine(o);
|
|
|
if (o.getApproval()==0){
|
|
|
- String startTime = DateUtils.formatDate(o.getCreateTime(),AFTConstants.YYYYMMDD);
|
|
|
+ TOrderInvoice use = tOrderInvoiceMapper.selectByPrimaryKey(o.getId());
|
|
|
+ String startTime = DateUtils.formatDate(use.getCreateTime(),AFTConstants.YYYYMMDD);
|
|
|
Admin admin = adminMapper.selectOrderByFinanacial(o.getOrderNo());
|
|
|
FinanceCount financeCount = financeCountMapper.selectByAidAndDates(admin.getId(), startTime);
|
|
|
addFinanceCount(startTime, admin, financeCount);
|
|
|
@@ -392,8 +393,12 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
|
|
|
}else if(o.getType()==1) {
|
|
|
aids.addAll(adminMapper.listNameByDepAndName(ts.getOrderDep(), AFTConstants.SALESMAN_ADMIN));
|
|
|
}
|
|
|
-
|
|
|
+ String startTime = DateUtils.formatDate(o.getCreateTime(),AFTConstants.YYYYMMDD);
|
|
|
+ Admin admin = adminMapper.selectOrderByFinanacial(o.getOrderNo());
|
|
|
+ FinanceCount financeCount = financeCountMapper.selectByAidAndDates(admin.getId(), startTime);
|
|
|
+ addFinanceCount(startTime,admin,financeCount);
|
|
|
}
|
|
|
+
|
|
|
pushOrderInvoiceExamine(t);
|
|
|
TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(o.getOrderNo());
|
|
|
pushGeneralSendNoticeAndEmail(aids,type,order, TokenManager.getAdminId(),0);
|