Skip to content

F
fit-finance
Commit 988a43aa by 程裕兵
Options

feat:settle

parent a7604f96
Showing with 9 additions and 9 deletions
repository/src/main/java/com/jiejing/fitness/finance/repository/entity/PartyToMerchant.java
...@@ -60,7 +60,7 @@ public class PartyToMerchant implements Serializable { ...@@ -60,7 +60,7 @@ public class PartyToMerchant implements Serializable {
/** /**
* 备注: 业务方类型 是否允许为null: YES * 备注: 业务方类型 是否允许为null: YES
*/ */
private PartyTypeEnum partyType; private String partyType;
/** /**
* 备注: paycenter的商户ID 是否允许为null: YES * 备注: paycenter的商户ID 是否允许为null: YES
......
repository/src/main/java/com/jiejing/fitness/finance/repository/service/PartyToMerchantRpService.java
...@@ -37,7 +37,7 @@ public class PartyToMerchantRpService extends ...@@ -37,7 +37,7 @@ public class PartyToMerchantRpService extends
public List<PartyToMerchant> listByParty(Long partyId, PartyTypeEnum partyType, String channelNo) { public List<PartyToMerchant> listByParty(Long partyId, PartyTypeEnum partyType, String channelNo) {
QueryWrapper<PartyToMerchant> wrapper = new QueryWrapper<>(); QueryWrapper<PartyToMerchant> wrapper = new QueryWrapper<>();
wrapper.eq(PartyToMerchant.PARTY_ID, partyId); wrapper.eq(PartyToMerchant.PARTY_ID, partyId);
wrapper.eq(PartyToMerchant.PARTY_TYPE, partyType); wrapper.eq(PartyToMerchant.PARTY_TYPE, partyType.getCode());
wrapper.eq(PartyToMerchant.CHANNEL_NO, channelNo); wrapper.eq(PartyToMerchant.CHANNEL_NO, channelNo);
return this.baseMapper.selectList(wrapper); return this.baseMapper.selectList(wrapper);
} }
...@@ -45,7 +45,7 @@ public class PartyToMerchantRpService extends ...@@ -45,7 +45,7 @@ public class PartyToMerchantRpService extends
public PartyToMerchant getByStudioId(Long studioId, String channelNo) { public PartyToMerchant getByStudioId(Long studioId, String channelNo) {
QueryWrapper<PartyToMerchant> wrapper = new QueryWrapper<>(); QueryWrapper<PartyToMerchant> wrapper = new QueryWrapper<>();
wrapper.eq(PartyToMerchant.PARTY_ID, studioId); wrapper.eq(PartyToMerchant.PARTY_ID, studioId);
wrapper.eq(PartyToMerchant.PARTY_TYPE, PartyTypeEnum.STUDIO); wrapper.eq(PartyToMerchant.PARTY_TYPE, PartyTypeEnum.STUDIO.getCode());
wrapper.eq(PartyToMerchant.CHANNEL_NO, channelNo); wrapper.eq(PartyToMerchant.CHANNEL_NO, channelNo);
List<PartyToMerchant> list = this.baseMapper.selectList(wrapper); List<PartyToMerchant> list = this.baseMapper.selectList(wrapper);
return CollectionUtil.isEmpty(list) ? null : list.get(0); return CollectionUtil.isEmpty(list) ? null : list.get(0);
...@@ -56,7 +56,7 @@ public class PartyToMerchantRpService extends ...@@ -56,7 +56,7 @@ public class PartyToMerchantRpService extends
QueryWrapper<PartyToMerchant> wrapper = new QueryWrapper<>(); QueryWrapper<PartyToMerchant> wrapper = new QueryWrapper<>();
wrapper.eq(PartyToMerchant.PARTY_ID, partyId); wrapper.eq(PartyToMerchant.PARTY_ID, partyId);
wrapper.eq(PartyToMerchant.MERCHANT_ID, merchantId); wrapper.eq(PartyToMerchant.MERCHANT_ID, merchantId);
wrapper.eq(PartyToMerchant.PARTY_TYPE, partyType); wrapper.eq(PartyToMerchant.PARTY_TYPE, partyType.getCode());
wrapper.eq(PartyToMerchant.CHANNEL_NO, channelNo); wrapper.eq(PartyToMerchant.CHANNEL_NO, channelNo);
return this.baseMapper.selectOne(wrapper); return this.baseMapper.selectOne(wrapper);
} }
...@@ -64,14 +64,14 @@ public class PartyToMerchantRpService extends ...@@ -64,14 +64,14 @@ public class PartyToMerchantRpService extends
public void deleteByParty(Long partyId, PartyTypeEnum partyType) { public void deleteByParty(Long partyId, PartyTypeEnum partyType) {
QueryWrapper<PartyToMerchant> wrapper = new QueryWrapper<>(); QueryWrapper<PartyToMerchant> wrapper = new QueryWrapper<>();
wrapper.eq(PartyToMerchant.PARTY_ID, partyId); wrapper.eq(PartyToMerchant.PARTY_ID, partyId);
wrapper.eq(PartyToMerchant.PARTY_TYPE, partyType); wrapper.eq(PartyToMerchant.PARTY_TYPE, partyType.getCode());
this.baseMapper.delete(wrapper); this.baseMapper.delete(wrapper);
} }
public void deleteByPartyAndMerchantId(Long partyId, PartyTypeEnum partyType, Long merchantId) { public void deleteByPartyAndMerchantId(Long partyId, PartyTypeEnum partyType, Long merchantId) {
QueryWrapper<PartyToMerchant> wrapper = new QueryWrapper<>(); QueryWrapper<PartyToMerchant> wrapper = new QueryWrapper<>();
wrapper.eq(PartyToMerchant.PARTY_ID, partyId); wrapper.eq(PartyToMerchant.PARTY_ID, partyId);
wrapper.eq(PartyToMerchant.PARTY_TYPE, partyType); wrapper.eq(PartyToMerchant.PARTY_TYPE, partyType.getCode());
wrapper.eq(PartyToMerchant.MERCHANT_ID, merchantId); wrapper.eq(PartyToMerchant.MERCHANT_ID, merchantId);
this.baseMapper.delete(wrapper); this.baseMapper.delete(wrapper);
} }
...@@ -80,14 +80,14 @@ public class PartyToMerchantRpService extends ...@@ -80,14 +80,14 @@ public class PartyToMerchantRpService extends
PartyTypeEnum partyType) { PartyTypeEnum partyType) {
QueryWrapper<PartyToMerchant> wrapper = new QueryWrapper<>(); QueryWrapper<PartyToMerchant> wrapper = new QueryWrapper<>();
wrapper.in(PartyToMerchant.MERCHANT_ID, merchantIds); wrapper.in(PartyToMerchant.MERCHANT_ID, merchantIds);
wrapper.eq(PartyToMerchant.PARTY_TYPE, partyType); wrapper.eq(PartyToMerchant.PARTY_TYPE, partyType.getCode());
return this.baseMapper.selectList(wrapper); return this.baseMapper.selectList(wrapper);
} }
public List<PartyToMerchant> listByMerchantIdAndPartyType(Long merchantId, PartyTypeEnum partyType) { public List<PartyToMerchant> listByMerchantIdAndPartyType(Long merchantId, PartyTypeEnum partyType) {
QueryWrapper<PartyToMerchant> wrapper = new QueryWrapper<>(); QueryWrapper<PartyToMerchant> wrapper = new QueryWrapper<>();
wrapper.eq(PartyToMerchant.MERCHANT_ID, merchantId); wrapper.eq(PartyToMerchant.MERCHANT_ID, merchantId);
wrapper.eq(PartyToMerchant.PARTY_TYPE, partyType); wrapper.eq(PartyToMerchant.PARTY_TYPE, partyType.getCode());
return this.baseMapper.selectList(wrapper); return this.baseMapper.selectList(wrapper);
} }
} }
service/src/main/java/com/jiejing/fitness/finance/service/merchant/convert/MerchantConvert.java
...@@ -501,7 +501,7 @@ public class MerchantConvert { ...@@ -501,7 +501,7 @@ public class MerchantConvert {
merchant.setMerchantId(merchantId); merchant.setMerchantId(merchantId);
merchant.setMerchantNo(merchantNo); merchant.setMerchantNo(merchantNo);
merchant.setPartyId(partyId); merchant.setPartyId(partyId);
merchant.setPartyType(type); merchant.setPartyType(type.getCode());
merchant.setCreateTime(new Date()); merchant.setCreateTime(new Date());
merchant.setUpdateTime(new Date()); merchant.setUpdateTime(new Date());
return merchant; return merchant;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment