From c28c1e17823f26043f90ada0393afa76a79740a3 Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Sat, 3 Jun 2023 11:26:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=AE=9A=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../szwh/service/impl/GoodsTaskServiceImpl.java      |  9 ++++++++-
 .../java/cn/chjyj/szwh/mapper/GoodsMapperTest.java   | 12 ++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

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 15c469e..a1e7147 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImpl.java
@@ -76,10 +76,13 @@ public class GoodsTaskServiceImpl implements GoodsTaskService {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
         // 接口查询撤销数据
         JSONObject recvjson = SzwhApiUtils.queryGoodsStatus();
+        log.info("recvjson:"+recvjson);
         //提取返回数据中的data 字段
         String datajsonStr = recvjson.getString("data");
         if (StringUtils.isNotBlank(datajsonStr)) {
             JSONArray jsonArray = JSONArray.parseArray(datajsonStr);
+            //输出获取到到的goods_islicode
+            StringBuilder gsb = new StringBuilder();
             for (int i = 0; i < jsonArray.size(); i++) {
                 JSONObject jitem = (JSONObject) jsonArray.get(i);
                 String islicode = jitem.getString("isliCode");
@@ -107,12 +110,14 @@ public class GoodsTaskServiceImpl implements GoodsTaskService {
                     //String nowstr=sdf.format(veryTime);;
                     //审核通过,更新对应的状态
                     if (verifyStatus == 1) {
+                        gsb.append(dbgoods.getGoodsIslicode());// use for log_info
+                        gsb.append(",");
                         String gid = dbgoods.getId().toString();
                         // 商品状态
                         Integer gstatusArr[] = {1, 5};
                         List<Integer> gslist = Arrays.asList(gstatusArr);
                         //申请撤销委托
-                        if (dbgoods.getApplyOut() == 1 && dbgoods.getGoodsStatus() != 2) {
+                        if (dbgoods.getApplyOut() == 1 && dbgoods.getGoodsStatus() == 2) {
                             int ret = goodsMapper.updateGoodsFieldInId("goods_status", "2", gid);
                             if (ret == 1) {
                                 log.info("申请撤销委托：" + islicode);
@@ -144,6 +149,8 @@ public class GoodsTaskServiceImpl implements GoodsTaskService {
                 }
             }
 
+            //输出日志
+            log.info("queryRevocationGoods:"+gsb.toString());
         }
     }
 }
\ No newline at end of file
diff --git a/src/test/java/cn/chjyj/szwh/mapper/GoodsMapperTest.java b/src/test/java/cn/chjyj/szwh/mapper/GoodsMapperTest.java
index 8400f8d..8833cba 100644
--- a/src/test/java/cn/chjyj/szwh/mapper/GoodsMapperTest.java
+++ b/src/test/java/cn/chjyj/szwh/mapper/GoodsMapperTest.java
@@ -126,8 +126,16 @@ public class GoodsMapperTest {
 
     @Test
     public void updateGoodsInid(){
-        int ret =goodsMapper.updateGoodsFieldInId("goods_status","2","544");
-        System.out.println(ret);
+        String gsilis="010007-00000001031799999999-7";
+        Goods goods = goodsMapper.getGoodsByIsli(gsilis);
+        if(goods!=null){
+            // 更新
+            String gid = goods.getId().toString();
+            int ret = goodsMapper.updateGoodsFieldInId("goods_status", "2", gid);
+            System.out.println(ret);
+        }
+        //int ret =goodsMapper.updateGoodsFieldInId("goods_status","2","544");
+//        System.out.println(ret);
     }
     //增加销售记录
     @Test