From f3f3b41a3785c948647b68b5d41c8933383fd06c Mon Sep 17 00:00:00 2001 From: "DESKTOP-D9QDT1P\\JS-ZZA" <495602415@qq.com> Date: Mon, 6 Mar 2023 15:17:04 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E7=94=A8=E6=88=B7=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E8=BD=A6=E7=89=8C=E5=8F=B7=E7=9B=B8=E5=85=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/接口文档New.md | 9 ++++--- .../jsowell/api/uniapp/MemberController.java | 25 +++++++++++++----- .../com/jsowell/service/MemberService.java | 26 ++++++++++++------- .../common/enums/ykc/ReturnCodeEnum.java | 4 ++- .../MemberLicensePlateNumberRelation.java | 8 +++++- ...LicensePlateNumberRelationServiceImpl.java | 1 - ...MemberLicensePlateNumberRelationMapper.xml | 13 +++++++--- 7 files changed, 60 insertions(+), 26 deletions(-) diff --git a/doc/接口文档New.md b/doc/接口文档New.md index cb810feca..6b39ddda5 100644 --- a/doc/接口文档New.md +++ b/doc/接口文档New.md @@ -629,9 +629,12 @@ null，提示”==操作成功==“ ### 反参 -| 字段名 | 类型 | 是否必传 | 备注 | -| ------------------ | ------ | -------- | ------ | -| licensePlateNumber | String | Y | 车牌号 | +| 字段名 | 类型 | 是否必传 | 备注 | +| ------------------ | ------ | -------- | -------- | +| memberId | String | Y | 会员id | +| phoneNumber | String | Y | 手机号码 | +| licensePlateNumber | String | Y | 车牌号 | +| createTime | String | Y | 创建时间 | ## 10002 用户绑定车牌号 diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java index 3f780324a..35bc2fe7c 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java @@ -13,14 +13,17 @@ import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.SMSUtil; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.MemberBasicInfo; +import com.jsowell.pile.domain.MemberLicensePlateNumberRelation; import com.jsowell.pile.dto.*; import com.jsowell.pile.service.IMemberBasicInfoService; +import com.jsowell.pile.service.IMemberLicensePlateNumberRelationService; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.service.MemberService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; +import java.util.List; import java.util.Map; /** @@ -38,6 +41,9 @@ public class MemberController extends BaseController { @Autowired private IMemberBasicInfoService memberBasicInfoService; + @Autowired + private IMemberLicensePlateNumberRelationService memberLicensePlateNumberRelationService; + /** * 下发短信接口 business * http://localhost:8080/uniapp/member/sendSMS @@ -197,18 +203,20 @@ public class MemberController extends BaseController { /** * 通过 memberId 查询用户绑定车牌信息 - * http://localhost:8080/uniapp/member/selectInfoByMemberId + * http://localhost:8080/uniapp/member/getMemberCarNoInfo * * @return */ - @GetMapping("/selectInfoByMemberId") - public RestApiResponse selectInfoByMemberId(HttpServletRequest request){ + @GetMapping("/getMemberCarNoInfo") + public RestApiResponse getMemberCarNoInfo(HttpServletRequest request){ String memberId = getMemberIdByAuthorization(request); logger.info("通过 memberId 查询用户个人基本信息 param:{}", memberId); RestApiResponse response = null; try { - MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMemberId(memberId); - response = new RestApiResponse<>(memberBasicInfo); + MemberLicensePlateNumberRelation info = new MemberLicensePlateNumberRelation(); + info.setMemberId(memberId); + List resultList = memberLicensePlateNumberRelationService.selectMemberLicensePlateNumberRelationList(info); + response = new RestApiResponse<>(resultList); } catch (Exception e) { logger.error("通过 memberId 查询用户个人基本信息 error", e); response = new RestApiResponse<>(e); @@ -233,9 +241,12 @@ public class MemberController extends BaseController { dto.setMemberId(memberId); memberService.memberBindingCarNo(dto); response = new RestApiResponse<>(); - }catch (Exception e){ + } catch (BusinessException e){ logger.error("用户绑定车牌号 error", e); - response = new RestApiResponse<>(e); + response = new RestApiResponse<>(e.getCode(), e.getMessage()); + } catch (Exception e){ + logger.error("用户绑定车牌号 error", e); + response = new RestApiResponse<>(ReturnCodeEnum.CODE_USER_BINDING_CARNO_ERROR); } logger.info("用户绑定车牌号 result:{}", response); return response; diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index 7937941fa..ee248a164 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -13,15 +13,18 @@ import com.jsowell.common.util.JWTUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.id.IdUtils; import com.jsowell.pile.domain.MemberBasicInfo; +import com.jsowell.pile.domain.MemberLicensePlateNumberRelation; import com.jsowell.pile.domain.MemberWalletInfo; import com.jsowell.pile.dto.*; import com.jsowell.pile.service.IMemberBasicInfoService; +import com.jsowell.pile.service.IMemberLicensePlateNumberRelationService; 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.uniapp.MemberVO; import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; import com.jsowell.wxpay.service.WxAppletRemoteService; +import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -49,6 +52,9 @@ public class MemberService { @Autowired private WxAppletRemoteService wxAppletRemoteService; + @Autowired + private IMemberLicensePlateNumberRelationService memberLicensePlateNumberRelationService; + /** * 校验短信验证码 * @param dto @@ -239,18 +245,18 @@ public class MemberService { .mobileNumber(dto.getPhoneNumber()) .verificationCode(dto.getVerificationCode()) .build(); - checkVerificationCode(registerAndLoginDTO); + // checkVerificationCode(registerAndLoginDTO); // 判断当前车牌号是否已经绑定 - MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMemberId(dto.getMemberId()); - if (memberBasicInfo == null) { - throw new BusinessException(ReturnCodeEnum.CODE_USER_IS_NOT_REGISTER); - } - if (StringUtils.equals(memberBasicInfo.getLicensePlateNumber(), dto.getCarNo())) { - // 如果一致，提醒用户已绑定，不能重复绑定 - throw new BusinessException(ReturnCodeEnum.CODE_THIS_CARNO_HAS_BEEN_BINGDING); - }else { - memberBasicInfoService.memberBindingCarNo(dto); + MemberLicensePlateNumberRelation relation = new MemberLicensePlateNumberRelation(); + relation.setMemberId(dto.getMemberId()); + relation.setLicensePlateNumber(dto.getCarNo()); + List list = memberLicensePlateNumberRelationService.selectMemberLicensePlateNumberRelationList(relation); + if (CollectionUtils.isNotEmpty(list)) { + // 不为空说明该用户绑定过此车牌号 + throw new BusinessException(ReturnCodeEnum.CODE_THIS_CARNO_HAS_BEEN_BINDING); } + relation.setPhoneNumber(dto.getPhoneNumber()); + memberLicensePlateNumberRelationService.insertMemberLicensePlateNumberRelation(relation); } } diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java index c5e109985..0e228e0dc 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java @@ -110,7 +110,9 @@ public enum ReturnCodeEnum { CODE_GET_PERSONAL_PILE_CONNECTOR_INFO_ERROR("00400010", "获取个人桩枪口实时数据异常"), - CODE_THIS_CARNO_HAS_BEEN_BINGDING("00500001", "当前车牌号已经绑定，请检查！"), + CODE_THIS_CARNO_HAS_BEEN_BINDING("00500001", "当前车牌号已经绑定，请检查！"), + + CODE_USER_BINDING_CARNO_ERROR("00500002", "用户绑定车牌号异常"), ; private String value; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberLicensePlateNumberRelation.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberLicensePlateNumberRelation.java index 7c4096273..22cef15ee 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberLicensePlateNumberRelation.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberLicensePlateNumberRelation.java @@ -17,7 +17,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @Builder -public class MemberLicensePlateNumberRelation extends BaseEntity +public class MemberLicensePlateNumberRelation { private static final long serialVersionUID = 1L; @@ -28,8 +28,14 @@ public class MemberLicensePlateNumberRelation extends BaseEntity @Excel(name = "会员id") private String memberId; + /** 手机号码 */ + private String phoneNumber; + /** 车牌号 */ @Excel(name = "车牌号") private String licensePlateNumber; + /** 创建时间 */ + private String createTime; + } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberLicensePlateNumberRelationServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberLicensePlateNumberRelationServiceImpl.java index c34d1d2a8..a1e0c59ea 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberLicensePlateNumberRelationServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberLicensePlateNumberRelationServiceImpl.java @@ -53,7 +53,6 @@ public class MemberLicensePlateNumberRelationServiceImpl implements IMemberLicen @Override public int insertMemberLicensePlateNumberRelation(MemberLicensePlateNumberRelation memberLicensePlateNumberRelation) { - memberLicensePlateNumberRelation.setCreateTime(DateUtils.getNowDate()); return memberLicensePlateNumberRelationMapper.insertMemberLicensePlateNumberRelation(memberLicensePlateNumberRelation); } diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberLicensePlateNumberRelationMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberLicensePlateNumberRelationMapper.xml index 2ce20928a..f374cf436 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberLicensePlateNumberRelationMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberLicensePlateNumberRelationMapper.xml @@ -7,23 +7,27 @@ + - select id, member_id, license_plate_number, create_time from member_license_plate_number_relation + select id, member_id, phone_number, license_plate_number, create_time from member_license_plate_number_relation - id, member_id, license_plate_number, create_time + id, member_id, phone_number, license_plate_number, create_time @@ -37,11 +41,13 @@ insert into member_license_plate_number_relation member_id, + phone_number, license_plate_number, create_time, #{memberId}, + #{phoneNumber}, #{licensePlateNumber}, #{createTime}, @@ -51,6 +57,7 @@ update member_license_plate_number_relation member_id = #{memberId}, + phone_number = #{phoneNumber}, license_plate_number = #{licensePlateNumber}, create_time = #{createTime},