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

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/MemberRankSettingServiceImpl.java

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImLiveBroadcastRoomServiceImpl.java

@@ -555,7 +555,8 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
             RoomSpeakerInfo speakerInfo = speakerCache.get();
             //查询用户是否在线
             LiveRoomUser liveRoomUser = livePluginContext.getPluginService(room.getServiceProvider()).chatRoomUserExist(room.getId().toString(),speakerInfo.getSpeakerId().toString());
-            if (Objects.nonNull(liveRoomUser) && StringUtils.equals(liveRoomUser.getStatus(),"1")) {
+            if (Objects.nonNull(liveRoomUser) && liveRoomUser.getExist()  &&
+                "1".equals(liveRoomUser.getStatus()) && StringUtils.equals(liveRoomUser.getStatus(), "1")) {
                 log.info("roomDestroy destroyExpiredLiveRoom  is online >>>> roomId:{} speakerId:{}", room.getId(), speakerInfo.getSpeakerId());
                 return;
             }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -184,7 +184,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
 
         String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
 
-        logger.info("XXX-createOrder ---> cashAmount:{}, balance:{}", cashAmount, cashAmount.compareTo(BigDecimal.ZERO));
+        //logger.info("XXX-createOrder ---> cashAmount:{}, balance:{}", cashAmount, cashAmount.compareTo(BigDecimal.ZERO));
         if (cashAmount.compareTo(BigDecimal.ZERO) == 0) {
 
             studentPaymentRouteOrderService.addRouteOrder(studentPaymentOrder.getOrderNo(), studentPaymentOrder.getOrganId(), balance);
@@ -398,11 +398,11 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
     @Transactional(rollbackFor = Exception.class)
     public void updateOrder(Map<String, String> rpMap) throws Exception {
 
-        logger.info("XXX-createOrder ---> updateOrder:{}", rpMap);
+        //logger.info("XXX-createOrder ---> updateOrder:{}", rpMap);
 
         DealStatusEnum status = rpMap.get("tradeState").equals("1") ? DealStatusEnum.SUCCESS : DealStatusEnum.FAILED;
         StudentPaymentOrder order = findOrderByOrderNo(rpMap.get("merOrderNo"));
-        order = studentPaymentOrderDao.lockOrder(order.getId());
+        //order = studentPaymentOrderDao.lockOrder(order.getId());
         //关闭或失败的订单查询订单成功,订单改成成功，钱退到余额
         if (order != null && (order.getStatus().equals(DealStatusEnum.CLOSE) || order.getStatus().equals(DealStatusEnum.FAILED)) && status.equals(DealStatusEnum.SUCCESS)) {
             String memo = order.getStatus().equals(DealStatusEnum.CLOSE) ? "关闭订单" : "失败订单";
@@ -437,18 +437,19 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         } else {
             order.setMemo(rpMap.get("remarks"));
         }
-
+        // 设置订单状态
+        order.setStatus(status);
         if (StringUtils.isBlank(order.getTransNo())) {
             order.setTransNo(rpMap.get("orderNo"));
         }
 
         order.setPaymentBusinessChannel(rpMap.get("channelType"));
         order.setTenantId(this.get(order.getId()).getTenantId());
+
         TenantContextHolder.setTenantId(order.getTenantId());
+
         callOrderCallBack(order);
 
-        // 设置订单状态
-        order.setStatus(status);
         if (status.equals(DealStatusEnum.SUCCESS)
                 && StringUtils.isNotBlank(order.getPaymentChannel())
                 && order.getPaymentChannel().equals("ADAPAY")
@@ -456,6 +457,28 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             confirmOrder(order);
         }
         TenantContextHolder.clearTenantId();
+
+        /*StudentPaymentOrder finalOrder = order;
+        Executors.newCachedThreadPool().submit(() -> {
+
+            try {
+                TenantContextHolder.setTenantId(finalOrder.getTenantId());
+
+                callOrderCallBack(finalOrder);
+
+                if (status.equals(DealStatusEnum.SUCCESS)
+                        && StringUtils.isNotBlank(finalOrder.getPaymentChannel())
+                        && finalOrder.getPaymentChannel().equals("ADAPAY")
+                        && !rpMap.containsKey("simulation")) {
+                    confirmOrder(finalOrder);
+                }
+                TenantContextHolder.clearTenantId();
+            } catch (Exception e) {
+                logger.error("updateOrder 订单回调流程, order={}", JSON.toJSONString(finalOrder), e);
+            }
+
+        });*/
+
     }
 
     private Boolean confirmOrder(StudentPaymentOrder order) {
@@ -544,7 +567,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
 
     //调用相应业务回调接口
     public void callOrderCallBack(StudentPaymentOrder order) throws Exception {
-        logger.info("XXX-createOrder ---> callOrderCallBack:{}", JSON.toJSONString(order));
+        //logger.info("XXX-createOrder ---> callOrderCallBack:{}", JSON.toJSONString(order));
         if(order.getGroupType() == GroupType.ACTIVITY){
             vipGroupActivityService.orderCallback(order);
         }else {

mec-biz/src/main/resources/config/mybatis/ImLiveBroadcastRoomMapper.xml

@@ -63,6 +63,7 @@
         a.speaker_status_ AS speakerStatus,
         a.push_status_ AS pushStatus,
         a.ban_status_ AS banStatus,
+        a.created_time_ AS createdTime,
         a.service_provider_ as serviceProvider
         from im_live_broadcast_room as a
         left join tenant_info AS t on a.tenant_id_ = t.id_

mec-biz/src/main/resources/config/mybatis/ImLiveRoomReservationMapper.xml

@@ -43,6 +43,7 @@
         a.pre_template_ AS preTemplate,
         a.room_config_ AS roomConfig,
         a.popularize_ AS popularize,
+        a.created_time_ AS createdTime,
         a.service_provider_ as serviceProvider,
         a.popularize_type_ AS popularizeType,
         IF(d.user_id_ is null, 0, 1) as reserve

mec-im/src/main/java/com/ym/controller/UserController.java

@@ -168,7 +168,7 @@ public class UserController {
             imUserState.setStatus("0");
         }
 
-        imLiveBroadcastRoomService.opsRoom(userState);
+        // imLiveBroadcastRoomService.opsRoom(userState);
         return TencentData.StreamEventCallbackResult.builder().code(0).build();
     }