添加耗材

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

@@ -32,5 +32,7 @@ public interface TbUserShopMsgMapper {
 
     @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();

src/main/resources/mapper/TbUserShopMsgMapper.xml

@@ -2,7 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.chaozhanggui.system.cashierservice.dao.TbUserShopMsgMapper">
   <resultMap id="BaseResultMap" type="com.chaozhanggui.system.cashierservice.entity.TbUserShopMsg">
-    <id column="shop_id" jdbcType="INTEGER" property="shopId" />
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="shop_id" jdbcType="INTEGER" property="shopId" />
     <result column="open_id" jdbcType="VARCHAR" property="openId" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="status" jdbcType="VARCHAR" property="status" />
@@ -10,29 +11,32 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    shop_id, open_id, remark, status, create_time, update_time
+    id, shop_id, open_id, remark, status, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select
+    select 
     <include refid="Base_Column_List" />
     from tb_user_shop_msg
-    where shop_id = #{shopId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
     delete from tb_user_shop_msg
-    where shop_id = #{shopId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.chaozhanggui.system.cashierservice.entity.TbUserShopMsg">
-    insert into tb_user_shop_msg (shop_id, open_id, remark,
+    insert into tb_user_shop_msg (id, shop_id, open_id, 
-      status, create_time, update_time
+      remark, status, create_time, 
-      )
+      update_time)
-    values (#{shopId,jdbcType=INTEGER}, #{openId,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
+    values (#{id,jdbcType=INTEGER}, #{shopId,jdbcType=INTEGER}, #{openId,jdbcType=VARCHAR}, 
-      #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      #{remark,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      )
+      #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.chaozhanggui.system.cashierservice.entity.TbUserShopMsg">
     insert into tb_user_shop_msg
     <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
       <if test="shopId != null">
         shop_id,
       </if>
@@ -53,6 +57,9 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
       <if test="shopId != null">
         #{shopId,jdbcType=INTEGER},
       </if>
@@ -76,6 +83,9 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.chaozhanggui.system.cashierservice.entity.TbUserShopMsg">
     update tb_user_shop_msg
     <set>
+      <if test="shopId != null">
+        shop_id = #{shopId,jdbcType=INTEGER},
+      </if>
       <if test="openId != null">
         open_id = #{openId,jdbcType=VARCHAR},
       </if>
@@ -92,15 +102,20 @@
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
     </set>
-    where shop_id = #{shopId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.chaozhanggui.system.cashierservice.entity.TbUserShopMsg">
     update tb_user_shop_msg
-    set open_id = #{openId,jdbcType=VARCHAR},
+    set shop_id = #{shopId,jdbcType=INTEGER},
+      open_id = #{openId,jdbcType=VARCHAR},
       remark = #{remark,jdbcType=VARCHAR},
       status = #{status,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
-    where shop_id = #{shopId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
   </update>
-</mapper>
+
+  <select id="selectByShopIdAndOpenId" resultMap="BaseResultMap">
+    select * from tb_user_shop_msg where shop_id=#{shopId} and open_id=#{openId}
+    </select>
+</mapper>