Merge remote-tracking branch 'origin/dev' into zs

.gitignore

@@ -1 +1,11 @@
-/target/
+### IDEA ###
+/target/**/*
+/log/*
+.idea/*
+*.iml
+*/target/*
+*/*.iml
+/.gradle/
+/application.pid
+/target/*
+**.jar

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

@@ -1,36 +1,33 @@
 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(Integer id);
-
-    int deleteByPrimaryKey(Long id);
 
     int insert(TbUserShopMsg record);
 
     int insertSelective(TbUserShopMsg record);
 
-    TbUserShopMsg selectByPrimaryKey(Integer shopId);
+    TbUserShopMsg selectByPrimaryKey(Integer id);
-    TbUserShopMsg selectByPrimaryKey(Long 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();

src/main/resources/application.yml

@@ -59,18 +59,19 @@ logging:
   file:
     # 切记，该文件表示正在产出日志的日志文件。并不会打包，当文件大于max-file-size,会根据file-name-pattern格式打包
     # 名称为log/cashier-client.log文件夹会在项目根目录下，打包后会在启动包同目录下；名称为/log/cashier-client.log的文件夹会在项目所在磁盘的跟目录下
-    name: log/cashierService.log
+    name: wx.log
   logback:
     rollingpolicy:
       # 单文件的大小，默认10M, 超过之后打包成一个日志文件
-      max-file-size: 10MB
+      max-file-size: 50MB
       # 日志保存的天数
       max-history: 30
       # 打包文件格式,默认： ${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz,书写格式为：文件路径/文件名.%i.文件后缀,其中%i不可省去，否则无日志显示
       # 例如： 日期为：2021/11/5 ,则打包文件之后为： log/ota.2021-11-05.0.gz,0表示日志的第一部分，后续就是，1,2,3...
       # 如果是压缩包，里面会多一个名log/ota.2021-11-05.0的日志文件
       # 如下面的例子，打包之后为: log/2021-11/cashier-client.2020-11-5.0.log，这是一个日志文件
-      file-name-pattern: log/%d{yyyy-MM}/cashierService.%d{yyyy-MM-dd}.%i.log
+#      file-name-pattern: log/%d{yyyy-MM}/cashierService.%d{yyyy-MM-dd}.%i.log
+      file-name-pattern: log/%d{yyyy-MM}/cashierService.%d{yyyy-MM-dd}.%i.log.gz
 #阿里云相关配置
 aliyun:
   keyid: LTAI5tPdEfYSZcqHbjCrtPRD

src/main/resources/generator-mapper/generatorConfig.xml

@@ -52,7 +52,7 @@
 
         <!-- 要生成的表tableName是数据库中的表名或视图名 domainObjectName是实体类名-->
 <!--                <table tableName="%" schema="fycashier" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false" selectByExampleQueryId="false" ></table>-->
-        <table tableName="tb_shop_user_flow" domainObjectName="TbShopUserFlow"
+        <table tableName="tb_user_shop_msg" domainObjectName="TbUserShopMsg"
                enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"
                enableSelectByExample="false" selectByExampleQueryId="false" >
         </table>

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>