From 8e1b70e3a8be2d5b0f1d66e1079caf2e67be51be Mon Sep 17 00:00:00 2001
From: 19991905653 <jing121710>
Date: Wed, 3 Apr 2024 09:20:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A4=E7=8F=AD=E8=90=BD?=
 =?UTF-8?q?=E5=9C=B0=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/dao/ShopUserDutyMapper.java         | 2 +-
 .../system/cashierservice/service/DutyService.java            | 4 +++-
 src/main/resources/mapper/ShopUserDutyMapper.xml              | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/ShopUserDutyMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/ShopUserDutyMapper.java
index 08cc61f..bcfc162 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/ShopUserDutyMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/ShopUserDutyMapper.java
@@ -25,7 +25,7 @@ public interface ShopUserDutyMapper {
 
     ShopUserDuty selectByTokenId(@Param("tokenId") Integer tokenId);
 
-    void updateStatusByTokenId(@Param("tokenId") Integer tokenId);
+    void updateStatusByTokenId(@Param("day") String day,@Param("shopId") Integer shopId);
 
     List<ShopUserDuty> selectByShopId(@Param("shopId") String shopId);
 
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/DutyService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/DutyService.java
index 35d3cf3..07db6b6 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/DutyService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/DutyService.java
@@ -51,6 +51,7 @@ public class DutyService {
             String type = jsonObject.getString("type");
             TbToken tbToken = tbTokenMapper.selectByToken(token);
             String day = DateUtils.getDay();
+            Integer shop = 0;
             if (type.equals("return") || type.equals("create")) {
                 if (Objects.isNull(tbToken)) {
                     throw new MsgException("当前用户不存在");
@@ -59,6 +60,7 @@ public class DutyService {
                 Integer orderId = jsonObject.getInteger("orderId");
                 JSONObject tokenJson = TokenUtil.parseParamFromToken(tbToken.getToken());
                 Integer shopId = tokenJson.getInteger("shopId");
+                shop = shopId;
                 Integer userId = tokenJson.getInteger("staffId");
                 String loginName = tokenJson.getString("loginName");
                 TbOrderInfo orderInfo = orderInfoMapper.selectByPrimaryKey(orderId);
@@ -262,7 +264,7 @@ public class DutyService {
                 }
             }else{
                 if (type.equals("close")){
-                    shopUserDutyMapper.updateStatusByTokenId(tbToken.getId());
+                    shopUserDutyMapper.updateStatusByTokenId(day,shop);
                 }
             }
         } catch (Exception e) {
diff --git a/src/main/resources/mapper/ShopUserDutyMapper.xml b/src/main/resources/mapper/ShopUserDutyMapper.xml
index 6167996..64062d8 100644
--- a/src/main/resources/mapper/ShopUserDutyMapper.xml
+++ b/src/main/resources/mapper/ShopUserDutyMapper.xml
@@ -46,7 +46,7 @@
     </select>
     <select id="selectByShopIdAndTrade"
             resultType="com.chaozhanggui.system.cashierservice.entity.ShopUserDuty">
-        select * from  tb_shop_user_duty where trade_day = #{day} and shop_id = #{shopId}
+        select * from  tb_shop_user_duty where trade_day = #{day} and shop_id = #{shopId} and status = '0'
     </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from tb_shop_user_duty
@@ -222,6 +222,6 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateStatusByTokenId">
-      update tb_shop_user_duty set status = '1' and login_out_time = now() where token_id = #{tokenId}
+      update tb_shop_user_duty set status = '1' , login_out_time = now() where shop_id = #{shopId} and trade_day = #{day}
   </update>
 </mapper>
\ No newline at end of file