采美豆修改

src/main/resources/mapper/ClubMapper.xml

@@ -83,7 +83,7 @@
     </select>
 
     <select id="findBeansHistoryByType" resultType="integer">
-        SELECT id FROM user_beans_history WHERE userId = #{userId} AND beansType = #{beansType}
+        SELECT id FROM user_beans_history WHERE userId = #{userId} AND beansType = #{beansType} AND delFlag = 0
     </select>
 
     <update id="updateUserBeans">
@@ -99,6 +99,7 @@
         WHERE
           pushStatus = 0
           AND beansType IN (1, 2, 3, 4, 8)
+          AND delFlag = 0
         ORDER BY
           ADDTIME DESC
         LIMIT
@@ -114,6 +115,7 @@
           userId = #{userId}
           AND beansType = #{beansType}
           AND pushStatus = 0
+          AND delFlag = 0
     </select>
 
     <update id="updatePushStatus">
@@ -132,6 +134,7 @@
           userId = #{userId}
           AND addTime <![CDATA[ >= ]]> #{startTime}
           AND addTime <![CDATA[ <= ]]> #{endTime}
+          AND delFlag = 0
           <if test="type != null and type != 0">
               AND type = #{type}
           </if>

src/main/resources/mapper/RegisterMapper.xml

@@ -167,12 +167,12 @@
     <insert id="insertBeansHistory">
         INSERT INTO `user_beans_history` (
           `userId`, `type`, `beansType`, `orderId`,
-          `num`, `pushStatus`, `addTime`
+          `num`, `pushStatus`, `addTime`, delFlag
         )
         VALUES
           (
             #{userId}, #{type}, #{beansType}, #{orderId},
-            #{num}, #{pushStatus}, #{addTime}
+            #{num}, #{pushStatus}, #{addTime}, 0
           )
     </insert>