From 0300162ac6797562b2b2bad4f540c1e0a6e2cba4 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 06 十一月 2024 17:35:35 +0800
Subject: [PATCH] 1.提现金额不得大于500控制
---
src/main/java/com/mzl/flower/schedule/ScheduleService.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/mzl/flower/schedule/ScheduleService.java b/src/main/java/com/mzl/flower/schedule/ScheduleService.java
index afbca3b..e83425a 100644
--- a/src/main/java/com/mzl/flower/schedule/ScheduleService.java
+++ b/src/main/java/com/mzl/flower/schedule/ScheduleService.java
@@ -18,12 +18,14 @@
import com.mzl.flower.service.flower.FlowerCategoryService;
import com.mzl.flower.service.menber.impl.GrowthValueDealService;
import com.mzl.flower.service.payment.*;
+import com.mzl.flower.service.wallet.WalletBillRecordService;
import com.mzl.flower.thread.FlowerCategoryPriceThread;
import com.mzl.flower.utils.SmsUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -48,9 +50,6 @@
@Autowired
private UserPaymentV3Service paymentV3Service;
-
- @Autowired
- private UserPaymentSybService paymentSybService;
@Autowired
private OrderService orderService;
@@ -84,6 +83,10 @@
@Autowired
private BaseService baseService;
+
+ @Autowired
+ private WalletBillRecordService walletBillRecordService;
+
@Scheduled(cron = "1 1 0/2 * * ?")
public void calculateAvePrice() {
@@ -124,11 +127,10 @@
try {
LocalDateTime createdTime = o.getCreateTime().plusMinutes(5);
if (createdTime.isBefore(LocalDateTime.now())) {
- /*boolean f = paymentV3Service.checkOrderStatus(o.getId());
+ boolean f = paymentV3Service.checkOrderStatus(o.getId());
if(!f){
paymentV3Service.cancelOrder(o.getId());
- }*/
- paymentSybService.cancelOrder(o.getId());
+ }
}
} catch (Exception e) {
log.error(e.getMessage(), e);
@@ -186,6 +188,8 @@
try {
paymentV3Service.checkTransferStatus(t);
settlementService.updateSettlementStatus(t.getId());
+ //2024-10-24更新钱包提现信息
+ walletBillRecordService.updateTransferStatus(t.getId());
} catch (Exception e) {
log.error(e.getMessage(), e);
}
@@ -263,6 +267,7 @@
}
@Scheduled(cron = "0 15 17 * * ?")
+ @Profile("prod")
public void DealSendMessageInfoBySupplier() {
log.info("供应商下单供货提示开始：" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
// 获取当前日期
@@ -273,11 +278,11 @@
LocalDateTime endDateTime = LocalDateTime.of(currentDate, LocalTime.of(17, 0));
System.out.println("开始时间： " + startDateTime);
System.out.println("结束时间： " + endDateTime);
- List<String> sends = orderMapper.getWaitSendMessageInfoBySupplier("SEND", startDateTime, endDateTime);
+ List<String> sends = orderMapper.getWaitSendMessageInfoBySupplier("COLLECTION", startDateTime, endDateTime);
if(CollectionUtils.isNotEmpty(sends)) {
sends.forEach(s -> {
try {
- SmsUtil.sendSms(s, "SMS_474500141", null);
+ SmsUtil.sendSms(s, "SMS_474905508", null);
} catch (ClientException e) {
log.error("发送短信失败，手机号：" + s, e);
}
--
Gitblit v1.9.3