fix: 消费服务

1.去掉消费明细入库完成后向云平台发送消费请求

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/business/BaseBusiness.java

@@ -432,7 +432,7 @@ public class BaseBusiness {
     public void completeUploadRecord(ConsumptionBo bo, RemoteUserAccountVo accountVo) {
         // 消费记录上传完成,还有一些后续工作，不需要知道处理结果，采用异步任务提交
         taskExecutor.submit(() -> sendConsumeToKafka(bo, accountVo));
-        taskExecutor.submit(() -> sendCloudConsume(bo));
+        //taskExecutor.submit(() -> sendCloudConsume(bo));
     }
 
 
@@ -444,7 +444,7 @@ public class BaseBusiness {
      */
     private void sendConsumeToKafka(ConsumptionBo bo, RemoteUserAccountVo accountVo) {
         // 只有本地消费完成后才会向教务发kafka消息
-        if (ObjectUtil.equals(defaultConfig.getLocationFlag(), DefaultConstants.LOCAL_FLAG)) {
+        //if (ObjectUtil.equals(defaultConfig.getLocationFlag(), DefaultConstants.LOCAL_FLAG)) {
             YcPushConsumeInfoVo ycSendConsumeInfo = new YcPushConsumeInfoVo();
             ycSendConsumeInfo.setRecordId(bo.getRecordId().toString());
             ycSendConsumeInfo.setUserId(bo.getUserId().toString());
@@ -472,7 +472,7 @@ public class BaseBusiness {
             log.info("[向教务系统发送就餐打卡]-[{}]", ycSendConsumeInfo);
             kafkaNormalProducer.sendKafkaMessage(KafkaTopicConstants.OLD_SYNC_TOPIC, EventTypeConstants.CONSUME_RECORD, EventSenderEnum.OLD.code(),
                 ycSendConsumeInfo);
-        }
+        //}
     }
 
     /**

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/task/InitTasks.java

@@ -32,14 +32,14 @@ public class InitTasks implements ApplicationRunner {
     public void run(ApplicationArguments args) throws Exception {
         log.info("初始化消费验证基础数据");
         long startTime = System.currentTimeMillis();
-        // initBusiness.initGlobalData();
-        // initBusiness.initTermInfo();
-        // initBusiness.initMealTypeInfo();
-        // initBusiness.initDiscountAndOther();
-        // initBusiness.initUserCard();
-        // initBusiness.initUserAccount();
-        // initBusiness.initXfCardLimited();
-        // initBusiness.initUserBalance();
+        initBusiness.initGlobalData();
+        initBusiness.initTermInfo();
+        initBusiness.initMealTypeInfo();
+        initBusiness.initDiscountAndOther();
+        initBusiness.initUserCard();
+        initBusiness.initUserAccount();
+        initBusiness.initXfCardLimited();
+        initBusiness.initUserBalance();
         validationParam.refresh();
 
         log.info("初始化消费验证基础数据完成。耗时：{} ms", System.currentTimeMillis() - startTime);

ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/task/ScheduledTasks.java

@@ -55,18 +55,18 @@ public class ScheduledTasks {
      * 该方法在每天的9:45, 14:45, 20:45和23:45自动调用，用于处理云端部署环境下的消费记录对账。
      * 如果对账过程中出现错误，会记录错误信息；如果成功，则记录警告消息。
      */
-    @Scheduled(cron = "0 45 9,10,14,16,20,23 * * *")
-    public void CloudSyncReconciliation() {
-        if (defaultConfig.getLocationFlag().equals(DefaultConstants.CLOUD_FLAG)) {
-            String consumeDate = DateUtil.format(DateUtil.date(), "yyyy-MM-dd 00:00:00");
-            R<ErrorInfo> result = consumeBusiness.syncReconciliation(consumeDate);
-            if (R.isError(result)) {
-                log.error(JSONUtil.toJsonStr(result.getData()));
-            } else {
-                log.warn(result.getMsg());
-            }
-        }
-    }
+    //@Scheduled(cron = "0 45 9,10,14,16,20,23 * * *")
+    //public void CloudSyncReconciliation() {
+    //    if (defaultConfig.getLocationFlag().equals(DefaultConstants.CLOUD_FLAG)) {
+    //        String consumeDate = DateUtil.format(DateUtil.date(), "yyyy-MM-dd 00:00:00");
+    //        R<ErrorInfo> result = consumeBusiness.syncReconciliation(consumeDate);
+    //        if (R.isError(result)) {
+    //            log.error(JSONUtil.toJsonStr(result.getData()));
+    //        } else {
+    //            log.warn(result.getMsg());
+    //        }
+    //    }
+    //}
 
     @Scheduled(cron = "0 0 4 * * ?")
     public void initDiscountAndOther() {
@@ -78,9 +78,9 @@ public class ScheduledTasks {
     }
     @Scheduled(cron = "0 0 5,9,13,16,20 * * ?")
     public void initConsumeInfo() {
-        ThreadUtil.execAsync(baseBusiness::initXfCardLimited);
-        ThreadUtil.execAsync(baseBusiness::initUserCard);
-        ThreadUtil.execAsync(baseBusiness::initUserAccount);
-        ThreadUtil.execAsync(baseBusiness::initUserBalance);
+        baseBusiness.initXfCardLimited();
+        baseBusiness.initUserCard();
+        baseBusiness.initUserAccount();
+        baseBusiness.initUserBalance();
     }
 }