From ea6a880db76af3795837c74bb55a0c6980b928b4 Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Wed, 28 Sep 2022 01:59:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E6=92=A4=E9=94=80?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GoodsTaskServiceImpl.java    | 13 ++++---
 .../impl/GoodsTaskServiceImplTest.java        | 36 +++++++++++++++++++
 2 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 src/test/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImplTest.java

diff --git a/src/main/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImpl.java
index b0325b4..f0a6f7f 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImpl.java
@@ -30,9 +30,9 @@ public class GoodsTaskServiceImpl implements GoodsTaskService {
     @Override
     public void getRevocationGoods() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
+        //获取接口数据
         JSONObject recvjson = SzwhApiUtils.revocationGoods();
-        //JSONObject dataJson = recvjson.getJSONObject("data");
+        //提取返回数据中的data 字段
         String datajsonStr= recvjson.getString("data");
         if(StringUtils.isNotBlank(datajsonStr)){
             JSONArray jsonArray = JSONArray.parseArray(datajsonStr);
@@ -41,6 +41,7 @@ public class GoodsTaskServiceImpl implements GoodsTaskService {
                 String islicode = jitem.getString("isliCode");
                 //查询是否存在商品
                 Goods dbgoods =goodsMapper.getGoodsByIsliCode(islicode);
+                // 如果商品存在，执行撤销操作
                 if(dbgoods!=null){
                     //更新状态
                     goodsMapper.updateRevocationGoods(islicode);
@@ -61,10 +62,12 @@ public class GoodsTaskServiceImpl implements GoodsTaskService {
     @Override
     public void queryRevocationGoods() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        // 接口查询撤销数据
         JSONObject recvjson = SzwhApiUtils.queryGoodsStatus();
-        JSONObject dataJson = recvjson.getJSONObject("data");
-        if(!dataJson.isEmpty()){
-            JSONArray jsonArray = JSONArray.parseArray(dataJson.toJSONString());
+        //提取返回数据中的data 字段
+        String datajsonStr= recvjson.getString("data");
+        if(StringUtils.isNotBlank(datajsonStr)){
+            JSONArray jsonArray = JSONArray.parseArray(datajsonStr);
             for(int i=0;i<jsonArray.size();i++){
                 JSONObject jitem = (JSONObject) jsonArray.get(i);
                 String islicode = jitem.getString("isliCode");
diff --git a/src/test/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImplTest.java b/src/test/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImplTest.java
new file mode 100644
index 0000000..08cb0ad
--- /dev/null
+++ b/src/test/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImplTest.java
@@ -0,0 +1,36 @@
+package cn.chjyj.szwh.service.impl;
+
+import cn.chjyj.szwh.service.GoodsTaskService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import static org.junit.Assert.*;
+
+/**
+ * 商品服务任务测试用例
+ */
+@SpringBootTest
+@RunWith(SpringJUnit4ClassRunner.class)
+public class GoodsTaskServiceImplTest {
+    @Autowired
+    private GoodsTaskService goodsTaskService;
+
+    /**
+     * 获取撤销数据
+     */
+    @Test
+    public void getRevocationGoods() {
+        goodsTaskService.getRevocationGoods();
+    }
+
+    /**
+     * 查询撤销数据
+     */
+    @Test
+    public void queryRevocationGoods() {
+        goodsTaskService.queryRevocationGoods();
+    }
+}
\ No newline at end of file