autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-25 05:25:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev_local' into dev

Browse Source 
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/IPileStationInfoService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
#	jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
This commit is contained in:
autumn.g@foxmail.com
2023-11-21 11:31:42 +08:00
parent f3f67ddace de57827206
commit 342b6e4c26
39 changed files with 578 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletInfoMapper.java
View File

@@ -1,7 +1,10 @@
package com.jsowell.pile.mapper;
import com.jsowell.pile.domain.MemberWalletInfo;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@Repository
public interface MemberWalletInfoMapper {
/**
* delete by primary key
@@ -51,5 +54,13 @@ public interface MemberWalletInfoMapper {
*/
int updateByPrimaryKey(MemberWalletInfo record);
MemberWalletInfo selectByMemberId(String memberId);
// MemberWalletInfo selectByMemberId(String memberId);
/**
* 根据会员id和目标运营商id查询用户钱包信息
* @param memberId
* @param merchantId
* @return
*/
MemberWalletInfo selectByMemberId(@Param("memberId") String memberId, @Param("merchantId") String merchantId);
}

2
jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java
View File

@@ -5,9 +5,11 @@ import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO;
import com.jsowell.pile.vo.uniapp.MemberBalanceVO;
import com.jsowell.pile.vo.uniapp.MemberWalletLogVO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface MemberWalletLogMapper {
/**
* delete by primary key

7
jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java
View File

@@ -112,4 +112,11 @@ public interface PileMerchantInfoMapper {
* @return
*/
List<MerchantSettleInfoVO> queryMerchantSettleInfoList(@Param("dto") QueryMerchantInfoDTO dto);
/**
* 根据一级运营商id查询自身信息以及下属二级运营商信息
* @param firstMerchantId 一级运营商id
* @return
*/
List<PileMerchantInfo> selectListByFirstMerchant(@Param("firstMerchantId") String firstMerchantId);
}

2
jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java
View File

@@ -115,4 +115,6 @@ public interface PileStationInfoMapper {
* @return
*/
List<NXJTStationInfoVO> NXJTQueryStationsInfo(NXJTQueryStationInfoDTO dto);
PileStationInfo queryInfoByDeptId(@Param("deptId") String deptId);
}