Forráskód Böngészése

添加语音时长,修复发放红包出错问题

udream-cxs 4 éve
szülő
commit
8369f7e672

+ 4 - 1
lift-push/src/main/java/cn/com/ty/lift/push/app/PushConsumer.java

@@ -28,7 +28,10 @@ import java.util.List;
 @Component
 @AllArgsConstructor
 public class PushConsumer {
-    private static List<String> titles = new ArrayList<>(Arrays.asList("公司公告", "团队消息", "年检消息", "保养消息", "急修消息", "提醒", "工作消息", "订单消息", "审核消息", "邀请成为专家", "附近的人", "专家处罚", "撤销专家处罚"));
+    private static List<String> titles = new ArrayList<>(Arrays.asList("公司公告", "团队消息", "年检消息", "保养消息", "急修消息", "提醒",
+            "工作消息", "订单消息", "审核消息", "邀请成为专家",
+            "附近的人", "专家处罚", "撤销专家处罚",
+            "红包提醒", "入账提醒"));
     //    private XingePush xingePush;
     private JmsMessagingTemplate jmsMessagingTemplate;
     private TimeMessageService timeMessageService;

+ 6 - 0
lift-ud-service/src/main/java/cn/com/ty/lift/ud/chat/mapper/entity/ChatMsgEntity.java

@@ -54,6 +54,12 @@ public class ChatMsgEntity extends BaseEntity {
      */
     @ApiModelProperty("'消息类型:1文本、2图片、3视频、4语言'")
     private Integer type;
+
+    /**
+     * 语音音频时长秒
+     */
+    @ApiModelProperty("语音音频时长秒")
+    private Integer dura;
   
     private transient String name;
     

+ 1 - 0
lift-ud-service/src/main/java/cn/com/ty/lift/ud/neety/protocol/IMMessage.java

@@ -24,6 +24,7 @@ public class IMMessage {
     private String receiver; // 接收人
     private String msg; // 消息内容
     private Integer type; // 发送消息类型
+    private Integer dura; // 语音音频时长
     private String fromUser; // 当前用户id
     private String sessionid; // 房间号
     private int dataTable; // 消息来源1:问诊,2:出诊,3:附近的人

+ 2 - 1
lift-ud-service/src/main/java/cn/com/ty/lift/ud/neety/task/RedisTask.java

@@ -41,7 +41,7 @@ public class RedisTask {
      */
     @Scheduled(cron = "0 0 1 * * ?")
     public void synRedisChatToDB() {
-        log.info("执行保存未读消息操作!");
+        log.info("将redis中的聊天缓存,持久到数据库中");
         Set<String> keys = redis.keys("ALLCHATS:*");
         for (String key : keys) {
             List<ChatMsgEntity> chatList = new ArrayList<>();
@@ -54,6 +54,7 @@ public class RedisTask {
                 entity.setToUser(imMessage.getReceiver());
                 entity.setType(imMessage.getType());
                 entity.setSessionid(imMessage.getSessionid());
+                entity.setDura(imMessage.getDura());
                 entity.setStatuz(1);
                 entity.setCreateBy(imMessage.getName());
                 entity.setCreateTime(new Date(imMessage.getTime()).toInstant().atOffset(ZoneOffset.of("+8")).toLocalDateTime());

+ 4 - 1
lift-ud-service/src/main/java/cn/com/ty/lift/ud/userInfo/service/impl/UserInfoServiceImpl.java

@@ -682,9 +682,12 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfoEnt
             Coupon coupon = couponOptional.get();
 
             int issuedRedPacket = iUserCouponService.count(new QueryWrapper<UserCoupon>()
-                    .eq("type", 2)
                     .eq("coupon_id", redEncelopId));
             int redPacketNum = issuedRedPacket + userList.size();
+            if (coupon.getNum() == null){
+                String returnStr = "红包数量不能为零,请核查卡券数量";
+                return RestResponse.fail(returnStr);
+            }
             if (redPacketNum > coupon.getNum()){
                 String returnStr = String.format("红包总个数{%d},已发红包{%d},可发红包{%d}",
                         coupon.getNum(), issuedRedPacket, coupon.getNum() - issuedRedPacket);