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

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-06-09 17:01:00 +08:00
parent 5e8553c059 197319e41d
commit 5f29f18249
12 changed files with 231 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java
View File

@@ -23,6 +23,7 @@ import com.jsowell.pile.dto.WechatLoginDTO;
import com.jsowell.pile.dto.WeixinPayDTO;
import com.jsowell.pile.service.IMemberBasicInfoService;
import com.jsowell.pile.service.IMemberPlateNumberRelationService;
import com.jsowell.pile.vo.MemberPlateNumberVO;
import com.jsowell.pile.vo.uniapp.InvoiceTitleVO;
import com.jsowell.pile.vo.uniapp.MemberVO;
import com.jsowell.service.MemberService;
@@ -227,7 +228,7 @@ public class MemberController extends BaseController {
try {
MemberPlateNumberRelation info = new MemberPlateNumberRelation();
info.setMemberId(memberId);
List<MemberPlateNumberRelation> resultList = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(info);
List<MemberPlateNumberVO> resultList = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(info);
response = new RestApiResponse<>(resultList);
} catch (Exception e) {
logger.error("通过 memberId 查询用户个人基本信息 error", e);

3
jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
View File

@@ -45,6 +45,7 @@ import com.jsowell.pile.service.IPileAuthCardService;
import com.jsowell.pile.service.IPileMerchantInfoService;
import com.jsowell.pile.transaction.dto.MemberTransactionDTO;
import com.jsowell.pile.transaction.service.TransactionService;
import com.jsowell.pile.vo.MemberPlateNumberVO;
import com.jsowell.pile.vo.uniapp.InvoiceTitleVO;
import com.jsowell.pile.vo.uniapp.MemberVO;
import com.jsowell.pile.vo.uniapp.MemberWalletLogVO;
@@ -312,7 +313,7 @@ public class MemberService {
MemberPlateNumberRelation relation = new MemberPlateNumberRelation();
relation.setMemberId(dto.getMemberId());
relation.setLicensePlateNumber(dto.getCarNo());
List<MemberPlateNumberRelation> list = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(relation);
List<MemberPlateNumberVO> list = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(relation);
if (CollectionUtils.isNotEmpty(list)) {
// 不为空说明该用户绑定过此车牌号
throw new BusinessException(ReturnCodeEnum.CODE_THIS_CARNO_HAS_BEEN_BINDING);