添加英语2区分区,房间日流水后台状态码
This commit is contained in:
@@ -36,12 +36,14 @@ public class RoomDayDiamondRewardController extends BaseController {
|
||||
@ApiImplicitParam(name = "status", value = "发放状态:-1:全部,0:未发放,1已经发放", required = false, dataType = "long"),
|
||||
})
|
||||
@GetMapping("/list")
|
||||
public PageResult<RoomDayDiamondRewardRecordVo> list(Integer regionId, Long erbanNo, Integer status, BasePageParams pageParams) {
|
||||
public BusiResult<PageResult<RoomDayDiamondRewardRecordVo>> list(Integer regionId, Long erbanNo, Integer status, BasePageParams pageParams) {
|
||||
|
||||
return roomDayDiamondRewardRecordService.listRecord(pageParams.getPartitionId(), regionId, erbanNo, pageParams.getStartTime(),
|
||||
PageResult<RoomDayDiamondRewardRecordVo> pageResult = roomDayDiamondRewardRecordService.listRecord(pageParams.getPartitionId(), regionId, erbanNo, pageParams.getStartTime(),
|
||||
pageParams.getEndTime(), status, pageParams.getPageNo(), pageParams.getPageSize());
|
||||
return BusiResult.success(pageResult);
|
||||
}
|
||||
@ApiOperation(value = "每日钻石流水列表", httpMethod = "GET")
|
||||
|
||||
@ApiOperation(value = "每日钻石流水列表-导出", httpMethod = "GET")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "regionId", value = "国家id", required = false, dataType = "int"),
|
||||
@ApiImplicitParam(name = "erbanNo", value = "用户id", required = false, dataType = "long"),
|
||||
|
@@ -1,5 +1,6 @@
|
||||
package com.accompany.business.service.room.impl;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import com.accompany.business.model.room.RoomDayDiamondNum;
|
||||
import com.accompany.business.model.room.RoomDayDiamondReward;
|
||||
import com.accompany.business.model.room.RoomDayDiamondRewardRecord;
|
||||
@@ -12,16 +13,19 @@ import com.accompany.business.service.room.RoomDayDiamondRewardRecordService;
|
||||
import com.accompany.business.service.room.RoomDayDiamondRewardService;
|
||||
import com.accompany.business.service.user.UsersService;
|
||||
import com.accompany.business.vo.room.RoomDayDiamondRewardRecordVo;
|
||||
import com.accompany.common.push.MarkdownMessage;
|
||||
import com.accompany.common.result.BusiResult;
|
||||
import com.accompany.common.result.PageResult;
|
||||
import com.accompany.common.status.BusiStatus;
|
||||
import com.accompany.common.utils.DateTimeUtil;
|
||||
import com.accompany.common.utils.EnvComponent;
|
||||
import com.accompany.core.enumeration.BillObjTypeEnum;
|
||||
import com.accompany.core.enumeration.I18nAlertEnum;
|
||||
import com.accompany.core.enumeration.PartitionEnum;
|
||||
import com.accompany.core.exception.AdminServiceException;
|
||||
import com.accompany.core.exception.ServiceException;
|
||||
import com.accompany.core.model.Users;
|
||||
import com.accompany.core.service.message.MessageRobotPushService;
|
||||
import com.accompany.core.util.I18NMessageSourceUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
@@ -64,6 +68,10 @@ public class RoomDayDiamondRewardRecordServiceImpl extends ServiceImpl<RoomDayDi
|
||||
private UserPurseService userPurseService;
|
||||
@Autowired
|
||||
private RedissonClient redissonClient;
|
||||
@Autowired
|
||||
private EnvComponent envComponent;
|
||||
@Autowired
|
||||
private MessageRobotPushService messageRobotPushService;
|
||||
|
||||
@Override
|
||||
public PageResult<RoomDayDiamondRewardRecordVo> listRecord(Integer partitionId, Integer regionId, Long erbanNo,
|
||||
@@ -165,4 +173,22 @@ public class RoomDayDiamondRewardRecordServiceImpl extends ServiceImpl<RoomDayDi
|
||||
wrapper.eq(RoomDayDiamondRewardRecord::getPartitionId, partitionId).eq(RoomDayDiamondRewardRecord::getRoomUid, roomUid).eq(RoomDayDiamondRewardRecord::getStatDate, statDate);
|
||||
return baseMapper.selectCount(wrapper) > 0;
|
||||
}
|
||||
|
||||
private void sendRobotMsg(Integer partitionId, Long agentErbanNo, Long erbanNo, Long coins) {
|
||||
String key;
|
||||
if (envComponent.getDevOrNativeEnv()) {
|
||||
key = "474c92e5-385d-4b6a-b606-b33769f59457";
|
||||
} else {
|
||||
key = "37355bec-05c4-4168-8287-51c8fcfd1475";
|
||||
}
|
||||
PartitionEnum partitionEnum = PartitionEnum.getByPartitionId(partitionId);
|
||||
String title = " WEB-API代理充值(" + partitionEnum.getDesc() + "区)";
|
||||
MarkdownMessage msg = new MarkdownMessage();
|
||||
msg.add(MarkdownMessage.getHeaderText(3, title));
|
||||
msg.add(MarkdownMessage.getReferenceText("充值用户ID: " + erbanNo));
|
||||
msg.add(MarkdownMessage.getReferenceText("充值使用的代理ID: " + agentErbanNo));
|
||||
msg.add(MarkdownMessage.getReferenceText("充值coins: " + coins));
|
||||
msg.add(MarkdownMessage.getReferenceText("充值时间(GMT+8): " + DateUtil.formatDateTime(new Date())));
|
||||
messageRobotPushService.pushMessageByKey(key, msg, false);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user