处理冲突

coolstore-partner-dao/src/main/java/com/cool/store/dao/LinePayDAO.java

@@ -96,5 +96,10 @@ public class LinePayDAO {
         if (CollectionUtils.isEmpty(linePayDOList)){
             return  null;
         }
+        return 0;
+    }
+
+    public LinePayDO selectByPaymentReceiptCode(String paymentReceiptCode) {
+        return linePayMapper.selectByPaymentReceiptCode(paymentReceiptCode);
     }
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java

@@ -60,6 +60,8 @@ public interface LinePayMapper  {
     List<LinePayDO>getFranchiseFeePayInfoByShopId(@Param("shopId") Long shopId);
 
     Integer deleteById(@Param("id") Long id,@Param("userId")String userId);
+
+    LinePayDO selectByPaymentReceiptCode(@Param("paymentReceiptCode") String  paymentReceiptCode);
     //数据处理专用0604，查询加盟费阶段缴费信息
     List<LinePayDO> getDateHandler();
 

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>
+