|
@@ -216,7 +216,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
rechargeAccountService.delByRechargeId(recharge.getId());
|
|
rechargeAccountService.delByRechargeId(recharge.getId());
|
|
rechargeAccountService.saveBatch(accountList);
|
|
rechargeAccountService.saveBatch(accountList);
|
|
//添 拒绝记录
|
|
//添 拒绝记录
|
|
- insertRecord(recharge.getId(), oldRecharge.getApplicanterId(), oldRecharge.getAuditStatus(), oldRecharge.getApprovalContent(), oldRecharge.getFiles(), oldRecharge.getUpdateTime());
|
|
|
|
|
|
+ insertRecord(recharge.getId(), oldRecharge.getReviewederId(), oldRecharge.getAuditStatus(), oldRecharge.getApprovalContent(), oldRecharge.getFiles(), oldRecharge.getUpdateTime());
|
|
//添加申请记录 -1 退回修改
|
|
//添加申请记录 -1 退回修改
|
|
insertRecord(recharge.getId(), recharge.getApplicanterId(), "-1", null, recharge.getFiles(), new Date());
|
|
insertRecord(recharge.getId(), recharge.getApplicanterId(), "-1", null, recharge.getFiles(), new Date());
|
|
//消息通知内容
|
|
//消息通知内容
|
|
@@ -250,11 +250,9 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
String reviewederId = oldRecharge.getReviewederId();
|
|
String reviewederId = oldRecharge.getReviewederId();
|
|
String auditStatus = recharge.getAuditStatus();//1-待审核、2-待充值、3-充值完成、4-临时充值、5-审核拒绝
|
|
String auditStatus = recharge.getAuditStatus();//1-待审核、2-待充值、3-充值完成、4-临时充值、5-审核拒绝
|
|
if ("2".equals(auditStatus)) {
|
|
if ("2".equals(auditStatus)) {
|
|
- recharge.setReviewederId(recharge.getUserId());
|
|
|
|
- SysUser user = userService.getById(recharge.getUserId());
|
|
|
|
- if (!Check.isNull(user)) {
|
|
|
|
- recharge.setRevieweder(user.getRealname());
|
|
|
|
- }
|
|
|
|
|
|
+ recharge.setReviewederId("meidaManager");
|
|
|
|
+ recharge.setRevieweder("-");
|
|
|
|
+
|
|
this.updateById(recharge);
|
|
this.updateById(recharge);
|
|
JSONObject oldData = JSONObject.parseObject(JSONObject.toJSONString(oldRecharge)).toJavaObject(JSONObject.class);
|
|
JSONObject oldData = JSONObject.parseObject(JSONObject.toJSONString(oldRecharge)).toJavaObject(JSONObject.class);
|
|
JSONObject amount = rechargeAccountService.queryAmounts(recharge.getId());
|
|
JSONObject amount = rechargeAccountService.queryAmounts(recharge.getId());
|
|
@@ -325,7 +323,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
}
|
|
}
|
|
this.updateById(recharge);
|
|
this.updateById(recharge);
|
|
//添加审核记录
|
|
//添加审核记录
|
|
- insertRecord(recharge.getId(), oldApplication.getRevieweder(), auditStatus, oldApplication.getApprovalContent(), oldApplication.getFiles(), oldApplication.getUpdateTime());
|
|
|
|
|
|
+ insertRecord(recharge.getId(), oldApplication.getReviewederId(), auditStatus, oldApplication.getApprovalContent(), oldApplication.getFiles(), oldApplication.getUpdateTime());
|
|
}
|
|
}
|
|
return Result.ok();
|
|
return Result.ok();
|
|
}
|
|
}
|
|
@@ -350,7 +348,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
}
|
|
}
|
|
|
|
|
|
private void insertRecord(Long rechargeId, String operatorId, String status, String txt, String files, Date time) {
|
|
private void insertRecord(Long rechargeId, String operatorId, String status, String txt, String files, Date time) {
|
|
- if ("1".equals(status) || "2".equals(status)) {
|
|
|
|
|
|
+ if ("2".equals(status)) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
FinancePaymentRechargeApplicationRecord record = new FinancePaymentRechargeApplicationRecord();
|
|
FinancePaymentRechargeApplicationRecord record = new FinancePaymentRechargeApplicationRecord();
|