处理冲突

coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml

@@ -396,5 +396,10 @@
     <update id="deleteById">
         update xfsg_line_pay set deleted = 1 ,update_time = now(),update_user_id = #{userId} where id = #{id}
     </update>
+
+    <select id="selectByPaymentReceiptCode" resultType="com.cool.store.entity.LinePayDO">
+        select * from xfsg_line_pay where deleted = 0 and payment_receipt_code = #{paymentReceiptCode} and pay_business_type = 1 order  by create_time desc
+    </select>
     <update id="dataUpdateLinePay"></update>
-</mapper>
+</mapper>
+