添加耗材

src/main/java/com/chaozhanggui/system/cashierservice/dao/TbUserShopMsgMapper.java

@@ -1,36 +1,31 @@
 package com.chaozhanggui.system.cashierservice.dao;
 
 import com.chaozhanggui.system.cashierservice.entity.TbUserShopMsg;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
 
-/**
-* @author Administrator
-* @description 针对表【tb_user_shop_msg】的数据库操作Mapper
-* @createDate 2024-06-28 09:55:30
-* @Entity com.chaozhanggui.system.cashierservice.entity.TbUserShopMsg
-*/
 @Component
 @Mapper
 public interface TbUserShopMsgMapper {
-    int deleteByPrimaryKey(Integer shopId);
-
-    int deleteByPrimaryKey(Long id);
+    int deleteByPrimaryKey(Integer id);
 
     int insert(TbUserShopMsg record);
 
     int insertSelective(TbUserShopMsg record);
 
-    TbUserShopMsg selectByPrimaryKey(Integer shopId);
-    TbUserShopMsg selectByPrimaryKey(Long id);
+    TbUserShopMsg selectByPrimaryKey(Integer id);
 
     int updateByPrimaryKeySelective(TbUserShopMsg record);
 
     int updateByPrimaryKey(TbUserShopMsg record);
 
+
     @Select("select * from tb_user_shop_msg where shop_id=#{shopId}")
     TbUserShopMsg selectByShopId(@Param("shopId") String shopId);
-}
 
+
+
+    TbUserShopMsg selectByShopIdAndOpenId(@Param("shopId") Integer shopId,@Param("openId") String openId);
+}

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbUserShopMsg.java

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.util.Date;
 
 public class TbUserShopMsg implements Serializable {
+    private Integer id;
+
     private Integer shopId;
 
     private String openId;
@@ -18,6 +20,14 @@ public class TbUserShopMsg implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
     public Integer getShopId() {
         return shopId;
     }
@@ -65,4 +75,4 @@ public class TbUserShopMsg implements Serializable {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-}
+}

src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java

@@ -65,22 +65,16 @@ public class LoginService {
 
 
     public Result wxBusinessLogin(String openId,String shopId){
-        TbUserShopMsg shopMsg= tbUserShopMsgMapper.selectByPrimaryKey(Integer.valueOf(shopId));
+        TbUserShopMsg shopMsg= tbUserShopMsgMapper.selectByShopIdAndOpenId(Integer.valueOf(shopId),openId);
         if(Objects.isNull(shopMsg)){
             shopMsg=new TbUserShopMsg();
-
             shopMsg.setShopId(Integer.valueOf(shopId));
             shopMsg.setOpenId(openId);
             shopMsg.setCreateTime(new Date());
             shopMsg.setStatus("1");
-
-
             tbUserShopMsgMapper.insert(shopMsg);
-        }else {
-            shopMsg.setOpenId(openId);
-            shopMsg.setUpdateTime(new Date());
-            tbUserShopMsgMapper.updateByPrimaryKey(shopMsg);
         }
+
         // 为商家绑定openid
         if (shopOpenIdMapper.countByOpenId(openId) == null) {
             TbShopOpenId shopOpenId = new TbShopOpenId();