|
@@ -1,10 +1,14 @@
|
|
package com.gree.mall.manager.schedule;
|
|
package com.gree.mall.manager.schedule;
|
|
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
|
+import com.github.binarywang.wxpay.exception.WxPayException;
|
|
import com.gree.mall.manager.enums.workorder.OrderBaseStatusEnum;
|
|
import com.gree.mall.manager.enums.workorder.OrderBaseStatusEnum;
|
|
|
|
+import com.gree.mall.manager.logic.common.WechatLogic;
|
|
import com.gree.mall.manager.logic.workorder.OrderBaseLogic;
|
|
import com.gree.mall.manager.logic.workorder.OrderBaseLogic;
|
|
import com.gree.mall.manager.plus.entity.PgOrderBase;
|
|
import com.gree.mall.manager.plus.entity.PgOrderBase;
|
|
|
|
+import com.gree.mall.manager.plus.entity.SettlementOrder;
|
|
import com.gree.mall.manager.plus.service.PgOrderBaseService;
|
|
import com.gree.mall.manager.plus.service.PgOrderBaseService;
|
|
|
|
+import com.gree.mall.manager.plus.service.SettlementOrderService;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
|
@@ -32,6 +36,11 @@ public class OrderBaseSchedule {
|
|
OrderBaseLogic orderBaseLogic;
|
|
OrderBaseLogic orderBaseLogic;
|
|
@Autowired
|
|
@Autowired
|
|
PgOrderBaseService pgOrderBaseService;
|
|
PgOrderBaseService pgOrderBaseService;
|
|
|
|
+ @Autowired
|
|
|
|
+ SettlementOrderService settlementOrderService;
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
|
|
+ WechatLogic wechatLogic;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 生成抢单通知
|
|
* 生成抢单通知
|
|
@@ -63,8 +72,14 @@ public class OrderBaseSchedule {
|
|
* 每天五点结算所有结算单
|
|
* 每天五点结算所有结算单
|
|
*/
|
|
*/
|
|
@Transactional
|
|
@Transactional
|
|
- @Scheduled(cron = "0 0 12 * * ?")
|
|
|
|
- public void fenzhang(){
|
|
|
|
|
|
+ //@Scheduled(cron = "0 0 17 * * ?")
|
|
|
|
+ @Scheduled(fixedDelay = 30 * 1000)
|
|
|
|
+ public void fenzhang() throws WxPayException {
|
|
|
|
+ List<SettlementOrder> settlementOrders = settlementOrderService.lambdaQuery().eq(SettlementOrder::getStatus, "WAIT").list();
|
|
|
|
+
|
|
|
|
+ for (SettlementOrder settlementOrder : settlementOrders) {
|
|
|
|
+ wechatLogic.shareSettlementAmount(settlementOrder);
|
|
|
|
+ }
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|