From 5710fee2bd5c323096377a72d837050dd52d93b1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 03 一月 2023 14:32:14 +0800
Subject: [PATCH] 修复抖音订单更新问题/修复用户注销却自动封禁的bug
---
fanli/src/main/java/com/yeshi/fanli/job/order/OrderShareIncomeJob.java | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/order/OrderShareIncomeJob.java b/fanli/src/main/java/com/yeshi/fanli/job/order/OrderShareIncomeJob.java
index 0f0bb37..1c55b14 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/order/OrderShareIncomeJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/order/OrderShareIncomeJob.java
@@ -11,33 +11,43 @@
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceUserService;
import com.yeshi.fanli.service.manger.order.TeamDividentsManager;
+import org.yeshi.utils.StringUtil;
import org.yeshi.utils.TimeUtil;
//鍒嗕韩璧氬埌璐�
@Component
public class OrderShareIncomeJob {
- @Resource
- private TeamDividentsManager teamDividentsManager;
+ @Resource
+ private TeamDividentsManager teamDividentsManager;
- @Resource
- private TeamDividentsSourceUserService teamDividentsSourceUserService;
+ @Resource
+ private TeamDividentsSourceUserService teamDividentsSourceUserService;
- @Resource
- private OrderProcessService orderProcessService;
+ @Resource
+ private OrderProcessService orderProcessService;
- public OrderShareIncomeJob() {
+ public OrderShareIncomeJob() {
- }
+ }
- // 鍒嗕韩璧氬埌璐�
- @XxlJob("startOrderShareIncomeHandler")
- public ReturnT<String> startPreOrderTeamIncome(String param) throws Exception {
- String day = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM") + "-25";
- Date preSendTime = new Date(TimeUtil.convertToTimeTemp(day, "yyyy-MM-dd"));
- orderProcessService.fanliShare(preSendTime);
- return ReturnT.SUCCESS;
- }
+ // 鍒嗕韩璧氬埌璐�
+ @XxlJob("startOrderShareIncomeHandler")
+ public ReturnT<String> startPreOrderTeamIncome(String param) throws Exception {
+ String day = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM") + "-25";
+ if (!StringUtil.isNullOrEmpty(param)) {
+ day = param;
+ }
+
+ //25鍙蜂箣鍓嶄笉鑳藉埌璐︽湰鏈堢殑
+ long times = TimeUtil.convertToTimeTemp(day, "yyyy-MM-dd");
+ if (times > System.currentTimeMillis()) {
+ throw new Exception("25鍙蜂箣鍓嶄笉鑳藉埌璐︽湰鏈堢殑");
+ }
+ Date preSendTime = new Date(TimeUtil.convertToTimeTemp(day, "yyyy-MM-dd"));
+ orderProcessService.fanliShare(preSendTime);
+ return ReturnT.SUCCESS;
+ }
}
--
Gitblit v1.8.0