Commit 05752a0a by zhiwj

修改bug

parent 5409ea70
......@@ -2,6 +2,7 @@ package com.gic.enterprise.service.impl;
import com.gic.auth.dto.UserDTO;
import com.gic.auth.service.UserApiService;
import com.gic.enterprise.config.Config;
import com.gic.enterprise.constant.Constants;
import com.gic.enterprise.dao.mapper.TabBillingAccountMapper;
import com.gic.enterprise.entity.TabBillingAccount;
......@@ -28,6 +29,8 @@ public class BillingAccountServiceImpl implements BillingAccountService{
private TodoItemService todoItemService;
@Autowired
private UserApiService userApiService;
@Autowired
private Config config;
@Override
public TabBillingAccount getByEnterpriseId(Integer enterpriseId) {
......@@ -51,7 +54,7 @@ public class BillingAccountServiceImpl implements BillingAccountService{
double newTotal = new BigDecimal(tabBillingAccount.getAccountBalance().toString()).add(new BigDecimal(totalFee + "")).doubleValue();
logger.info("商户:{}, 充值/退款前余额:{}, 充值/退款金额:{}, 充值/退款后余额:{}", enterpriseId, tabBillingAccount.getAccountBalance(), totalFee, newTotal);
UserDTO user = userApiService.getUserByEnterpriseId(enterpriseId).getResult();
todoItemService.finishTodoItem(enterpriseId, user.getUserId(), Constants.PRODUCT, Constants.TODO_ITEM_ACCOUNT_BALANCE_URL);
todoItemService.finishTodoItem(enterpriseId, user.getUserId(), Constants.PRODUCT, config.getHost() + Constants.TODO_ITEM_ACCOUNT_BALANCE_URL);
return tabBillingAccountMapper.updateAccountAfterRechargeOrRefund(totalFee, enterpriseId);
}
......
......@@ -170,7 +170,7 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
// 事项code
todoItemDTO.setItemType(com.gic.enterprise.constant.Constants.TODO_ITEM_AUDIT);
// 事项url
todoItemDTO.setItemInfoUrl(com.gic.enterprise.constant.Constants.TODO_ITEM_AUDIT_URL + "?auditLogId=" + auditLogId);
todoItemDTO.setItemInfoUrl(config.getHost() + com.gic.enterprise.constant.Constants.TODO_ITEM_AUDIT_URL + "?auditLogId=" + auditLogId);
todoItemApiService.saveTodoItem(todoItemDTO);
}
}
......@@ -205,7 +205,8 @@ public class AuditLogApiServiceImpl implements AuditLogApiService {
@Transactional(rollbackFor = Exception.class)
public ServiceResponse<AuditLogDTO> audit(AuditLogDTO auditLogDTO) {
// 完成待办事项
todoItemApiService.finishTodoItem(auditLogDTO.getEnterpriseId(), auditLogDTO.getAuditorId(), com.gic.enterprise.constant.Constants.TODO_ITEM_AUDIT, com.gic.enterprise.constant.Constants.TODO_ITEM_AUDIT_URL + "?auditLogId=" + auditLogDTO.getAuditLogId());
todoItemApiService.finishTodoItem(auditLogDTO.getEnterpriseId(), auditLogDTO.getAuditorId(), com.gic.enterprise.constant.Constants.TODO_ITEM_AUDIT,
config + com.gic.enterprise.constant.Constants.TODO_ITEM_AUDIT_URL + "?auditLogId=" + auditLogDTO.getAuditLogId());
TabAuditLog auditLog = this.auditLogService.getAuditById(auditLogDTO.getAuditLogId());
if (auditLog == null) {
......
......@@ -260,7 +260,7 @@ public class BillingAccountApiServiceImpl implements BillingAccountApiService {
// 事项code 在运维后台字典配置 类目:待办事项类型
todoItemDTO.setItemType(Constants.PRODUCT);
// 跳转地址 待办事项点击后要跳转的地址
todoItemDTO.setItemInfoUrl(Constants.TODO_ITEM_ACCOUNT_BALANCE_URL);
todoItemDTO.setItemInfoUrl(config.getHost() + Constants.TODO_ITEM_ACCOUNT_BALANCE_URL);
todoItemApiService.saveTodoItem(todoItemDTO);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment