|
|
@@ -89,8 +89,10 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
TOrderNew onew = new TOrderNew();
|
|
|
onew.setOrderNo(orderNo);
|
|
|
onew.setDeleteSign(0);//正常
|
|
|
- onew.setProcessStatus(2);//已派财务管理员
|
|
|
onew.setApproval(approval);//特批状态
|
|
|
+ if(approval == 0){
|
|
|
+ onew.setProcessStatus(2);//已派财务管理员
|
|
|
+ }
|
|
|
onew.setOrderStatus(2);//营销管理员审核通过
|
|
|
|
|
|
int idCount = tOrderNewMapper.getCountByIdAndStatus(onew);
|
|
|
@@ -198,7 +200,11 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
if(null != o.getTechnicianId()){
|
|
|
bonus.setGrantTarget(o.getTechnicianId());
|
|
|
bonus.setGrantType(1);
|
|
|
- bonusMapper.insertSelective(bonus);
|
|
|
+ int c = bonusMapper.checkByOnoAndSub(bonus);
|
|
|
+ //不存在就设置
|
|
|
+ if(c==0){
|
|
|
+ bonusMapper.insertSelective(bonus);
|
|
|
+ }
|
|
|
//发送邮件
|
|
|
// Admin oo = adminMapper.selectAllByid(o.getTechnicianId());
|
|
|
// AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
@@ -219,6 +225,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
TOrderBonus b = new TOrderBonus();
|
|
|
b.setOrderNo(billNew.getOrderNo());
|
|
|
b.setBonusSubject(11);
|
|
|
+ b.setGrantType(0);
|
|
|
int c = bonusMapper.checkByOnoAndSub(b);
|
|
|
//不存在就设置
|
|
|
if(c==0){
|