Merge branch 'feature/push_record' into test

order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/PushInfoRecordMapper.java

@@ -13,7 +13,5 @@ public interface PushInfoRecordMapper {
 
     int updateByPrimaryKeySelective(PushInfoRecord record);
 
-    int updateByPrimaryKeyWithBLOBs(PushInfoRecord record);
-
     int updateByPrimaryKey(PushInfoRecord record);
 }

order-management-consumer/src/main/resources/mybatis/mapper/PushInfoRecordMapper.xml

@@ -10,9 +10,11 @@
     <result column="push_content" property="pushContent" jdbcType="LONGVARCHAR" />
     <result column="result" property="result" jdbcType="LONGVARCHAR" />
     <result column="fail_reason" property="failReason" jdbcType="LONGVARCHAR" />
+    <result column="push_info_id" property="pushInfoId" jdbcType="BIGINT" />
+    <result column="retry_count" property="retryCount" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, interface_push_type, qy_type, push_status, create_time,push_content, result, fail_reason
+    id, interface_push_type, qy_type, push_status, create_time,push_content, result, fail_reason,push_info_id,retry_count
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
     select 
@@ -27,10 +29,10 @@
   <insert id="insert" parameterType="com.dxhy.order.consumer.model.PushInfoRecord" >
     insert into push_info_record (id, interface_push_type, qy_type, 
       push_status, create_time, push_content, 
-      result, fail_reason)
+      result, fail_reason, push_info_id,retry_count)
     values (#{id,jdbcType=BIGINT}, #{interfacePushType,jdbcType=VARCHAR}, #{qyType,jdbcType=VARCHAR}, 
       #{pushStatus,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{pushContent,jdbcType=LONGVARCHAR}, 
-      #{result,jdbcType=LONGVARCHAR}, #{failReason,jdbcType=LONGVARCHAR})
+      #{result,jdbcType=LONGVARCHAR}, #{failReason,jdbcType=LONGVARCHAR},#{pushInfoId},#{retryCount})
   </insert>
   <insert id="insertSelective" parameterType="com.dxhy.order.consumer.model.PushInfoRecord" >
     insert into push_info_record
@@ -59,6 +61,12 @@
       <if test="failReason != null" >
         fail_reason,
       </if>
+      <if test="pushInfoId != null" >
+        push_info_id,
+      </if>
+      <if test="retryCount != null" >
+        retry_count,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -85,6 +93,12 @@
       <if test="failReason != null" >
         #{failReason,jdbcType=LONGVARCHAR},
       </if>
+      <if test="pushInfoId != null" >
+        #{pushInfoId},
+      </if>
+      <if test="retryCount != null" >
+        #{retryCount},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.dxhy.order.consumer.model.PushInfoRecord" >
@@ -111,10 +125,16 @@
       <if test="failReason != null" >
         fail_reason = #{failReason,jdbcType=LONGVARCHAR},
       </if>
+      <if test="pushInfoId != null" >
+        push_info_id = #{pushInfoId},
+      </if>
+      <if test="retryCount != null" >
+        retry_count = #{retryCount},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.dxhy.order.consumer.model.PushInfoRecord" >
+  <update id="updateByPrimaryKey" parameterType="com.dxhy.order.consumer.model.PushInfoRecord" >
     update push_info_record
     set interface_push_type = #{interfacePushType,jdbcType=VARCHAR},
       qy_type = #{qyType,jdbcType=VARCHAR},
@@ -122,15 +142,9 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       push_content = #{pushContent,jdbcType=LONGVARCHAR},
       result = #{result,jdbcType=LONGVARCHAR},
-      fail_reason = #{failReason,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.dxhy.order.consumer.model.PushInfoRecord" >
-    update push_info_record
-    set interface_push_type = #{interfacePushType,jdbcType=VARCHAR},
-      qy_type = #{qyType,jdbcType=VARCHAR},
-      push_status = #{pushStatus,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      fail_reason = #{failReason,jdbcType=LONGVARCHAR},
+      push_info_id = #{pushInfoId},
+      retry_count = #{retryCount}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>