From d9e75c8c09738b31c375e3b843a3f2d4927f325f Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 26 七月 2023 09:13:29 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 228 +++++++++++++++++++++++++++++---------------------------
1 files changed, 117 insertions(+), 111 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index b8b2113..52cceca 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -24,12 +24,11 @@
import com.ruoyi.order.service.order.OrderGoodsService;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.order.service.order.UserServiceRecordService;
-import com.ruoyi.order.tools.request.ecommerce.profitsharing.ProfitSharingApplyRequest;
-import com.ruoyi.order.tools.service.ProfitsSharingService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.constant.DelayTaskEnum;
import com.ruoyi.system.api.constant.SecurityConstant;
import com.ruoyi.system.api.domain.dto.*;
+import com.ruoyi.system.api.domain.poji.activity.ActivityRecord;
import com.ruoyi.system.api.domain.poji.config.DelayTask;
import com.ruoyi.system.api.domain.poji.goods.Goods;
import com.ruoyi.system.api.domain.poji.goods.GoodsFile;
@@ -41,15 +40,12 @@
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.service.*;
-import com.wechat.pay.java.core.Config;
-import com.wechat.pay.java.core.RSAConfig;
import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction;
-import com.wechat.pay.java.service.payments.jsapi.JsapiServiceExtension;
-import com.wechat.pay.java.service.payments.jsapi.model.*;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -110,8 +106,9 @@
@Resource
private RedisService redisService;
- @Resource
- private ProfitsSharingService profitsSharingService;
+ //@Resource
+ //@Qualifier("profitsSharingServiceImpl")
+ //private ProfitsSharingService profitsSharingService;
@Autowired
private RedissonClient redissonClient;
@@ -179,7 +176,10 @@
List<AppMemberCouponVo> appMemberCouponVoList = remoteCouponService.listVoMemberCouponByUserId(merBaseDto).getData();
// 将优惠券列表转换为Map，以优惠券ID为键
- Map<String, AppMemberCouponVo> appMemberCouponVoMap = appMemberCouponVoList.stream().collect(Collectors.toMap(AppMemberCouponVo::getMemberCouponId, Function.identity()));
+ Map<String, AppMemberCouponVo> appMemberCouponVoMap = new HashMap<>();
+ if(appMemberCouponVoList!=null&&!appMemberCouponVoList.isEmpty()){
+ appMemberCouponVoMap = appMemberCouponVoList.stream().collect(Collectors.toMap(AppMemberCouponVo::getMemberCouponId, Function.identity()));
+ }
AppMemberCouponVo appMemberCouponVo;
Integer couponType;
BigDecimal moneyThreshold;
@@ -266,7 +266,6 @@
appSureOrderGoodsVo.setGoodsTotalPrice(goodsTotalPrice);
appSureOrderGoodsVo.setCouponDiscount(discountMoney);
appSureOrderGoodsVo.setGoodsRealPrice(goodsRealPrice);
- goodsDeposit = goods.getSubscription();
// 获取商品押金
goodsDeposit = goods.getSubscription();
if (goodsDeposit != null && goodsDeposit.compareTo(BigDecimal.ZERO)>0) {
@@ -294,6 +293,8 @@
}else{
entity.setUseFlag(0);
}
+
+
}
// 过滤商品优惠券列表
List<AppMemberCouponVo> appGoodsMemberCouponVoList;
@@ -304,7 +305,7 @@
if(entity.getCouponType()!=1){
appGoodsMemberCouponVoList.add(entity);
}else{
- if(entity.getMoneyThreshold().compareTo(sureOrderGoodsVo.getGoodsTotalPrice())>0){
+ if(entity.getMoneyThreshold().compareTo(sureOrderGoodsVo.getGoodsTotalPrice())<0){
appGoodsMemberCouponVoList.add(entity);
}
}
@@ -414,6 +415,9 @@
if (activityGoodsGetVo.getAvailableBuyNum() < 1) {
throw new ServiceException(AppErrorConstant.ACTIVITY_GOODS_NULL);
}
+ if (activityGoodsGetVo.getAvailableBuyNum() < buyNum) {
+ throw new ServiceException(AppErrorConstant.ACTIVITY_GOODS_BEYOND);
+ }
Goods goods = remoteGoodsService.getGoods(goodsId).getData();
if(goods.getGoodsStatus()!=1){
throw new ServiceException(AppErrorConstant.GOODS_DOWN);
@@ -466,6 +470,7 @@
* @return
*/
@Override
+ @Transactional
public AppPlaceOrderVo placeOrder(AppPlaceOrderDto appPlaceOrderDto) {
// 获取用户ID
Long userId = appPlaceOrderDto.getUserId();
@@ -706,7 +711,7 @@
profitsSharingService.combineTransactions(request);*/
//构建预下单支付对象
- PrepayRequest request = new PrepayRequest();
+ /*PrepayRequest request = new PrepayRequest();
Amount amount = new Amount();
amount.setTotal(Integer.parseInt(order.getPayMoney().multiply(new BigDecimal(100)).toString()));
request.setAmount(amount);
@@ -717,7 +722,7 @@
request.setOutTradeNo(order.getOrderId());
Payer payer = new Payer();
payer.setOpenid("oLTPCuN5a-nBD4rAL_fa********");
- request.setPayer(payer);
+ request.setPayer(payer);*/
//返回前端唤醒支付结果信息
/*PrepayWithRequestPaymentResponse res = this.getJsApIResponse(request);
appPlaceOrderVo.setAppId(this.appId);
@@ -729,7 +734,7 @@
//减去优惠券
- if(memberCouponSJ!=null){
+ if(memberCouponSJ!=null&&StringUtils.isNotBlank(memberCouponSJ.toString())){
remoteCouponService.useMemberCoupon(memberCouponSJ.toString());
}
//生成自动取消订单延时任务
@@ -744,80 +749,8 @@
delayTask.setEndTime(DateUtils.addMinutes(new Date(),delayTime));
delayTask.setRedisKey(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode() + "-" + orderId);
remoteConfigService.addDelayTask(delayTask);
- appPlaceOrderVo.setPayDeadlineTime(DateUtils.addMinutes(order.getCreateTime(),delayTime));
+ appPlaceOrderVo.setEndTime(DateUtils.addMinutes(order.getCreateTime(),delayTime));
return appPlaceOrderVo;
- }
-
- /**
- *
- * 功能描述: 预下单，返回支付数据prePayId
- *
- * 构建对象参考
- * PrepayRequest request = new PrepayRequest();
- * Amount amount = new Amount();
- * amount.setTotal(100);
- * request.setAmount(amount);
- * request.setAppid("wxa9d9651ae******");
- * request.setMchid("190000****");
- * request.setDescription("测试商品标题");
- * request.setNotifyUrl("https://notify_url");
- * request.setOutTradeNo("out_trade_no_001");
- * Payer payer = new Payer();
- * payer.setOpenid("oLTPCuN5a-nBD4rAL_fa********");
- * request.setPayer(payer);
- *
- * @auther: linqingsong
- * @date: 2023/7/22 16:13
- */
- /*public String getPrePayId(PrepayRequest request) {
- Config config =
- new RSAConfig.Builder()
- .merchantId(merchantId)
- .privateKeyFromPath(privateKeyPath)
- .merchantSerialNumber(merchantSerialNumber)
- .wechatPayCertificatesFromPath(wechatPayCertificatePath)
- .build();
- JsapiService service = new JsapiService.Builder().config(config).build();
- PrepayResponse response = service.prepay(request);
- return response.getPrepayId();
- }*/
-
-
- /**
- *
- * 功能描述: 预下单，并返回前端需要换起支付的字符串
- *
- * 构建对象参考
- * * PrepayRequest request = new PrepayRequest();
- * * Amount amount = new Amount();
- * * amount.setTotal(100);
- * * request.setAmount(amount);
- * * request.setAppid("wxa9d9651ae******");
- * * request.setMchid("190000****");
- * * request.setDescription("测试商品标题");
- * * request.setNotifyUrl("https://notify_url");
- * * request.setOutTradeNo("out_trade_no_001");
- * * Payer payer = new Payer();
- * * payer.setOpenid("oLTPCuN5a-nBD4rAL_fa********");
- * * request.setPayer(payer);
- *
- *
- * @auther: linqingsong
- * @date: 2023/7/22 16:53
- */
- public PrepayWithRequestPaymentResponse getJsApIResponse(PrepayRequest request){
- Config config =
- new RSAConfig.Builder()
- .merchantId(merchantId)
- .privateKeyFromPath(privateKeyPath)
- .merchantSerialNumber(merchantSerialNumber)
- .wechatPayCertificatesFromPath(wechatPayCertificatePath)
- .build();
- JsapiServiceExtension service = new JsapiServiceExtension.Builder().config(config).build();
-
- PrepayWithRequestPaymentResponse response = service.prepayWithRequestPayment(request);
-
- return response;
}
@@ -829,6 +762,7 @@
* @date 2023/7/6 17:59
*/
@Override
+ @Transactional
public AppPlaceOrderVo placeActivityOrder(AppPlaceActivityDto appPlaceActivityDto) {
Long userId = appPlaceActivityDto.getUserId();
// 创建订单对象
@@ -888,8 +822,8 @@
if (activityGoodsGetVo.getAvailableBuyNum() < 1) {
throw new ServiceException(AppErrorConstant.ACTIVITY_GOODS_NULL);
}
- if (buyNum < activityGoodsGetVo.getAvailableBuyNum()) {
- throw new ServiceException(AppErrorConstant.ACTIVITY_GOODS_NULL);
+ if (activityGoodsGetVo.getAvailableBuyNum() < buyNum) {
+ throw new ServiceException(AppErrorConstant.ACTIVITY_GOODS_BEYOND);
}
// 创建订单ID和订单号
String orderId = IdUtils.simpleUUID();
@@ -1041,7 +975,7 @@
agStockChangeDto.setUserId(order.getUserId());
remoteActivityService.changeActivityStock(agStockChangeDto);
// 调用支付
- PrepayRequest request = new PrepayRequest();
+ /*PrepayRequest request = new PrepayRequest();
Amount amount = new Amount();
amount.setTotal(Integer.parseInt(order.getPayMoney().multiply(new BigDecimal(100)).toString()));
request.setAmount(amount);
@@ -1054,14 +988,14 @@
// TODO 获取openID
payer.setOpenid("oLTPCuN5a-nBD4rAL_fa********");
- request.setPayer(payer);
+ request.setPayer(payer);*/
//设置订单允许分账 秒杀活动才允许分账
- if(order.getOrderFrom()==2){
+ /*if(order.getOrderFrom()==2){
SettleInfo settleInfo=new SettleInfo();
settleInfo.setProfitSharing(true);
request.setSettleInfo(settleInfo);
- }
+ }*/
//返回前端唤醒支付结果信息
@@ -1074,7 +1008,19 @@
appPlaceOrderVo.setTradeType(res.getSignType());
appPlaceOrderVo.setPaySign(res.getPaySign());
*/
-
+ //生成活动参加记录
+ ActivityRecord activityRecord = new ActivityRecord();
+ activityRecord.setDelFlag(0);
+ activityRecord.setActivityId(activityId);
+ activityRecord.setUserId(userId);
+ activityRecord.setOrderTime(order.getCreateTime());
+ activityRecord.setOrderMoney(order.getOrderMoney());
+ activityRecord.setOrderId(orderId);
+ activityRecord.setCreateTime(new Date());
+ activityRecord.setBuyNum(orderGoods.getBuyNum());
+ activityRecord.setGoodsId(orderGoods.getGoodsId());
+ activityRecord.setActivityMoney(activityGoodsGetVo.getActivityPrice());
+ remoteActivityService.addActivityRecord(activityRecord);
//生成自动取消订单延时任务
Integer delayTime = 30;
if(redisService.hasKey(SecurityConstant.AUTO_CANCEL_ORDER_TIME)){
@@ -1087,7 +1033,7 @@
delayTask.setEndTime(DateUtils.addMinutes(new Date(),delayTime));
delayTask.setRedisKey(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode() + "-" + orderId);
remoteConfigService.addDelayTask(delayTask);
- appPlaceOrderVo.setPayDeadlineTime(DateUtils.addMinutes(order.getCreateTime(),delayTime));
+ appPlaceOrderVo.setEndTime(DateUtils.addMinutes(order.getCreateTime(),delayTime));
return appPlaceOrderVo;
}
@@ -1258,9 +1204,9 @@
merVerifyOrderVo.setUseTime(order.getUseTime());
merVerifyOrderVo.setAppUserOrderGoodsPageVoList(appUserOrderGoodsPageVoList);
// 根据订单用户ID获取用户信息
- SysUser sysUser = remoteUserService.getSysUser(order.getUserId()).getData();
- merVerifyOrderVo.setUserName(sysUser.getNickName());
- merVerifyOrderVo.setUserMobile(sysUser.getPhonenumber());
+ Member member = remoteMemberService.getMember(order.getUserId()).getData();
+ merVerifyOrderVo.setUserName(member.getRealName());
+ merVerifyOrderVo.setUserMobile(member.getMobile());
merVerifyOrderVo.setCloseFlag(order.getCloseFlag());
// 返回结果
return merVerifyOrderVo;
@@ -1273,6 +1219,7 @@
* @return
*/
@Override
+ @Transactional
public MerVerifyOrderVo sureVerifyOrder(MerVerifyOrderDto merVerifyOrderDto) {
String orderId = merVerifyOrderDto.getOrderId();
BigDecimal relReceiveMoney = merVerifyOrderDto.getRelReceiveMoney();
@@ -1283,6 +1230,7 @@
if (order.getOrderStatus() != 2) {
throw new ServiceException(AppErrorConstant.VERIFY_USED);
}
+
ShopRelUserVo shopRelUserVo = remoteShopService.getShopByUserId(merVerifyOrderDto.getUserId()).getData();
if(!shopRelUserVo.getShopId().equals(order.getShopId())){
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
@@ -1351,9 +1299,10 @@
merVerifyOrderVo.setCreateTime(order.getCreateTime());
merVerifyOrderVo.setPayTime(order.getPayTime());
merVerifyOrderVo.setUseTime(order.getUseTime());
- SysUser sysUser = remoteUserService.getSysUser(order.getUserId()).getData();
- merVerifyOrderVo.setUserName(sysUser.getNickName());
- merVerifyOrderVo.setUserMobile(sysUser.getPhonenumber());
+ Member member = remoteMemberService.getMember(order.getUserId()).getData();
+ merVerifyOrderVo.setUserName(member.getRealName());
+ merVerifyOrderVo.setUserMobile(member.getMobile());
+ merVerifyOrderVo.setCloseFlag(order.getCloseFlag());
//
if(order.getOrderFrom()==2){
@@ -1371,6 +1320,7 @@
* @date 2023/6/28 11:26
*/
@Override
+ @Transactional
public MerVerifyCouponVo sureVerifyCoupon(MerVerifyCouponDto merVerifyCouponDto) {
MerVerifyCouponGetVo verifyCouponGetVo = remoteCouponService.getVerifyCoupon(merVerifyCouponDto.getMemberCouponId()).getData();
ShopRelUserVo shopRelUserVo = remoteShopService.getShopByUserId(merVerifyCouponDto.getUserId()).getData();
@@ -1384,7 +1334,7 @@
Long userId = verifyCouponGetVo.getUserId();
// 调用remoteMemberService的getMember方法获取Member对象
Member member = remoteMemberService.getMember(userId).getData();
- merVerifyCouponVo.setUserName(member.getNickName());
+ merVerifyCouponVo.setUserName(member.getRealName());
merVerifyCouponVo.setUserMobile(member.getMobile());
merVerifyCouponVo.setCouponFrom(verifyCouponGetVo.getCouponFrom());
merVerifyCouponVo.setCouponName(verifyCouponGetVo.getMemberCoupon().getCouponName());
@@ -1464,6 +1414,7 @@
* @return MerVerifyAwardVo
*/
@Override
+ @Transactional
public MerVerifyAwardVo sureVerifyPrize(MerVerifyPrizeDto merVerifyPrizeDto){
MerVerifyAwardVo merVerifyAwardVo = new MerVerifyAwardVo();
MemberGiftRecord memberGiftRecord = remoteMemberService.getVerifyPrize(merVerifyPrizeDto.getPrizeId()).getData();
@@ -1475,7 +1426,7 @@
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
Member member = remoteMemberService.getMember(memberGiftRecord.getUserId()).getData();
- merVerifyAwardVo.setUserName(member.getNickName());
+ merVerifyAwardVo.setUserName(member.getRealName());
merVerifyAwardVo.setUserMobile(member.getMobile());
if(memberGiftRecord.getGiftFrom()==1){
merVerifyAwardVo.setGiftFrom("平台生日卡");
@@ -1595,6 +1546,8 @@
public void createNewOrder(MerNewOrderDto merNewOrderDto) {
Long userId = merNewOrderDto.getBuyUserId();
Date nowTime = new Date();
+ Long shopId = merNewOrderDto.getShopId();
+ Shop shop = remoteShopService.getShop(shopId).getData();
//如果非指定用户判断是否需要通过手机号创建新用户
if (userId == null) {
String name = merNewOrderDto.getName();
@@ -1622,6 +1575,9 @@
member.setMobile(mobile);
member.setRealName(name);
member.setNickName(name);
+ member.setBindingFlag(1);
+ member.setRelationShopId(shopId);
+ member.setRelationShopName(shop.getShopName());
remoteMemberService.createNewMember(member);
}
userId = sysUser.getUserId();
@@ -1638,8 +1594,6 @@
BigDecimal goodsPrice;
BigDecimal goodsTotalPrice;
BigDecimal goodsRealPrice;
- Long shopId = merNewOrderDto.getShopId();
- Shop shop = remoteShopService.getShop(shopId).getData();
MerBaseDto merBaseDto = new MerBaseDto();
merBaseDto.setUserId(userId);
merBaseDto.setShopId(shopId);
@@ -2833,7 +2787,7 @@
Long userId = verifyCouponGetVo.getUserId();
// 调用remoteMemberService的getMember方法获取Member对象
Member member = remoteMemberService.getMember(userId).getData();
- merVerifyCouponVo.setUserName(member.getNickName());
+ merVerifyCouponVo.setUserName(member.getRealName());
merVerifyCouponVo.setUserMobile(member.getMobile());
merVerifyCouponVo.setCouponFrom(verifyCouponGetVo.getCouponFrom());
merVerifyCouponVo.setCouponName(verifyCouponGetVo.getMemberCoupon().getCouponName());
@@ -2882,7 +2836,7 @@
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
Member member = remoteMemberService.getMember(memberGiftRecord.getUserId()).getData();
- merVerifyAwardVo.setUserName(member.getNickName());
+ merVerifyAwardVo.setUserName(member.getRealName());
merVerifyAwardVo.setUserMobile(member.getMobile());
if(memberGiftRecord.getGiftFrom()==1){
merVerifyAwardVo.setGiftFrom("平台生日卡");
@@ -3148,7 +3102,15 @@
*/
@Override
public MerTotalOrderVo totalMerOrder(MerBaseDto merBaseDto) {
- return orderMapper.totalMerOrder(merBaseDto.getShopId());
+ MerTotalOrderVo merTotalOrderVo = new MerTotalOrderVo();
+ merTotalOrderVo = orderMapper.totalMerOrder(merBaseDto.getShopId());
+ Shop shop = remoteShopService.getShop(merBaseDto.getShopId()).getData();
+ if(shop.getShopType()==2){
+ merTotalOrderVo.setAgencyFlag(1);
+ }else{
+ merTotalOrderVo.setAgencyFlag(0);
+ }
+ return merTotalOrderVo;
}
/**
@@ -3217,6 +3179,7 @@
* @return void
*/
@Override
+ @Transactional
public void autoCancelOrder(String orderId){
//更新订单信息
Order order = this.getById(orderId);
@@ -3247,6 +3210,13 @@
agStockChangeDto.setShopId(order.getShopId());
agStockChangeDto.setUserId(order.getUserId());
remoteActivityService.changeActivityStock(agStockChangeDto);
+ //删除活动记录
+ ActivityRecord activityRecord = new ActivityRecord();
+ activityRecord.setActivityId(order.getActivityId());
+ activityRecord.setGoodsId(orderGoods.getGoodsId());
+ activityRecord.setUserId(order.getUserId());
+ activityRecord.setOrderTime(order.getCreateTime());
+ remoteActivityService.delActivityRecord(activityRecord);
}
}
}else{
@@ -3271,10 +3241,11 @@
* @description 订单支付回调
* @author jqs
* @date 2023/7/13 17:57
- * @param Transaction
+ * @param transaction
* @return void
*/
@Override
+ @Transactional
public void payBack(Transaction transaction) {
// 更新订单状态
String orderId=transaction.getOutTradeNo();
@@ -3387,11 +3358,11 @@
//活动订单进行分账
- ProfitSharingApplyRequest request=new ProfitSharingApplyRequest();
+ /*ProfitSharingApplyRequest request=new ProfitSharingApplyRequest();
request.setAppid(this.appId);
request.setSubMchid("");
request.setTransactionId(transaction.getTransactionId());
- profitsSharingService.applyProfitSharing(request);
+ profitsSharingService.applyProfitSharing(request);*/
}
//生成支付记录
OrderPayment orderPayment = new OrderPayment();
@@ -3410,6 +3381,7 @@
* @return void
*/
@Override
+ @Transactional
public void refundOrder(String orderId){
//更新订单信息
Order order = this.getById(orderId);
@@ -3462,6 +3434,13 @@
agStockChangeDto.setShopId(order.getShopId());
agStockChangeDto.setUserId(order.getUserId());
remoteActivityService.changeActivityStock(agStockChangeDto);
+ //删除活动记录
+ ActivityRecord activityRecord = new ActivityRecord();
+ activityRecord.setActivityId(order.getActivityId());
+ activityRecord.setGoodsId(orderGoods.getGoodsId());
+ activityRecord.setUserId(order.getUserId());
+ activityRecord.setOrderTime(order.getCreateTime());
+ remoteActivityService.delActivityRecord(activityRecord);
}else{
memberCouponSJ.add(orderGoods.getCouponId());
}
@@ -3786,4 +3765,31 @@
}
return dateList;
}
+
+ /**
+ * @description 检查订单状态定时任务
+ * @author jqs
+ * @date 2023/7/25 14:40
+ * @param
+ * @return void
+ */
+ @Override
+ public void checkOrderStatus(){
+ Integer delayTime = 30;
+ if(redisService.hasKey(SecurityConstant.AUTO_CANCEL_ORDER_TIME)){
+ delayTime = redisService.getCacheObject(SecurityConstant.AUTO_CANCEL_ORDER_TIME);
+ }
+ delayTime = delayTime + 5;
+ Date checkTime = DateUtils.addMinutes(new Date(),delayTime);
+ LambdaQueryWrapper<Order> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(Order::getDelFlag,0);
+ queryWrapper.lt(Order::getCreateTime,checkTime);
+ queryWrapper.eq(Order::getOrderStatus,1);
+ List<Order> orderList = this.list(queryWrapper);
+ if(orderList!=null&&!orderList.isEmpty()){
+ for(Order order : orderList){
+ autoCancelOrder(order.getOrderId());
+ }
+ }
+ }
}
--
Gitblit v1.7.1