Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-server/ruoyi-server-mqdata/src/main/java/org/dromara/server/mq/consumer/SyncKafkaConsumer.java

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/dubbo/RemoteTeamServiceImpl.java

@@ -54,7 +54,7 @@ public class RemoteTeamServiceImpl implements RemoteTeamService {
             }
             return R.fail("增加团客信息失败");
         } catch (Exception e) {
-            log.error("增加团客信息失败-{}-{}", JsonUtils.toJsonString(remoteBo), e.getMessage());
+            log.error("增加团客信息失败-{}-{}", JsonUtils.toJsonString(remoteBo), e);
             return R.fail("增加团客信息失败");
         }
     }
@@ -78,7 +78,7 @@ public class RemoteTeamServiceImpl implements RemoteTeamService {
             }
             return R.fail("修改团客信息失败");
         } catch (Exception e) {
-            log.error("修改团客信息失败-{}-{}", JsonUtils.toJsonString(remoteBo), e.getMessage());
+            log.error("修改团客信息失败-{}-{}", JsonUtils.toJsonString(remoteBo), e);
             return R.fail("修改团客信息失败");
         }
     }

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/service/impl/KfTeamServiceImpl.java

@@ -128,7 +128,7 @@ public class KfTeamServiceImpl implements IKfTeamService {
         validEntityBeforeSave(add);
         //1.新增客团信息
         boolean flag = baseMapper.insert(add) > 0;
-        if (flag && bo.getGuestList().size() > 0) {
+        if (flag && ObjectUtil.isNotEmpty(bo.getGuestList())) {
             addGuestTeamR(add.getId(), bo.getGuestList());
         }
         return flag;
@@ -148,7 +148,7 @@ public class KfTeamServiceImpl implements IKfTeamService {
         boolean flag = baseMapper.updateById(update) > 0;
         //2.更新客团成员
         List<KfGuestTeamRBo> newGuests = bo.getGuestList();
-        if (newGuests.size() > 0) {
+        if (ObjectUtil.isNotEmpty(newGuests)) {
            addGuestTeamR(update.getId(), newGuests);
         }
         return flag;

ruoyi-server/ruoyi-server-base/src/main/java/org/dromara/server/base/service/yktOperation/SyncRemotePtCardCenterService.java

@@ -14,6 +14,7 @@ import org.dromara.backstage.api.domain.bo.RemoteConsumptionBo;
 import org.dromara.backstage.api.domain.bo.RemotePurseInOutBo;
 import org.dromara.common.core.constant.DefaultConstants;
 import org.dromara.common.core.enums.CardOperateEnum;
+import org.dromara.common.core.enums.CardStatusEnum;
 import org.dromara.common.core.exception.ServiceException;
 import org.springframework.stereotype.Service;
 
@@ -166,6 +167,7 @@ public class SyncRemotePtCardCenterService {
         bo.setOldCardNo(ObjUtil.isNotEmpty(initParam.get("oldCardNo")) ? Long.parseLong(initParam.get("oldCardNo").toString()) : 0);
         bo.setOldFactoryId(ObjUtil.isNotEmpty(initParam.get("oldFactoryFixId")) ? Long.parseLong(initParam.get("oldFactoryFixId").toString()) : 0);
         bo.setOldCardId(ObjUtil.isNotEmpty(initParam.get("oldCardId")) ? Long.parseLong(initParam.get("oldCardId").toString()) : 0);
+        bo.setStatus(CardStatusEnum.NORMAL.code().toString());
         return bo;
     }
 }

ruoyi-server/ruoyi-server-mqdata/src/main/java/org/dromara/server/mq/consumer/SyncKafkaConsumer.java

@@ -24,22 +24,24 @@ import org.springframework.stereotype.Component;
  */
 @RequiredArgsConstructor
 @Slf4j
-//@Component
+@Component
 @ConditionalOnExpression("'local'.equals('${locationFlag}')")
 public class SyncKafkaConsumer {
     private final EventStrategyContext eventStrategyContext;
 
-    //@KafkaListener(topics = "eventBus", groupId = "test-group-id")
+    @KafkaListener(topics = "old-kafka-jw", groupId = "test-ykt2")
     public void kafkaReceiveHandler(ConsumerRecord<String, String> record) {
         KafkaMessage<?> receiveMsg = JSONUtil.toBean(record.value(), KafkaMessage.class);
         String eventType = receiveMsg.getHeader().getEventType();
         String sender = receiveMsg.getHeader().getSender();
+        String tenantId = receiveMsg.getHeader().getTenantId();
         JSONObject eventMsg = JSONUtil.parseObj(receiveMsg.getBody());
+        eventMsg.set("tenantId", tenantId);
         if (ObjUtil.notEqual(sender, "005")) {
             try {
                 eventStrategyContext.doMsgHandle(eventType, eventMsg);
             } catch (Exception e) {
-                log.error("[业中kafka消息处理失败]-[消息:{}-[错误:{}]", receiveMsg, e.getMessage());
+                log.error("[业中kafka消息处理失败]-[消息:{}-[错误:{}]", receiveMsg, e);
             }
         }
     }

ruoyi-server/ruoyi-server-mqdata/src/main/java/org/dromara/server/mq/event/kafka/impl/train/TrainUtils.java

@@ -39,10 +39,12 @@ public class TrainUtils {
         dept.setPayEnd(DateUtil.parse(data.get("byTime").toString(), DefaultConstants.DATE_TIME_FORMAT));
         dept.setChooseRoom("0");
         dept.setCanEat("1");
-        dept.setPayCheck(data.get("noPayAllow").toString());
-        dept.setDept_num(data.get("sortNum").toString());
+        dept.setPlanCount(Integer.valueOf(data.getOrDefault("studentNum", "0").toString()));
+//        dept.setPayCheck(data.get("noPayAllow").toString());
+//        dept.setDept_num(data.get("sortNum").toString());
         dept.setOperatorId(DefaultConstants.KAFKA_SYNC_ADMIN);
-        dept.setTenantId(DefaultConstants.TENANT_ID);
+//        dept.setTenantId(DefaultConstants.TENANT_ID);
+        dept.setTenantId(data.getStr("tenantId"));
         resourceDeptlist.add(dept);
 
         return resourceDeptlist;