|
|
@@ -520,6 +520,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
// order.setProcessStatus(ProcessStatus.CWZDSH.getCode());
|
|
|
// pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_YES.getCode(),order, TokenManager.getAdminId(), use.getApproval());
|
|
|
// }else {
|
|
|
+
|
|
|
pushNoticeAndEmail(t, use);
|
|
|
|
|
|
// }
|
|
|
@@ -540,15 +541,20 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
private void pushNoticeAndEmail(TOrderNew t, TOrderNew new1) {
|
|
|
List<String> aids = new ArrayList<>();
|
|
|
StringBuffer str= new StringBuffer();
|
|
|
boolean flag= false;
|
|
|
TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
|
|
|
+
|
|
|
+
|
|
|
//如果订单是特批
|
|
|
if (new1.getApproval()==ApprovalNewState.TPDSH.getCode()|| new1.getApproval()==ApprovalNewState.TPBH.getCode()) {
|
|
|
- //未设置跳过
|
|
|
- if (order.getApprovalStatus()==0){
|
|
|
+ if (order.getOperationGuaranteeId()!=null){
|
|
|
+ t.setProcessStatus(ProcessStatus.YYBZSH.getCode());
|
|
|
+ str.append(order.getApprovalName()).append(",");
|
|
|
+ } else if (order.getApprovalStatus()==0){
|
|
|
t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
|
t.setApproval(ApprovalNewState.TPTG.getCode());
|
|
|
flag=true;
|
|
|
@@ -558,15 +564,21 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
str.append(order.getApprovalName()).append(",");
|
|
|
}
|
|
|
}else if (new1.getApproval()==ApprovalNewState.DSZDSH.getCode()|| new1.getApproval()==ApprovalNewState.DSZBH.getCode()) {
|
|
|
- t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
|
|
|
- List<String> types=new ArrayList<>();
|
|
|
- //董事长加助理
|
|
|
- types.add(AFTConstants.APPROVAL_DECISION);
|
|
|
- types.add(AFTConstants.APPROVAL_DECISION_ASSISTANT);
|
|
|
- for (Admin admin : adminMapper.getAdminRoleTypesList(types)) {
|
|
|
- aids.add(admin.getId());
|
|
|
- str.append(admin.getName()).append(",");
|
|
|
- }
|
|
|
+
|
|
|
+ if (order.getOperationGuaranteeId()!=null){
|
|
|
+ t.setProcessStatus(ProcessStatus.YYBZSH.getCode());
|
|
|
+ str.append(order.getApprovalName()).append(",");
|
|
|
+ }else {
|
|
|
+ t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
|
|
|
+ List<String> types=new ArrayList<>();
|
|
|
+ //董事长加助理
|
|
|
+ types.add(AFTConstants.APPROVAL_DECISION);
|
|
|
+ types.add(AFTConstants.APPROVAL_DECISION_ASSISTANT);
|
|
|
+ for (Admin admin : adminMapper.getAdminRoleTypesList(types)) {
|
|
|
+ aids.add(admin.getId());
|
|
|
+ str.append(admin.getName()).append(",");
|
|
|
+ }
|
|
|
+ }
|
|
|
}else {
|
|
|
t.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());
|
|
|
}
|