ricrd

src/main/java/com/izouma/nineth/service/AuctionActivityService.java

@@ -179,12 +179,14 @@ public class AuctionActivityService {
                 return;
             }
         }
-        AuctionActivity nowRecord = auctionActivityRepo.findById(record.getId())
+        AuctionActivity recordNew1 = auctionActivityRepo.findById(record.getId())
                 .orElseThrow(new BusinessException("无数据"));
-        if (nowRecord.getStatus().equals(AuctionStatus.ONGOING)) {
-            if (nowRecord.getEndTime().minusSeconds(2).isAfter(LocalDateTime.now())) {
+        if (recordNew1.getStatus().equals(AuctionStatus.ONGOING)) {
+            if (recordNew1.getEndTime().minusSeconds(2).isAfter(LocalDateTime.now())) {
                 Date date = Date.from(record.getEndTime().atZone(ZoneId.systemDefault()).toInstant());
                 ScheduledFuture<?> future = taskScheduler.schedule(() -> {
+                    AuctionActivity nowRecord = auctionActivityRepo.findById(record.getId())
+                            .orElseThrow(new BusinessException("无数据"));
                     if (nowRecord.getPurchasePrice() != null) {
                         auctionActivityRepo.scheduleOffShelf(nowRecord.getId(), AuctionStatus.PURCHASED);
                     } else {
@@ -194,10 +196,10 @@ public class AuctionActivityService {
                 }, date);
                 tasks.put(record.getId(), future);
             } else {
-                if (nowRecord.getPurchasePrice() != null) {
-                    auctionActivityRepo.scheduleOffShelf(nowRecord.getId(), AuctionStatus.PURCHASED);
+                if (recordNew1.getPurchasePrice() != null) {
+                    auctionActivityRepo.scheduleOffShelf(recordNew1.getId(), AuctionStatus.PURCHASED);
                 } else {
-                    auctionActivityRepo.scheduleOffShelf(nowRecord.getId(), AuctionStatus.PASS);
+                    auctionActivityRepo.scheduleOffShelf(recordNew1.getId(), AuctionStatus.PASS);
                 }
             }
         }

src/main/java/com/izouma/nineth/web/OrderPayController.java

@@ -229,6 +229,20 @@ public class OrderPayController {
         return "PayOrderPC";
     }
 
+    @ApiOperation("衫德h5拍卖")
+    @RequestMapping(value = "/auction/sandPay", method = RequestMethod.GET, produces = "text/html")
+    @ResponseBody
+    public String auctionSandPay(@RequestParam Long id) {
+//        return (String) orderService.payAdapay(id, "alipay_wap", null);
+        return sandPayService.payAuctionOrder(id);
+    }
+
+    @RequestMapping(value = "/auction/alipay_qr", method = RequestMethod.GET)
+    @ResponseBody
+    public String payAuctionOrderAlipayQR(Long id, Model model) throws BaseAdaPayException {
+        return (String) mintOrderService.payAdapay(id, "alipay_qr", null);
+    }
+
     public void detectUA(String ua, Model model) {
         boolean weixin = Pattern.matches(".*(micromessenger).*", ua.toLowerCase());
         boolean ios = Pattern.matches(".*(ipad|iphone).*", ua.toLowerCase());