fs-common/src/main/java/com/fs/common/core/domain/R.java

@@ -46,6 +46,16 @@ public class R extends HashMap<String, Object> {
 		return new R();
 	}
 
+	public boolean isSuccess() {
+		return get("code").equals(200);
+	}
+
+	public String getMsg() {
+		return String.valueOf(get("msg"));
+	}
+
+
+
 	public R put(String key, Object value) {
 		super.put(key, value);
 		return this;

fs-company/src/main/java/com/fs/company/controller/companyTask/companyTask.java

@@ -0,0 +1,18 @@
+package com.fs.company.controller.companyTask;
+
+import com.fs.his.service.ISysRedpacketConfigMoreService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component("companyTask")
+public class companyTask {
+
+    @Autowired
+    private ISysRedpacketConfigMoreService sysRedpacketConfigMoreService;
+
+    //切换商户号
+    public void changeRedPacketConfig()
+    {
+        sysRedpacketConfigMoreService.changeRedPacketConfig();
+    }
+}

fs-service/src/main/java/com/fs/course/service/impl/FsCourseTrafficLogServiceImpl.java

@@ -526,8 +526,8 @@ public class FsCourseTrafficLogServiceImpl implements IFsCourseTrafficLogService
 
     @Override
     public void batchDelTraffic() {
-        // 设置删除的时间条件（2025-09-01之前）
-        LocalDate targetLocalDate = LocalDate.of(2025, 12, 1);
+        // 设置删除的时间条件：三个月之前
+        LocalDate targetLocalDate = LocalDate.now().minusMonths(3).withDayOfMonth(1);
         Date targetDate = Date.from(targetLocalDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
 
         int batchSize = 5000; // 每批次处理数量

fs-service/src/main/java/com/fs/his/service/impl/FsStorePaymentServiceImpl.java

@@ -102,6 +102,7 @@ import com.github.binarywang.wxpay.service.TransferService;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
 import com.hc.openapi.tool.fastjson.JSON;
+import io.netty.util.internal.StringUtil;
 import me.chanjar.weixin.common.error.WxErrorException;
 
 import org.apache.commons.lang3.exception.ExceptionUtils;
@@ -1948,15 +1949,22 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
     @Transactional
     public R sendAppRedPacket(WxSendRedPacketParam param) {
         //组合返回参数
+        String json;
         R result = new R();
-        String json = configService.selectConfigByKey("his.AppRedPacket");
+        json = redisCache.getCacheObject("sys_config:redPacket.config.new");
+        if (StringUtil.isNullOrEmpty(json) || json.isEmpty()) {
+            json = configService.selectConfigByKey("his.AppRedPacket");
+        }
+//        String json = configService.selectConfigByKey("his.AppRedPacket");
         AppRedPacketConfig config = JSONUtil.toBean(json, AppRedPacketConfig.class);
         if (config.getIsNew() != null && config.getIsNew() == 1) {
             result = sendRedPacketV3(param, config);
         } else {
             result= sendRedPacketLegacy(param, config);
         }
-
+        if (result.getMsg().equals("商家余额不足") && param.getRedPacketMode() == 1) {
+            redisCache.incr("sys_config:redPacket.config.newCount",1L);
+        }
         result.put("mchId", config.getMchId());
         result.put("isNew",config.getIsNew());
         logger.info("App提现返回：{}",result);

fs-user-app/src/main/java/com/fs/app/controller/course/CourseFsUserController.java

@@ -271,21 +271,21 @@ public class CourseFsUserController extends AppBaseController {
                 return "商户账户余额不足，请联系管理员充值";
             // 订单相关
             case "ORDERNOTEXIST":
-                return "转账订单不存在";
+                return "发放订单不存在";
             case "ORDER_PAID":
-                return "转账订单已支付，请勿重复操作";
+                return "发放订单已支付，请勿重复操作";
             // 频率/额度限制
             case "FREQUENCY_LIMITED":
                 return "操作过于频繁，请稍后再试";
             case "EXCEED_QTY_LIMIT":
-                return "超过转账数量限制，请稍后再试";
+                return "超过发放数量限制，请稍后再试";
             case "EXCEED_QUOTA_LIMIT":
-                return "超过转账额度限制，请稍后再试";
+                return "超过发放额度限制，请稍后再试";
             case "TRANSFER_QUOTA_OVER_LIMIT":
-                return "转账金额超限，请联系管理员";
+                return "发放金额超限，请联系管理员";
             // 转账失败
             case "PAY_FAIL":
-                return "转账失败，请稍后重试";
+                return "发放失败，请稍后重试";
             // 付款方账户问题
             case "PAYER_ACCOUNT_ERROR":
                 return "付款账户异常，请联系管理员";
@@ -303,7 +303,7 @@ public class CourseFsUserController extends AppBaseController {
                 return "收款账号被限制，请联系客服";
             // 风控
             case "TRANSFER_RISK":
-                return "转账存在风险，请稍后重试";
+                return "发放存在风险，请稍后重试";
             // 实名校验
             case "REALNAME_CHECK_ERROR":
                 return "收款人实名信息不匹配，请核实后重试";
@@ -327,15 +327,15 @@ public class CourseFsUserController extends AppBaseController {
                 return "签名错误，请联系管理员";
             // 场景ID相关
             case "SCENE_ID_NOT_EXIST":
-                return "转账场景不存在，请联系管理员";
+                return "发放场景不存在，请联系管理员";
             case "SCENE_NOT_ALLOWED":
-                return "该场景不允许转账，请联系管理员";
+                return "该场景不允许发放，请联系管理员";
             // 转账状态
             case "TRANSFER_ALREADY_EXISTS":
-                return "转账已存在，请勿重复操作";
+                return "发放已存在，请勿重复操作";
             // V3接口特有错误码
             case "RESOURCE_NOT_EXISTS":
-                return "转账账单不存在";
+                return "发放账单不存在";
             case "REQUEST_BLOCKED":
                 return "请求被拦截，请稍后重试";
             default: