master
hellolujian 6 years ago
parent 8b0dc466e9
commit bf5467a5ad

@ -7,6 +7,7 @@ import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
import au.com.royalpay.payment.manage.notice.core.MailService; import au.com.royalpay.payment.manage.notice.core.MailService;
import au.com.royalpay.payment.manage.riskbusiness.core.RiskBusinessService; import au.com.royalpay.payment.manage.riskbusiness.core.RiskBusinessService;
import au.com.royalpay.payment.manage.riskbusiness.core.RiskUploadService; import au.com.royalpay.payment.manage.riskbusiness.core.RiskUploadService;
import au.com.royalpay.payment.manage.riskbusiness.enums.RiskResultTypeEnum;
import au.com.royalpay.payment.tools.exceptions.BadRequestException; import au.com.royalpay.payment.tools.exceptions.BadRequestException;
import au.com.royalpay.payment.tools.threadpool.RoyalThreadPoolExecutor; import au.com.royalpay.payment.tools.threadpool.RoyalThreadPoolExecutor;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@ -44,7 +45,7 @@ public class RiskUploadServiceIpml implements RiskUploadService {
public void submitMaterial(JSONObject material) { public void submitMaterial(JSONObject material) {
riskMaterialMapper.save(material); riskMaterialMapper.save(material);
JSONObject event = riskEventMapper.findById(material.getString("risk_id")); JSONObject event = riskEventMapper.findById(material.getString("risk_id"));
event.put("result_type",2); event.put("result_type", RiskResultTypeEnum.WAIT_FOR_AUDIT.getResultType());
riskEventMapper.update(event); riskEventMapper.update(event);
JSONObject operator = riskMaterialMapper.findOperatorById(material.getString("risk_id")); JSONObject operator = riskMaterialMapper.findOperatorById(material.getString("risk_id"));
if(operator.containsKey("email")){ if(operator.containsKey("email")){

@ -275,7 +275,6 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
type: 'error' type: 'error'
}); });
}); });
} }
} }
]); ]);
@ -300,9 +299,9 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
if ($scope.riskEvent.receive_email_date == null) if ($scope.riskEvent.receive_email_date == null)
$scope.riskEvent.receive_email_date = new Date(); $scope.riskEvent.receive_email_date = new Date();
// 默认设置邮件回复截止日期为收到邮件的七天后 // 默认设置邮件回复截止日期为收到邮件的七天后,如果是内部调单,设置三天后
var replyDeadline = angular.copy($scope.riskEvent.receive_email_date); var replyDeadline = angular.copy($scope.riskEvent.receive_email_date);
if ($scope.riskEvent.order_type == 3) if ($scope.riskEvent.order_type > 2)
replyDeadline.setDate(replyDeadline.getDate() + 3); replyDeadline.setDate(replyDeadline.getDate() + 3);
else else
replyDeadline.setDate(replyDeadline.getDate() + 7); replyDeadline.setDate(replyDeadline.getDate() + 7);

Loading…
Cancel
Save