|
@@ -85,37 +85,42 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public Result add(JSONObject data) {
|
|
public Result add(JSONObject data) {
|
|
- JSONArray list = data.getJSONArray("list");
|
|
|
|
- FinancePaymentRechargeApplication recharge = JSONObject.parseObject(JSONObject.toJSONString(data), FinancePaymentRechargeApplication.class);
|
|
|
|
- FinancePaymentPool pool = financePaymentPoolService.getIdByUniqueKey(recharge.getAdvertiserId(), recharge.getProductId(), recharge.getPaymentMedia());
|
|
|
|
- if (Check.isNull(pool) || Check.isNull(list)) {
|
|
|
|
- return Result.error("数据异常");
|
|
|
|
- }
|
|
|
|
- SysUser user = userService.getById(recharge.getApplicanterId());
|
|
|
|
- if (!Check.isNull(user)) {
|
|
|
|
- recharge.setApplicanter(user.getRealname());
|
|
|
|
- }
|
|
|
|
- Product product = productService.getById(recharge.getProductId());
|
|
|
|
- if (!Check.isNull(product)) {
|
|
|
|
- recharge.setProductName(product.getProductName());
|
|
|
|
- data.put("productName", product.getProductName());
|
|
|
|
- }
|
|
|
|
- List<String> advertiserIds = Arrays.asList(recharge.getAdvertiserId().split(","));
|
|
|
|
- Advertiser advertiser = advertiserService.getById(advertiserIds.get(0));
|
|
|
|
- if (!Check.isNull(advertiser)) {
|
|
|
|
- recharge.setAdvertiserName(advertiser.getName());
|
|
|
|
- data.put("advertiserName", advertiser.getName());
|
|
|
|
- }
|
|
|
|
- Project project = projectService.getById(recharge.getProjectId());
|
|
|
|
- if (!Check.isNull(project)) {
|
|
|
|
- recharge.setProjectName(project.getProjectName());
|
|
|
|
- data.put("projectName", project.getProjectName());
|
|
|
|
- }
|
|
|
|
- //判断审核人和状态
|
|
|
|
- getReviewedRole(recharge);
|
|
|
|
- recharge.setPoolId(pool.getId());
|
|
|
|
- boolean save = this.save(recharge);
|
|
|
|
- if (save) {
|
|
|
|
|
|
+ try {
|
|
|
|
+ JSONArray list = data.getJSONArray("list");
|
|
|
|
+ FinancePaymentRechargeApplication recharge = JSONObject.parseObject(JSONObject.toJSONString(data), FinancePaymentRechargeApplication.class);
|
|
|
|
+ FinancePaymentPool pool = financePaymentPoolService.getIdByUniqueKey(recharge.getAdvertiserId(), recharge.getProductId(), recharge.getPaymentMedia());
|
|
|
|
+ if (Check.isNull(pool) || Check.isNull(list)) {
|
|
|
|
+ return Result.error("数据异常");
|
|
|
|
+ }
|
|
|
|
+ SysUser user = userService.getById(recharge.getApplicanterId());
|
|
|
|
+ if (!Check.isNull(user)) {
|
|
|
|
+ recharge.setApplicanter(user.getRealname());
|
|
|
|
+ }
|
|
|
|
+ Product product = productService.getById(recharge.getProductId());
|
|
|
|
+ if (!Check.isNull(product)) {
|
|
|
|
+ recharge.setProductName(product.getProductName());
|
|
|
|
+ data.put("productName", product.getProductName());
|
|
|
|
+ }
|
|
|
|
+ List<String> advertiserIds = Arrays.asList(recharge.getAdvertiserId().split(","));
|
|
|
|
+ Advertiser advertiser = advertiserService.getById(advertiserIds.get(0));
|
|
|
|
+ if (!Check.isNull(advertiser)) {
|
|
|
|
+ recharge.setAdvertiserName(advertiser.getName());
|
|
|
|
+ data.put("advertiserName", advertiser.getName());
|
|
|
|
+ }
|
|
|
|
+ Project project = projectService.getById(recharge.getProjectId());
|
|
|
|
+ if (!Check.isNull(project)) {
|
|
|
|
+ recharge.setProjectName(project.getProjectName());
|
|
|
|
+ data.put("projectName", project.getProjectName());
|
|
|
|
+ }
|
|
|
|
+ //判断审核人和状态
|
|
|
|
+ getReviewedRole(recharge);
|
|
|
|
+ recharge.setPoolId(pool.getId());
|
|
|
|
+ //添加申请记录
|
|
|
|
+ insertRecord(recharge.getId(), recharge.getApplicanterId(), "0", null, recharge.getFiles(), new Date());
|
|
|
|
+
|
|
|
|
+ Thread.sleep(100);
|
|
|
|
+
|
|
|
|
+ this.save(recharge);
|
|
//添加充值账户信息
|
|
//添加充值账户信息
|
|
List<FinancePaymentRechargeAccount> accountList = new ArrayList<>();
|
|
List<FinancePaymentRechargeAccount> accountList = new ArrayList<>();
|
|
String accountIds = "";
|
|
String accountIds = "";
|
|
@@ -137,8 +142,6 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
accountIds += obj.getLong("accountId") + ",";
|
|
accountIds += obj.getLong("accountId") + ",";
|
|
}
|
|
}
|
|
rechargeAccountService.saveBatch(accountList);
|
|
rechargeAccountService.saveBatch(accountList);
|
|
- //添加申请记录
|
|
|
|
- insertRecord(recharge.getId(), recharge.getApplicanterId(), "0", null, recharge.getFiles(), new Date());
|
|
|
|
//消息通知内容
|
|
//消息通知内容
|
|
String message = null;
|
|
String message = null;
|
|
List<SysUser> users = null;
|
|
List<SysUser> users = null;
|
|
@@ -155,12 +158,14 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
for (SysUser u : users) {
|
|
for (SysUser u : users) {
|
|
sendMessageService.sendMessage(u.getId(), message);
|
|
sendMessageService.sendMessage(u.getId(), message);
|
|
}
|
|
}
|
|
|
|
+ } catch (InterruptedException e) {
|
|
|
|
+ e.printStackTrace();
|
|
}
|
|
}
|
|
return Result.ok();
|
|
return Result.ok();
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public Result<Object> edit(JSONObject data) {
|
|
|
|
|
|
+ public Result<Object> edit(JSONObject data) throws InterruptedException {
|
|
JSONArray list = data.getJSONArray("list");
|
|
JSONArray list = data.getJSONArray("list");
|
|
FinancePaymentRechargeApplication recharge = JSONObject.parseObject(JSONObject.toJSONString(data), FinancePaymentRechargeApplication.class);
|
|
FinancePaymentRechargeApplication recharge = JSONObject.parseObject(JSONObject.toJSONString(data), FinancePaymentRechargeApplication.class);
|
|
FinancePaymentRechargeApplication oldRecharge = this.getById(recharge.getId());
|
|
FinancePaymentRechargeApplication oldRecharge = this.getById(recharge.getId());
|
|
@@ -191,6 +196,13 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
//判断审核人和状态
|
|
//判断审核人和状态
|
|
getReviewedRole(recharge);
|
|
getReviewedRole(recharge);
|
|
recharge.setPoolId(pool.getId());
|
|
recharge.setPoolId(pool.getId());
|
|
|
|
+
|
|
|
|
+ //添 拒绝记录
|
|
|
|
+ insertRecord(recharge.getId(), oldRecharge.getReviewederId(), oldRecharge.getAuditStatus(), oldRecharge.getApprovalContent(), oldRecharge.getFiles(), oldRecharge.getUpdateTime());
|
|
|
|
+ //添加申请记录 -1 退回修改
|
|
|
|
+ insertRecord(recharge.getId(), recharge.getApplicanterId(), "-1", null, recharge.getFiles(), new Date());
|
|
|
|
+ Thread.sleep(100);
|
|
|
|
+
|
|
this.updateById(recharge);
|
|
this.updateById(recharge);
|
|
|
|
|
|
//添加充值账户信息
|
|
//添加充值账户信息
|
|
@@ -215,10 +227,6 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
}
|
|
}
|
|
rechargeAccountService.delByRechargeId(recharge.getId());
|
|
rechargeAccountService.delByRechargeId(recharge.getId());
|
|
rechargeAccountService.saveBatch(accountList);
|
|
rechargeAccountService.saveBatch(accountList);
|
|
- //添 拒绝记录
|
|
|
|
- insertRecord(recharge.getId(), oldRecharge.getReviewederId(), oldRecharge.getAuditStatus(), oldRecharge.getApprovalContent(), oldRecharge.getFiles(), oldRecharge.getUpdateTime());
|
|
|
|
- //添加申请记录 -1 退回修改
|
|
|
|
- insertRecord(recharge.getId(), recharge.getApplicanterId(), "-1", null, recharge.getFiles(), new Date());
|
|
|
|
//消息通知内容
|
|
//消息通知内容
|
|
String message = null;
|
|
String message = null;
|
|
List<SysUser> users = null;
|
|
List<SysUser> users = null;
|
|
@@ -252,8 +260,8 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
if ("2".equals(auditStatus)) {
|
|
if ("2".equals(auditStatus)) {
|
|
recharge.setReviewederId("meidaManager");
|
|
recharge.setReviewederId("meidaManager");
|
|
recharge.setRevieweder("-");
|
|
recharge.setRevieweder("-");
|
|
-
|
|
|
|
- this.updateById(recharge);
|
|
|
|
|
|
+ //添加审核记录 1:财务审核完成
|
|
|
|
+ insertRecord(recharge.getId(), recharge.getUserId(), "6", recharge.getApprovalContent(), recharge.getFiles(), new Date());
|
|
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());
|
|
if (!Check.isNull(amount)) {
|
|
if (!Check.isNull(amount)) {
|
|
@@ -265,8 +273,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
for (SysUser u : users) {
|
|
for (SysUser u : users) {
|
|
sendMessageService.sendMessage(u.getId(), message);
|
|
sendMessageService.sendMessage(u.getId(), message);
|
|
}
|
|
}
|
|
- //添加审核记录 1:财务审核完成
|
|
|
|
- insertRecord(recharge.getId(), recharge.getUserId(), "6", recharge.getApprovalContent(), recharge.getFiles(), new Date());
|
|
|
|
|
|
+ this.updateById(recharge);
|
|
} else if ("3".equals(auditStatus) || "4".equals(auditStatus)) {
|
|
} else if ("3".equals(auditStatus) || "4".equals(auditStatus)) {
|
|
recharge.setReviewederId(recharge.getUserId());
|
|
recharge.setReviewederId(recharge.getUserId());
|
|
SysUser user = userService.getById(recharge.getUserId());
|
|
SysUser user = userService.getById(recharge.getUserId());
|
|
@@ -348,7 +355,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 ("1".equals(status) || "2".equals(status)) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
FinancePaymentRechargeApplicationRecord record = new FinancePaymentRechargeApplicationRecord();
|
|
FinancePaymentRechargeApplicationRecord record = new FinancePaymentRechargeApplicationRecord();
|