From 3ced5a36b8a56ce4c14ec09d5cebc85d2dc09bcb Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 24 Aug 2023 16:06:10 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=A6=E7=89=8C=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/service/MemberService.java | 30 +++++++++++-------- .../jsowell/pile/domain/OrderBasicInfo.java | 5 ++++ .../jsowell/pile/dto/GenerateOrderDTO.java | 5 ++++ .../pile/dto/lutongyunting/GetTokenDTO.java | 14 --------- .../mapper/pile/OrderBasicInfoMapper.xml | 11 +++++++ .../service/impl/LTYTServiceImpl.java | 8 ++--- 6 files changed, 40 insertions(+), 33 deletions(-) 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 97f942c5f..7c8058913 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -428,25 +428,29 @@ public class MemberService { * @param dto */ public void memberBindingCarNo(BindingCarNoDTO dto){ - // 校验短信验证码 - MemberRegisterAndLoginDTO registerAndLoginDTO = MemberRegisterAndLoginDTO.builder() - .mobileNumber(dto.getPhoneNumber()) - .verificationCode(dto.getVerificationCode()) - .build(); - checkVerificationCode(registerAndLoginDTO); + // 校验短信验证码(2023.8.24 不做校验) + // MemberRegisterAndLoginDTO registerAndLoginDTO = MemberRegisterAndLoginDTO.builder() + // .mobileNumber(dto.getPhoneNumber()) + // .verificationCode(dto.getVerificationCode()) + // .build(); + // checkVerificationCode(registerAndLoginDTO); - // 判断当前车牌号是否已经绑定 + // 判断当前车牌号是否已经绑定 (2023.8.24 不做校验) MemberPlateNumberRelation relation = new MemberPlateNumberRelation(); relation.setMemberId(dto.getMemberId()); - relation.setLicensePlateNumber(dto.getCarNo()); - List list = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(relation); - if (CollectionUtils.isNotEmpty(list)) { - // 不为空说明该用户绑定过此车牌号 - throw new BusinessException(ReturnCodeEnum.CODE_THIS_CARNO_HAS_BEEN_BINDING); + if (StringUtils.isBlank(dto.getCarNo())) { + throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR); } + relation.setLicensePlateNumber(dto.getCarNo()); + // List list = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(relation); + // if (CollectionUtils.isNotEmpty(list)) { + // // 不为空说明该用户绑定过此车牌号 + // throw new BusinessException(ReturnCodeEnum.CODE_THIS_CARNO_HAS_BEEN_BINDING); + // } + // 校验该车牌号是否为新能源车牌 - relation.setPhoneNumber(dto.getPhoneNumber()); + // relation.setPhoneNumber(dto.getPhoneNumber()); if (StringUtils.isNotBlank(dto.getVinCode())) { // 判断当前vin是否被绑定 MemberPlateNumberRelation memberPlateInfoByVinCode = memberPlateNumberRelationService.getMemberPlateInfoByVinCode(dto.getVinCode()); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java index c9b86b8da..343c01fbf 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java @@ -132,6 +132,11 @@ public class OrderBasicInfo extends BaseEntity { @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd") private Date payTime; + /** + * 车牌号码 + */ + private String plateNumber; + /** * 订单总金额 = 电费总金额 + 服务费总金额 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java index 17c475554..0c0cd0169 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java @@ -73,4 +73,9 @@ public class GenerateOrderDTO extends BasicPileDTO{ * vin启动有值 */ private MemberPlateNumberRelation MemberPlateNumberRelation; + + /** + * 车牌号码 + */ + private String plateNumber; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/lutongyunting/GetTokenDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/lutongyunting/GetTokenDTO.java index 26b14a1db..0cf8c9aba 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/lutongyunting/GetTokenDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/lutongyunting/GetTokenDTO.java @@ -22,18 +22,4 @@ public class GetTokenDTO { */ private String secretKey; - /** - * 请求时间，格式：YYYYMMDDHHMMSS - */ - private String accTime; - - /** - * 1.0 - */ - private String version; - - /** - * 使用签名公式获得 - */ - private String sign; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index bc8f3456b..da550b7b3 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -21,6 +21,7 @@ + @@ -104,6 +105,7 @@ pay_status, pay_amount, pay_time, + plate_number, order_amount, virtual_amount, settle_amount, @@ -351,6 +353,9 @@ pay_time, + + plate_number, + order_amount, @@ -452,6 +457,9 @@ #{payTime}, + + #{plateNumber}, + #{orderAmount}, @@ -554,6 +562,9 @@ pay_time = #{payTime}, + + plate_number = #{plateNumber}, + order_amount = #{orderAmount}, diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/service/impl/LTYTServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/service/impl/LTYTServiceImpl.java index 752e0880e..5ede04f55 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/service/impl/LTYTServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lutongyunting/service/impl/LTYTServiceImpl.java @@ -102,11 +102,6 @@ public class LTYTServiceImpl implements LTYTService { if (StringUtils.isBlank(token)) { throw new BusinessException("", "路通云停系统 给指定车辆绑定优惠券 方法获取令牌失败"); } - // LTYTCommonParams params = new LTYTCommonParams(); - // params.setAppId(dto.getAppId()); - // params.setAccTime(DateUtils.dateTimeNow(DateUtils.YYYYMMDDHHMMSS)); - // params.setToken(token); - // params.setVersion("1.0"); String url = BASE_URL + "bindCoupon"; JSONObject jsonObject = new JSONObject(); @@ -127,8 +122,9 @@ public class LTYTServiceImpl implements LTYTService { // 发送请求 String result = HttpUtil.post(url, JSON.toJSONString(jsonObject)); log.info("给指定车辆绑定优惠券 params:{}, result:{}", JSON.toJSONString(jsonObject), result); + JSONObject resultJson = JSONObject.parseObject(result); - return null; + return resultJson.getString("msg"); } public static void main(String[] args) throws UnsupportedEncodingException {