Skip to content

C
cms
提交 aa088841 作者: han
操作

优化

上级 62b3e437
正在显示 包含 62 行增加 和 60 行删除
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/MessageController.java
...@@ -105,15 +105,15 @@ public class MessageController extends BaseController{ ...@@ -105,15 +105,15 @@ public class MessageController extends BaseController{
return messageService.removeUserMessage(id); return messageService.removeUserMessage(id);
} }
@ApiOperation(value = "购买聊天时长(积分或微信支付）") // @ApiOperation(value = "购买聊天时长(积分或微信支付）")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)}) // @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@PostMapping("/purchaseTime") // @PostMapping("/purchaseTime")
public ResultBody purchaseTime(HttpServletRequest request,@RequestBody MessageTimeVO messageTimeVO){ // public ResultBody purchaseTime(HttpServletRequest request,@RequestBody MessageTimeVO messageTimeVO){
LoginSuccessDTO userLoginInfoFromRedis = this.getUserLoginInfoFromRedis(request); // LoginSuccessDTO userLoginInfoFromRedis = this.getUserLoginInfoFromRedis(request);
Integer userAccountId = userLoginInfoFromRedis.getUserAccountId(); // Integer userAccountId = userLoginInfoFromRedis.getUserAccountId();
String token = userLoginInfoFromRedis.getToken(); // String token = userLoginInfoFromRedis.getToken();
return messageService.purchaseTime(userAccountId,messageTimeVO,token); // return messageService.purchaseTime(userAccountId,messageTimeVO,token);
} // }
@ApiOperation(value = "购买聊天时长(积分）") @ApiOperation(value = "购买聊天时长(积分）")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
...@@ -153,7 +153,7 @@ public class MessageController extends BaseController{ ...@@ -153,7 +153,7 @@ public class MessageController extends BaseController{
@ApiOperation(value = "根据类型ID返回聊天时长选购类型") @ApiOperation(value = "根据类型ID返回聊天时长选购类型")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)}) @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@PostMapping("/timeTypeById") @PostMapping("/timeTypeById")
public MessageTimeVO timeTypeById(@ApiParam(value = "购买聊天时长的类型id，唯一识别id", required = true) Integer typeId){ public Integer timeTypeById(@ApiParam(value = "购买聊天时长的类型id，唯一识别id", required = true) Integer typeId){
return messageService.timeTypeById(typeId); return messageService.timeTypeById(typeId);
} }
} }
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/MessageService.java
...@@ -73,7 +73,7 @@ public interface MessageService { ...@@ -73,7 +73,7 @@ public interface MessageService {
ResultBody removeUser(Integer senderUserId, Integer receiverUserId); ResultBody removeUser(Integer senderUserId, Integer receiverUserId);
ResultBody purchaseTime(Integer userAccountId, MessageTimeVO messageTimeVO, String token); // ResultBody purchaseTime(Integer userAccountId, MessageTimeVO messageTimeVO, String token);
ResultBody purchaseTimeByPoints(Integer userAccountId, MessageTimePointsVO messageTimeVO); ResultBody purchaseTimeByPoints(Integer userAccountId, MessageTimePointsVO messageTimeVO);
ResultBody purchaseTimeByWechat(Integer userAccountId, Integer id); ResultBody purchaseTimeByWechat(Integer userAccountId, Integer id);
...@@ -83,5 +83,5 @@ public interface MessageService { ...@@ -83,5 +83,5 @@ public interface MessageService {
ResultBody insertTimeType(MessageTimeVO messageTimeVO); ResultBody insertTimeType(MessageTimeVO messageTimeVO);
MessageTimeVO timeTypeById(Integer id); Integer timeTypeById(Integer id);
} }
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/MessageServiceImpl.java
...@@ -249,52 +249,52 @@ public class MessageServiceImpl implements MessageService { ...@@ -249,52 +249,52 @@ public class MessageServiceImpl implements MessageService {
return ResultBody.error("删除失败"); return ResultBody.error("删除失败");
} }
@Override // @Override
public ResultBody purchaseTime(Integer userAccountId, MessageTimeVO messageTimeVO, String token) { // public ResultBody purchaseTime(Integer userAccountId, MessageTimeVO messageTimeVO, String token) {
if(messageTimeVO.getId() == null){ // if(messageTimeVO.getId() == null){
return ResultBody.error("聊天类型不能传递为空"); // return ResultBody.error("聊天类型不能传递为空");
} // }
MessageTimeVO messageTimeVO1 = messageDao.selectUserMessageTimeType(messageTimeVO.getId()); // MessageTimeVO messageTimeVO1 = messageDao.selectUserMessageTimeType(messageTimeVO.getId());
if(messageTimeVO.getMoney() != null && messageTimeVO.getMoney().compareTo(BigDecimal.ZERO) > 0){ // if(messageTimeVO.getMoney() != null && messageTimeVO.getMoney().compareTo(BigDecimal.ZERO) > 0){
// 微信支付购买聊天时长 // // 微信支付购买聊天时长
OrderRequestParamsVO orderRequestParamsVO = new OrderRequestParamsVO(); // OrderRequestParamsVO orderRequestParamsVO = new OrderRequestParamsVO();
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS"); // SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String content = "WT" + sdf.format(new Date()); // String content = "WT" + sdf.format(new Date());
orderRequestParamsVO.setOrderNo(content); // orderRequestParamsVO.setOrderNo(content);
orderRequestParamsVO.setDescription("购买聊天时长"); // orderRequestParamsVO.setDescription("购买聊天时长");
BigDecimal money = messageTimeVO1.getMoney(); // BigDecimal money = messageTimeVO1.getMoney();
BigDecimal amountInFen = money.multiply(new BigDecimal("100")).setScale(0, RoundingMode.DOWN); // BigDecimal amountInFen = money.multiply(new BigDecimal("100")).setScale(0, RoundingMode.DOWN);
orderRequestParamsVO.setAmount(amountInFen.intValue()); // orderRequestParamsVO.setAmount(amountInFen.intValue());
orderRequestParamsVO.setOrderPort(5); // orderRequestParamsVO.setOrderPort(5);
// 扣除金额 // // 扣除金额
Map map = paymentAppApi.orderPay(orderRequestParamsVO, token); // Map map = paymentAppApi.orderPay(orderRequestParamsVO, token);
//
}else if(messageTimeVO.getPoints() > 0){ // }else if(messageTimeVO.getPoints() > 0){
ChangeUserPointVO changeUserPointVO = new ChangeUserPointVO(); // ChangeUserPointVO changeUserPointVO = new ChangeUserPointVO();
changeUserPointVO.setUserAccountId(userAccountId); // changeUserPointVO.setUserAccountId(userAccountId);
changeUserPointVO.setChangePoint(-messageTimeVO1.getPoints()); // changeUserPointVO.setChangePoint(-messageTimeVO1.getPoints());
changeUserPointVO.setChangeType(8); // changeUserPointVO.setChangeType(8);
ResultBody resultBody = userPointsService.change(changeUserPointVO); // ResultBody resultBody = userPointsService.change(changeUserPointVO);
if (!"200".equals(resultBody.getCode())) { // if (!"200".equals(resultBody.getCode())) {
return resultBody; // return resultBody;
} // }
}else{ // }else{
return ResultBody.error("请选择积分购买或者微信支付，不能同时为空"); // return ResultBody.error("请选择积分购买或者微信支付，不能同时为空");
} // }
// 增加聊天时长 // // 增加聊天时长
String timeValue = redisTemplate.opsForValue().get("Message" + userAccountId); // String timeValue = redisTemplate.opsForValue().get("Message" + userAccountId);
if (timeValue == null || timeValue.equals("")) { // if (timeValue == null || timeValue.equals("")) {
redisTemplate.setValueSerializer(RedisSerializer.json()); // redisTemplate.setValueSerializer(RedisSerializer.json());
redisTemplate.opsForValue().set("Message" + userAccountId, userAccountId.toString(), messageTimeVO1.getChatDuration() * 24 * 60 * 60, TimeUnit.SECONDS); // redisTemplate.opsForValue().set("Message" + userAccountId, userAccountId.toString(), messageTimeVO1.getChatDuration() * 24 * 60 * 60, TimeUnit.SECONDS);
return ResultBody.success("成功购买"+messageTimeVO1.getChatDuration()+"天聊天功能"); // return ResultBody.success("成功购买"+messageTimeVO1.getChatDuration()+"天聊天功能");
} // }
Long remainingTime = redisTemplate.getExpire("Message" + userAccountId, TimeUnit.SECONDS); // Long remainingTime = redisTemplate.getExpire("Message" + userAccountId, TimeUnit.SECONDS);
if (remainingTime != null && remainingTime >= 0) { // if (remainingTime != null && remainingTime >= 0) {
long newTime = remainingTime + (messageTimeVO1.getChatDuration() * 24 * 60 * 60); // 转换为毫秒后加上七天的毫秒数 // long newTime = remainingTime + (messageTimeVO1.getChatDuration() * 24 * 60 * 60); // 转换为毫秒后加上七天的毫秒数
redisTemplate.opsForValue().set("Message" + userAccountId, userAccountId.toString(), newTime, TimeUnit.SECONDS); // redisTemplate.opsForValue().set("Message" + userAccountId, userAccountId.toString(), newTime, TimeUnit.SECONDS);
} // }
return ResultBody.success("成功购买"+messageTimeVO1.getChatDuration()+"天聊天功能"); // return ResultBody.success("成功购买"+messageTimeVO1.getChatDuration()+"天聊天功能");
} // }
@Override @Override
public ResultBody purchaseTimeByWechat(Integer userAccountId, Integer id) { public ResultBody purchaseTimeByWechat(Integer userAccountId, Integer id) {
if(id == null){ if(id == null){
...@@ -362,9 +362,11 @@ public class MessageServiceImpl implements MessageService { ...@@ -362,9 +362,11 @@ public class MessageServiceImpl implements MessageService {
} }
@Override @Override
public MessageTimeVO timeTypeById(Integer id) { public Integer timeTypeById(Integer id) {
MessageTimeVO messageTimeVO1 = messageDao.selectUserMessageTimeType(id); MessageTimeVO messageTimeVO1 = messageDao.selectUserMessageTimeType(id);
return messageTimeVO1; BigDecimal money = messageTimeVO1.getMoney();
BigDecimal amountInFen = money.multiply(new BigDecimal("100")).setScale(0, RoundingMode.DOWN);
return amountInFen.intValue();
} }
public static boolean isOverThreeMinutes(String createTime) { public static boolean isOverThreeMinutes(String createTime) {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论