From c50f2002f8e47fae55b628caa244904018477cb7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 19 Nov 2021 14:48:49 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/test/java/com/xzx/gc/CodeTest.java | 11 ++++++++++-
gc-shop/src/main/java/com/xzx/gc/shop/job/ShopJob.java | 1 +
2 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/job/ShopJob.java b/gc-shop/src/main/java/com/xzx/gc/shop/job/ShopJob.java
index 217d8dd..870e5e4 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/job/ShopJob.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/job/ShopJob.java
@@ -21,6 +21,7 @@
*/
@Scheduled(cron = "0 0 0 * * ? ")
public void autoConfirmReceipt() {
+ log.info("自动确认收货执行");
orderService.autoConfirmReceipt();
}
diff --git a/gc-shop/src/test/java/com/xzx/gc/CodeTest.java b/gc-shop/src/test/java/com/xzx/gc/CodeTest.java
index bcb5906..eb7286c 100644
--- a/gc-shop/src/test/java/com/xzx/gc/CodeTest.java
+++ b/gc-shop/src/test/java/com/xzx/gc/CodeTest.java
@@ -10,6 +10,7 @@
import com.xzx.gc.shop.mapper.JhyOrderItemsMapper;
import com.xzx.gc.shop.mapper.JhyOrderMapper;
import com.xzx.gc.shop.mapper.ScoreGoodsMapper;
+import com.xzx.gc.shop.service.OrderService;
import com.xzx.gc.shop.vo.JhyOrderItemsVo;
import com.xzx.gc.shop.vo.QueryGoodsListVo;
import com.xzx.gc.shop.vo.QueryJhyOrderListVo;
@@ -28,7 +29,7 @@
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest(classes = {GcShopApplication.class})
-@ActiveProfiles("dev")
+@ActiveProfiles({"dev", "xc"})
public class CodeTest {
@Autowired
@@ -98,4 +99,12 @@
}
+ @Autowired
+ private OrderService orderService;
+
+ @Test
+ public void autoConfirm() {
+ orderService.autoConfirmReceipt();
+ }
+
}
--
Gitblit v1.9.1