Merge branch 'refs/heads/price_inquery'

src/main/resources/mapper/PriceVoucherCodeMapper.xml

@@ -11,6 +11,8 @@
         <result column="face_id" property="faceId" jdbcType="BIGINT"/>
         <result column="claimed_time" property="claimedTime" jdbcType="TIMESTAMP"/>
         <result column="used_time" property="usedTime" jdbcType="TIMESTAMP"/>
+        <result column="current_use_count" property="currentUseCount" jdbcType="INTEGER"/>
+        <result column="last_used_time" property="lastUsedTime" jdbcType="TIMESTAMP"/>
         <result column="remark" property="remark" jdbcType="VARCHAR"/>
         <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
         <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
@@ -20,7 +22,7 @@
 
     <sql id="Base_Column_List">
         id, batch_id, scenic_id, code, status, face_id, claimed_time, used_time, 
-        remark, create_time, update_time, deleted, deleted_at
+        current_use_count, last_used_time, remark, create_time, update_time, deleted, deleted_at
     </sql>
 
     <select id="selectByCode" resultMap="BaseResultMap">
@@ -69,16 +71,7 @@
           AND deleted = 0
     </update>
 
-    <update id="useVoucher">
-        UPDATE price_voucher_code
-        SET status = 2,
-            used_time = #{usedTime},
-            remark = #{remark},
-            update_time = NOW()
-        WHERE code = #{code}
-          AND (status = 1 OR status = 0)
-          AND deleted = 0
-    </update>
+
 
     <select id="selectByBatchId" resultMap="BaseResultMap">
         SELECT <include refid="Base_Column_List"/>