From 9bac8254da42977992967d6e1edd6179d73760a1 Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Sun, 9 Oct 2022 17:32:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=95=86=E5=93=81=E8=A1=A8?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/chjyj/szwh/mapper/GoodsMapper.java       | 4 ++--
 .../cn/chjyj/szwh/service/impl/GoodsTaskServiceImpl.java  | 2 +-
 src/main/resources/mapper/szwh/GoodsMapper.xml            | 2 +-
 src/test/java/cn/chjyj/szwh/NewTest.java                  | 8 ++++++++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/mapper/GoodsMapper.java b/src/main/java/cn/chjyj/szwh/mapper/GoodsMapper.java
index ea16209..6f87afd 100644
--- a/src/main/java/cn/chjyj/szwh/mapper/GoodsMapper.java
+++ b/src/main/java/cn/chjyj/szwh/mapper/GoodsMapper.java
@@ -157,8 +157,8 @@ public interface GoodsMapper {
 
     /**
      * 商品撤销后，及时更新状态
-     * @param islicode
+     * @param id 商品表中的自编号
      * @return
      */
-    int updateRevocationGoods(String islicode);
+    int updateRevocationGoods(String id);
 }
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 e72d579..5a3d0f4 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsTaskServiceImpl.java
@@ -93,7 +93,7 @@ public class GoodsTaskServiceImpl implements GoodsTaskService {
                     //apply_out 为0时候, 执行代码
                     if(dbgoods.getApplyOut()==0){
                         //更新状态
-                        goodsMapper.updateRevocationGoods(islicode);
+                        goodsMapper.updateRevocationGoods(dbgoods.getId().toString());
                         //构建操作日志
                         OperationLog oplog = new OperationLog();
                         oplog.setType("goods");
diff --git a/src/main/resources/mapper/szwh/GoodsMapper.xml b/src/main/resources/mapper/szwh/GoodsMapper.xml
index 9088e86..4bb7648 100644
--- a/src/main/resources/mapper/szwh/GoodsMapper.xml
+++ b/src/main/resources/mapper/szwh/GoodsMapper.xml
@@ -289,7 +289,7 @@
         update <include refid="tbName"></include>
         set goods_status = 2,
         apply_out =1
-        where goods_status=1 and islicode=#{islicode}
+        where id=#{id}
     </update>
 
 </mapper>
\ No newline at end of file
diff --git a/src/test/java/cn/chjyj/szwh/NewTest.java b/src/test/java/cn/chjyj/szwh/NewTest.java
index 931e96e..100c5ec 100644
--- a/src/test/java/cn/chjyj/szwh/NewTest.java
+++ b/src/test/java/cn/chjyj/szwh/NewTest.java
@@ -86,6 +86,14 @@ public class NewTest {
         }catch (Exception ex){
             ex.printStackTrace();
         }
+    }
 
+    @Test
+    public void m2test(){
+        Calendar calendar = Calendar.getInstance();
+        int wkday = calendar.get(Calendar.DAY_OF_WEEK);
+        System.out.println(wkday);
+        int day = wkday > 5 ? (wkday - 5 + 1) : 0;
+        System.out.println(day);
     }
 }