|
@@ -18,6 +18,7 @@ import org.linlinjava.litemall.core.notify.NotifyService;
|
|
|
import org.linlinjava.litemall.core.notify.NotifyType;
|
|
import org.linlinjava.litemall.core.notify.NotifyType;
|
|
|
import org.linlinjava.litemall.core.qcode.QCodeService;
|
|
import org.linlinjava.litemall.core.qcode.QCodeService;
|
|
|
import org.linlinjava.litemall.core.system.SystemConfig;
|
|
import org.linlinjava.litemall.core.system.SystemConfig;
|
|
|
|
|
+import org.linlinjava.litemall.core.task.TaskService;
|
|
|
import org.linlinjava.litemall.core.util.DateTimeUtil;
|
|
import org.linlinjava.litemall.core.util.DateTimeUtil;
|
|
|
import org.linlinjava.litemall.core.util.JacksonUtil;
|
|
import org.linlinjava.litemall.core.util.JacksonUtil;
|
|
|
import org.linlinjava.litemall.core.util.ResponseUtil;
|
|
import org.linlinjava.litemall.core.util.ResponseUtil;
|
|
@@ -27,6 +28,7 @@ import org.linlinjava.litemall.db.util.CouponUserConstant;
|
|
|
import org.linlinjava.litemall.db.util.OrderHandleOption;
|
|
import org.linlinjava.litemall.db.util.OrderHandleOption;
|
|
|
import org.linlinjava.litemall.db.util.OrderUtil;
|
|
import org.linlinjava.litemall.db.util.OrderUtil;
|
|
|
import org.linlinjava.litemall.core.util.IpUtil;
|
|
import org.linlinjava.litemall.core.util.IpUtil;
|
|
|
|
|
+import org.linlinjava.litemall.wx.task.OrderUnpaidTask;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
@@ -105,6 +107,8 @@ public class WxOrderService {
|
|
|
private LitemallCouponUserService couponUserService;
|
|
private LitemallCouponUserService couponUserService;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private CouponVerifyService couponVerifyService;
|
|
private CouponVerifyService couponVerifyService;
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private TaskService taskService;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 订单列表
|
|
* 订单列表
|
|
@@ -422,6 +426,9 @@ public class WxOrderService {
|
|
|
grouponService.createGroupon(groupon);
|
|
grouponService.createGroupon(groupon);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ // 订单支付超期任务
|
|
|
|
|
+ taskService.addTask(new OrderUnpaidTask(orderId));
|
|
|
|
|
+
|
|
|
Map<String, Object> data = new HashMap<>();
|
|
Map<String, Object> data = new HashMap<>();
|
|
|
data.put("orderId", orderId);
|
|
data.put("orderId", orderId);
|
|
|
return ResponseUtil.ok(data);
|
|
return ResponseUtil.ok(data);
|
|
@@ -766,6 +773,9 @@ public class WxOrderService {
|
|
|
|
|
|
|
|
notifyService.notifyWxTemplate(result.getOpenid(), NotifyType.PAY_SUCCEED, parms, "pages/index/index?orderId=" + order.getId());
|
|
notifyService.notifyWxTemplate(result.getOpenid(), NotifyType.PAY_SUCCEED, parms, "pages/index/index?orderId=" + order.getId());
|
|
|
|
|
|
|
|
|
|
+ // 取消订单超时未支付任务
|
|
|
|
|
+ taskService.removeTask(new OrderUnpaidTask(order.getId()));
|
|
|
|
|
+
|
|
|
return WxPayNotifyResponse.success("处理成功!");
|
|
return WxPayNotifyResponse.success("处理成功!");
|
|
|
}
|
|
}
|
|
|
|
|
|