|
@@ -114,7 +114,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
|
data.put("projectName", project.getProjectName());
|
|
|
}
|
|
|
Date createTime = new Date();
|
|
|
- Thread.sleep(800);
|
|
|
+ Thread.sleep(1000);
|
|
|
//判断审核人和状态
|
|
|
getReviewedRole(recharge);
|
|
|
recharge.setPoolId(pool.getId());
|
|
@@ -136,6 +136,15 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
|
UserAllocation allocation = userAllocationService.getByAccountId(obj.getLong("accountId"));
|
|
|
if (!Check.isNull(allocation)) {
|
|
|
account.setAccountName(allocation.getAuthName());
|
|
|
+ account.setProjectId(allocation.getProjectId());
|
|
|
+ }
|
|
|
+ JSONObject productObj = userAllocationService.getProductInfo(obj.getLong("accountId"));
|
|
|
+ if (Check.isNull(productObj)) {
|
|
|
+ account.setProductId(recharge.getProductId());
|
|
|
+ account.setProductName(recharge.getProductName());
|
|
|
+ } else {
|
|
|
+ account.setProductId(productObj.getLong("id"));
|
|
|
+ account.setProductName(productObj.getString("product_name"));
|
|
|
}
|
|
|
account.setCashAmount(obj.getBigDecimal("cashAmount"));
|
|
|
account.setReceivedAmount(obj.getBigDecimal("receivedAmount"));
|
|
@@ -147,6 +156,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
|
}
|
|
|
rechargeAccountService.saveBatch(accountList);
|
|
|
data.put("displayAmount", displayAmount);
|
|
|
+ data.put("amends",recharge.getAmends());
|
|
|
//消息通知内容
|
|
|
String message = null;
|
|
|
List<SysUser> users = null;
|
|
@@ -206,7 +216,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
|
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(800);
|
|
|
+ Thread.sleep(1000);
|
|
|
|
|
|
this.updateById(recharge);
|
|
|
|
|
@@ -237,6 +247,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
|
rechargeAccountService.saveBatch(accountList);
|
|
|
|
|
|
data.put("displayAmount", displayAmount);
|
|
|
+ data.put("amends",recharge.getAmends());
|
|
|
//消息通知内容
|
|
|
String message = null;
|
|
|
List<SysUser> users = null;
|
|
@@ -272,6 +283,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
|
//添加审核记录 1:财务审核完成
|
|
|
insertRecord(recharge.getId(), recharge.getUserId(), "6", recharge.getApprovalContent(), recharge.getFiles(), new Date());
|
|
|
JSONObject oldData = JSONObject.parseObject(JSONObject.toJSONString(oldRecharge)).toJavaObject(JSONObject.class);
|
|
|
+ oldData.put("amends",oldRecharge.getAmends());
|
|
|
JSONObject amount = rechargeAccountService.queryAmounts(recharge.getId());
|
|
|
if (!Check.isNull(amount)) {
|
|
|
oldData.put("accountIds", amount.getString("accountIds"));
|
|
@@ -294,6 +306,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
|
poolService.reduce(oldRecharge, null);
|
|
|
|
|
|
JSONObject oldData = JSONObject.parseObject(JSONObject.toJSONString(oldRecharge)).toJavaObject(JSONObject.class);
|
|
|
+ oldData.put("amends",oldRecharge.getAmends());
|
|
|
JSONObject amount = rechargeAccountService.queryAmounts(recharge.getId());
|
|
|
if (!Check.isNull(amount)) {
|
|
|
oldData.put("accountIds", amount.getString("accountIds"));
|
|
@@ -317,6 +330,7 @@ public class FinancePaymentRechargeApplicationServiceImpl extends ServiceImpl<Fi
|
|
|
//添加审核记录
|
|
|
insertRecord(recharge.getId(), recharge.getUserId(), oldRecharge.getAuditStatus(), oldRecharge.getApprovalContent(), oldRecharge.getFiles(), oldRecharge.getUpdateTime());
|
|
|
JSONObject oldData = JSONObject.parseObject(JSONObject.toJSONString(oldRecharge)).toJavaObject(JSONObject.class);
|
|
|
+ oldData.put("amends",oldRecharge.getAmends());
|
|
|
String failMessage = null;
|
|
|
List<SysUser> users = null;
|
|
|
if ("financialReview".equals(oldRecharge.getReviewederId())) {
|