|
@@ -163,6 +163,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
|
public Result<Object> edit(JSONObject data) {
|
|
|
JSONArray list = data.getJSONArray("list");
|
|
|
FinancePaymentRechargeApplication recharge = JSONObject.parseObject(JSONObject.toJSONString(data), FinancePaymentRechargeApplication.class);
|
|
|
+ FinancePaymentRechargeApplication oldRecharge = this.getById(recharge.getId());
|
|
|
FinancePaymentPool pool = financePaymentPoolService.getIdByUniqueKey(recharge.getAdvertiserId(), recharge.getProductId(), recharge.getPaymentMedia());
|
|
|
if (Check.isNull(pool) || Check.isNull(list)) {
|
|
|
return Result.error("数据异常");
|
|
@@ -214,7 +215,8 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
|
}
|
|
|
rechargeAccountService.delByRechargeId(recharge.getId());
|
|
|
rechargeAccountService.saveBatch(accountList);
|
|
|
-
|
|
|
+ //添 拒绝记录
|
|
|
+ insertRecord(recharge.getId(), oldRecharge.getApplicanterId(), oldRecharge.getAuditStatus(), oldRecharge.getApprovalContent(), oldRecharge.getFiles(), oldRecharge.getUpdateTime());
|
|
|
//添加申请记录 -1 退回修改
|
|
|
insertRecord(recharge.getId(), recharge.getApplicanterId(), "-1", null, recharge.getFiles(), new Date());
|
|
|
//消息通知内容
|
|
@@ -337,15 +339,20 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
|
String financialReview = recharge.getFinancialReview();
|
|
|
if (!Check.isNull(financialReview) && "1".equals(financialReview)) {
|
|
|
recharge.setReviewederId("financialReview");
|
|
|
+ recharge.setRevieweder("-");
|
|
|
recharge.setAuditStatus("1");//待审核
|
|
|
} else {
|
|
|
//媒介
|
|
|
recharge.setReviewederId("meidaManager");
|
|
|
+ recharge.setRevieweder("-");
|
|
|
recharge.setAuditStatus("2");//待充值
|
|
|
}
|
|
|
}
|
|
|
|
|
|
private void insertRecord(Long rechargeId, String operatorId, String status, String txt, String files, Date time) {
|
|
|
+ if ("1".equals(status) || "2".equals(status)) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
FinancePaymentRechargeApplicationRecord record = new FinancePaymentRechargeApplicationRecord();
|
|
|
record.setRechargeId(rechargeId);
|
|
|
record.setReviewederId(operatorId);
|