Skip to content

G
gic-platform-enterprise
Commit 174a6372 by guojuxing
Options

Merge remote-tracking branch 'origin/developer' into developer

parents 59489d02 7fea3c33
Showing with 39 additions and 13 deletions
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/BillingAccountApiServiceImpl.java
......@@ -64,6 +64,8 @@ public class BillingAccountApiServiceImpl implements BillingAccountApiService {
@Autowired
private EnterpriseWhiteListService enterpriseWhiteListService;
private final int ACCOUNT_NOTICE_LINE = 1000;
@Override
public ServiceResponse<BillingAccountDTO> getByEnterpriseId(Integer enterpriseId) {
TabEnterprise tabEnterprise = enterpriseService.getEnterpriseById(enterpriseId);
......@@ -206,12 +208,12 @@ public class BillingAccountApiServiceImpl implements BillingAccountApiService {
/**
* 获取短信套餐包余额数量
* @Title: getSmsBalanceNumber

* @Title: getSmsBalanceNumber
* @Description:

 * @author guojuxing
* @param enterpriseId

* @return java.lang.Integer


 */
* @author guojuxing
* @param enterpriseId
* @return java.lang.Integer
*/
private Integer getSmsBalanceNumber(Integer enterpriseId) {
List<BillingEnterpriseSmsPackageDTO> list = billingEnterpriseSmsPackageService.listSmsPackage(enterpriseId);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
......@@ -244,14 +246,24 @@ public class BillingAccountApiServiceImpl implements BillingAccountApiService {
LOGGER.info("扣费是否成功:{}", i > 0);
if (i > 0) {
TabBillingAccount account = this.billingAccountService.getByEnterpriseId(enterpriseId);
if (account.getAccountBalance() <= 0) {
if (account.getAccountBalance() < 0) {
Object cache = RedisUtil.getCache("message:" + enterpriseId);
if (cache == null) {
// String content = "您的GIC商户余额已欠费"+(-account.getAccountBalance())+"元，为了不影响业务的开展，请及时<a href='"+config.getHost()+"cost-center/billing-center/recharge'>充值</a>";
String content = "您的GIC商户余额已不足500元，为了不影响业务的开展，请及时<a href='" + config.getHost() + "cost-center/billing-center/recharge'>充值</a>";
String content = "您的达摩账户已欠费， 为避免您的业务受到影响，请及时<a href='" + config.getHost() + "cost-center/billing-center/recharge'>充值</a>";
this.pushMessageApiService.pushMessage(enterpriseId, "系统消息", "商户欠费", content);
sendSms(enterpriseId, "GICJFZX012");
// 待办事项
sendTotoItem(enterpriseId);
sendTotoItem(enterpriseId, "您的达摩账户已欠费");
RedisUtil.setCache("message:" + enterpriseId, 1, 1L, TimeUnit.DAYS);
}
} else if (account.getAccountBalance() < ACCOUNT_NOTICE_LINE) {
Object cache = RedisUtil.getCache("message:" + enterpriseId);
if (cache == null) {
String content = "您的达摩账户余额已不足1000元，若账户欠费将中断部分正常业务，请及时<a href='" + config.getHost() + "cost-center/billing-center/recharge'>充值</a>";
this.pushMessageApiService.pushMessage(enterpriseId, "系统消息", "商户欠费", content);
sendSms(enterpriseId, "GICJFZX001");
// 待办事项
sendTotoItem(enterpriseId, "您的达摩账户余额已不足1000元");
RedisUtil.setCache("message:" + enterpriseId, 1, 1L, TimeUnit.DAYS);
}
}
......@@ -266,6 +278,20 @@ public class BillingAccountApiServiceImpl implements BillingAccountApiService {
}
}
private void sendSms(Integer enterpriseId, String sceneId) {
TabEnterprise enterprise = enterpriseService.getEnterpriseById(enterpriseId);
if (isNotInWhiteList(enterpriseId)) {
String[] smsArr = new String[]{enterprise.getEnterpriseName()};
ServiceResponse<UserDTO> userResult = userApiService.getUserByEnterpriseId(enterpriseId);
UserDTO userDTO = userResult.getResult();
ServiceResponse<Void> smsSendResult = smsSendApiService.sendPlatformSms(sceneId,
enterpriseId, userDTO.getPhoneAreaCode(), userDTO.getPhoneNumber(), smsArr);
if (!smsSendResult.isSuccess()) {
LOGGER.warn(smsSendResult.getMessage());
}
}
}
@Override
public ServiceResponse<Void> balanceTask(String param) {
//查询所有的商户
......@@ -274,11 +300,11 @@ public class BillingAccountApiServiceImpl implements BillingAccountApiService {
Integer enterpriseId = enterpriseDTO.getEnterpriseId();
if (isNotInWhiteList(enterpriseId)) {
TabBillingAccount account = this.billingAccountService.getByEnterpriseId(enterpriseId);
if (account.getAccountBalance() <= 500) {
if (account.getAccountBalance() < ACCOUNT_NOTICE_LINE) {
String[] smsArr = new String[]{enterpriseDTO.getEnterpriseName(), String.valueOf(-account.getAccountBalance())};
ServiceResponse<UserDTO> userResult = userApiService.getUserByEnterpriseId(enterpriseId);
UserDTO userDTO = userResult.getResult();
ServiceResponse<Void> smsSendResult = smsSendApiService.sendPlatformSms("GICJFZX001",
ServiceResponse<Void> smsSendResult = smsSendApiService.sendPlatformSms(account.getAccountBalance() < 0 ? "GICJFZX012" :"GICJFZX001",
enterpriseId, userDTO.getPhoneAreaCode(), userDTO.getPhoneNumber(), smsArr);
if (!smsSendResult.isSuccess()) {
LOGGER.warn(smsSendResult.getMessage());
......@@ -294,7 +320,7 @@ public class BillingAccountApiServiceImpl implements BillingAccountApiService {
return this.enterpriseWhiteListService.getEnterpriseWhiteList(enterpriseId) == null;
}
private void sendTotoItem(Integer enterpriseId) {
private void sendTotoItem(Integer enterpriseId, String content) {
TodoItemDTO todoItemDTO = new TodoItemDTO();
UserDTO userDTO = userApiService.getUserByEnterpriseId(enterpriseId).getResult();
// 商户
......@@ -302,7 +328,7 @@ public class BillingAccountApiServiceImpl implements BillingAccountApiService {
// 待办事项的userId
todoItemDTO.setUserId(userDTO.getUserId());
// 事项详情
todoItemDTO.setItemContent("您的GIC商户余额已欠费");
todoItemDTO.setItemContent(content);
// 事项code 在运维后台字典配置 类目:待办事项类型
todoItemDTO.setItemType(Constants.PRODUCT);
// 跳转地址 待办事项点击后要跳转的地址
......
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