backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化自动取消订单批次，改为分页

Browse Source
This commit is contained in:
liyj 2025-10-21 15:13:31 +08:00
parent 951050da3d
commit c6736d120d
3 changed files with 89 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
mall-shop/src/main/java/com/suisung/mall/shop/components/quartz/job/UpdateOrderStatusJob.java
View File

@ -7,6 +7,7 @@ import com.suisung.mall.shop.config.SpringUtil;
import com.suisung.mall.shop.distribution.service.ShopDistributionUserOrderService; import com.suisung.mall.shop.distribution.service.ShopDistributionUserOrderService;
import com.suisung.mall.shop.order.service.ShopOrderBaseService; import com.suisung.mall.shop.order.service.ShopOrderBaseService;
import com.suisung.mall.shop.order.service.ShopOrderInfoService; import com.suisung.mall.shop.order.service.ShopOrderInfoService;
import com.suisung.mall.shop.sixun.utils.CommonUtil;
import org.quartz.JobExecutionContext; import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException; import org.quartz.JobExecutionException;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -23,6 +24,8 @@ public class UpdateOrderStatusJob extends QuartzJobBean {
private static final Logger logger = LoggerFactory.getLogger(UpdateOrderStatusJob.class); private static final Logger logger = LoggerFactory.getLogger(UpdateOrderStatusJob.class);
private static final Integer PAGESIZE = 100;
@Override @Override
protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException { protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException {
ShopOrderBaseService shopOrderBaseService = SpringUtil.getBean(ShopOrderBaseService.class); ShopOrderBaseService shopOrderBaseService = SpringUtil.getBean(ShopOrderBaseService.class);
@ -36,51 +39,52 @@ public class UpdateOrderStatusJob extends QuartzJobBean {
//shopOrderBaseService.autoCancelOrder(); //shopOrderBaseService.autoCancelOrder();
// 更新未付款订单，取消超时订单 // 更新未付款订单，取消超时订单
List<String> order_id_row = shopOrderInfoService.getAutoCancelOrderId(); long total = shopOrderInfoService.countgetAutoCancelOrderId();
if (CollUtil.isNotEmpty(order_id_row)) { if (total > 0) {
for (String order_id : order_id_row) { int pages = CommonUtil.getPagesCount(Math.toIntExact(total), PAGESIZE);
try { for (int i = 1; i <= pages; i++) {
List<String> ids = Collections.singletonList(order_id); List<String> order_id_row = shopOrderInfoService.getAutoCancelOrderIdByPage(i, PAGESIZE);
if (!shopOrderBaseService.cancel(ids, null, true)) { for (String order_id : order_id_row) {
LogUtil.error(String.format(I18nUtil._("order_id : %s 取消出错"), order_id)); try {
List<String> ids = Collections.singletonList(order_id);
if (!shopOrderBaseService.cancel(ids, null, true)) {
LogUtil.error(String.format(I18nUtil._("order_id : %s 取消出错"), order_id));
}
} catch (Exception e) {
LogUtil.error(String.format(I18nUtil._("order_id : %s 取消出错"), order_id), e);
} }
} catch (Exception e) {
LogUtil.error(String.format(I18nUtil._("order_id : %s 取消出错"), order_id), e);
} }
} }
} }
// 自动确认收货
//shopOrderBaseService.autoReceive();
// 自动确认收货 // 2. 更新为确认收货
//shopOrderBaseService.autoReceive(); List<String> order_id_receipt = shopOrderInfoService.getAutoFinishOrderId();
if (CollUtil.isNotEmpty(order_id_receipt)) {
for (String order_id : order_id_receipt) {
// 2. 更新为确认收货 try {
List<String> order_id_receipt = shopOrderInfoService.getAutoFinishOrderId(); if (!shopOrderBaseService.receive(order_id, null)) {
if (CollUtil.isNotEmpty(order_id_receipt)) { LogUtil.error(String.format(I18nUtil._("order_id : %s 确认收货出错"), order_id));
for (String order_id : order_id_receipt) { }
try { } catch (Exception e) {
if (!shopOrderBaseService.receive(order_id, null)) { LogUtil.error(String.format(I18nUtil._("order_id : %s 确认收货出错"), order_id), e);
LogUtil.error(String.format(I18nUtil._("order_id : %s 确认收货出错"), order_id));
} }
} catch (Exception e) {
LogUtil.error(String.format(I18nUtil._("order_id : %s 确认收货出错"), order_id), e);
} }
} }
}
// 3.分销结算 // 3.分销结算
List<String> order_id_settle_commission = shopOrderBaseService.getWaitingSettleCommissionOrder(null, null); List<String> order_id_settle_commission = shopOrderBaseService.getWaitingSettleCommissionOrder(null, null);
if (CollUtil.isNotEmpty(order_id_settle_commission)) { if (CollUtil.isNotEmpty(order_id_settle_commission)) {
for (String order_id : order_id_settle_commission) { for (String order_id : order_id_settle_commission) {
try { try {
if (!shopDistributionUserOrderService.settleDistributionUserOrder(order_id)) { if (!shopDistributionUserOrderService.settleDistributionUserOrder(order_id)) {
LogUtil.error(String.format(I18nUtil._("order_id : %s 确认佣金结算出错"), order_id)); LogUtil.error(String.format(I18nUtil._("order_id : %s 确认佣金结算出错"), order_id));
}
} catch (Exception e) {
LogUtil.error(String.format(I18nUtil._("order_id : %s 确认佣金结算出错"), order_id), e);
}
} }
} catch (Exception e) {
LogUtil.error(String.format(I18nUtil._("order_id : %s 确认佣金结算出错"), order_id), e);
} }
} }
} }
}
}

13
mall-shop/src/main/java/com/suisung/mall/shop/order/service/ShopOrderInfoService.java
View File

@ -89,4 +89,17 @@ public interface ShopOrderInfoService extends IBaseService<ShopOrderInfo> {
*/ */
Boolean updateOrderReceived(String orderId); Boolean updateOrderReceived(String orderId);
/**
* 分页查询取消订单
* @param pageNum
* @param pageSize
* @return
*/
List<String> getAutoCancelOrderIdByPage(Integer pageNum, Integer pageSize);
/**
* 查询取消订单总数
* @return
*/
long countgetAutoCancelOrderId();
} }

36
mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java
View File

@ -56,6 +56,7 @@ import java.math.BigDecimal;
import java.util.*; import java.util.*;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor;
import java.util.stream.Collectors;
import static com.suisung.mall.common.utils.ContextUtil.getCurrentUser; import static com.suisung.mall.common.utils.ContextUtil.getCurrentUser;
@ -180,6 +181,9 @@ public class ShopOrderInfoServiceImpl extends BaseServiceImpl<ShopOrderInfoMappe
return Convert.toList(String.class, findKey(queryWrapper)); return Convert.toList(String.class, findKey(queryWrapper));
} }
/** /**
* 获取能自动确认收货的订单号 * 获取能自动确认收货的订单号
* *
@ -781,4 +785,36 @@ public class ShopOrderInfoServiceImpl extends BaseServiceImpl<ShopOrderInfoMappe
return data; return data;
} }
@Override
public List<String> getAutoCancelOrderIdByPage(Integer pageNum, Integer pageSize) {
QueryWrapper<ShopOrderInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.select("order_id","order_state_id");
queryWrapper.eq("order_state_id", StateCode.ORDER_STATE_WAIT_PAY)
.eq("order_is_paid", StateCode.ORDER_PAID_STATE_NO)
.eq("payment_type_id", StateCode.PAYMENT_TYPE_ONLINE);
Float order_autocancel_time = accountBaseConfigService.getConfig("order_autocancel_time", 0.5f);
int second = NumberUtil.mul(order_autocancel_time, 60, 60).intValue();
long time = DateUtil.offsetSecond(new Date(), -second).getTime();
queryWrapper.lt("order_time", time);
List<ShopOrderInfo> shopOrderInfos=this.lists(queryWrapper,pageNum,pageSize).getRecords();
return shopOrderInfos.stream().map(ShopOrderInfo::getOrder_id).collect(Collectors.toList());
}
@Override
public long countgetAutoCancelOrderId() {
QueryWrapper<ShopOrderInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("order_state_id", StateCode.ORDER_STATE_WAIT_PAY)
.eq("order_is_paid", StateCode.ORDER_PAID_STATE_NO)
.eq("payment_type_id", StateCode.PAYMENT_TYPE_ONLINE);
Float order_autocancel_time = accountBaseConfigService.getConfig("order_autocancel_time", 0.5f);
int second = NumberUtil.mul(order_autocancel_time, 60, 60).intValue();
long time = DateUtil.offsetSecond(new Date(), -second).getTime();
queryWrapper.lt("order_time", time);
return this.count(queryWrapper);
}
} }