diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LinePayDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LinePayDAO.java index 0756ccac5..422cb4c08 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LinePayDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LinePayDAO.java @@ -27,6 +27,11 @@ public class LinePayDAO { return linePayDO; } + public LinePayDO getLinePayByLineIdAndPayType(Long lineId,Integer payBusinessType) { + LinePayDO linePayDO = linePayMapper.getLinePayByLineIdAndPayType(lineId,payBusinessType); + return linePayDO; + } + public Long addLinePay(LinePayDO linePayDO){ linePayMapper.insertSelective(linePayDO); return linePayDO.getId(); diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java new file mode 100644 index 000000000..e1f2ea8cd --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java @@ -0,0 +1,8 @@ +package com.cool.store.mapper; + +import com.cool.store.entity.FirstOrderDO; +import com.cool.store.entity.FranchiseFeeDO; +import tk.mybatis.mapper.common.Mapper; + +public interface FranchiseFeeMapper extends Mapper { +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java index aa29f55b4..e30a5e8de 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java @@ -40,6 +40,8 @@ public interface LinePayMapper { int deleteByPrimaryKey(Long id); LinePayDO getLinePayByLineId(@Param("lineId") Long lineId); + LinePayDO getLinePayByLineIdAndPayType(@Param("lineId") Long lineId, + @Param("payBusinessType")Integer payBusinessType); /** * getLinePayByLineIds diff --git a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml new file mode 100644 index 000000000..5bac3d1d7 --- /dev/null +++ b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml index c17e94300..849df60c3 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml @@ -21,11 +21,12 @@ + id, partner_id, line_id, pay_status, pay_type, pay_user_name, pay_account, bank_code, bank_name, branch_bank_code, branch_bank_name, pay_time, pay_pic, promise_pic, create_time, - update_time, create_user_id, update_user_id, deleted + update_time, create_user_id, update_user_id, deleted,pay_business_type - select * from xfsg_line_pay where line_id = #{lineId} and deleted = '0' + select * + from xfsg_line_pay + where line_id = #{lineId} + and deleted = '0' + + +