From 3874b057b70de89a457e428e9fe5a2ae0c0d1dad Mon Sep 17 00:00:00 2001 From: "DESKTOP-D9QDT1P\\JS-ZZA" <495602415@qq.com> Date: Mon, 6 Mar 2023 08:36:39 +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=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/api/uniapp/MemberController.java | 61 ++++++++++++++++--- .../com/jsowell/service/MemberService.java | 20 ++++-- .../jsowell/common/constant/Constants.java | 10 +-- .../jsowell/pile/domain/MemberBasicInfo.java | 5 ++ .../com/jsowell/pile/dto/BindingCarNoDTO.java | 27 ++++++++ .../pile/service/IMemberBasicInfoService.java | 3 + .../impl/MemberBasicInfoServiceImpl.java | 15 +++++ .../mapper/pile/MemberBasicInfoMapper.xml | 6 +- 8 files changed, 127 insertions(+), 20 deletions(-) create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/dto/BindingCarNoDTO.java 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 26cc700ab..365354823 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 @@ -12,19 +12,13 @@ import com.jsowell.common.exception.ServiceException; import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.SMSUtil; import com.jsowell.common.util.StringUtils; -import com.jsowell.pile.dto.MemberRegisterAndLoginDTO; -import com.jsowell.pile.dto.MemberRegisterDTO; -import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO; -import com.jsowell.pile.dto.WechatLoginDTO; -import com.jsowell.pile.dto.WeixinPayDTO; +import com.jsowell.pile.domain.MemberBasicInfo; +import com.jsowell.pile.dto.*; +import com.jsowell.pile.service.IMemberBasicInfoService; 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.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.Map; @@ -41,6 +35,9 @@ public class MemberController extends BaseController { @Autowired private MemberService memberService; + @Autowired + private IMemberBasicInfoService memberBasicInfoService; + /** * 下发短信接口 business * http://localhost:8080/uniapp/member/sendSMS @@ -196,4 +193,48 @@ public class MemberController extends BaseController { logger.info("查询用户账户余额变动信息 result:{}", response); return response; } + + + /** + * 通过 memberId 查询用户个人基本信息 + * http://localhost:8080/uniapp/member/selectInfoByMemberId + * + * @return + */ + @GetMapping("/selectInfoByMemberId") + public RestApiResponse selectInfoByMemberId(HttpServletRequest request){ + String memberId = getMemberIdByAuthorization(request); + logger.info("通过 memberId 查询用户个人基本信息 param:{}", memberId); + RestApiResponse response = null; + try { + MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMemberId(memberId); + response = new RestApiResponse<>(memberBasicInfo); + } catch (Exception e) { + logger.error("通过 memberId 查询用户个人基本信息 error", e); + response = new RestApiResponse<>(e); + } + logger.info("通过 memberId 查询用户个人基本信息 result:{}", response); + return response; + } + + + /** + * 用户绑定车牌号 + * + * @return + */ + @PostMapping("/memberBindingCarNo") + public RestApiResponse memberBindingCarNo(@RequestBody BindingCarNoDTO dto){ + logger.info("用户绑定车牌号 param:{}", JSONObject.toJSONString(dto)); + RestApiResponse response = null; + try { + memberService.memberBindingCarNo(dto); + response = new RestApiResponse<>(); + }catch (Exception e){ + logger.error("用户绑定车牌号 error", e); + response = new RestApiResponse<>(e); + } + 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 b2c0e3996..babdaa274 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -14,10 +14,7 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.id.IdUtils; import com.jsowell.pile.domain.MemberBasicInfo; import com.jsowell.pile.domain.MemberWalletInfo; -import com.jsowell.pile.dto.MemberRegisterAndLoginDTO; -import com.jsowell.pile.dto.MemberRegisterDTO; -import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO; -import com.jsowell.pile.dto.WechatLoginDTO; +import com.jsowell.pile.dto.*; import com.jsowell.pile.service.IMemberBasicInfoService; import com.jsowell.pile.service.IPileMerchantInfoService; import com.jsowell.pile.transaction.dto.MemberTransactionDTO; @@ -231,4 +228,19 @@ public class MemberService { .build(); return pageResponse; } + + /** + * 用户绑定车牌号 + * @param dto + */ + public void memberBindingCarNo(BindingCarNoDTO dto){ + // 校验短信验证码 + MemberRegisterAndLoginDTO registerAndLoginDTO = MemberRegisterAndLoginDTO.builder() + .mobileNumber(dto.getPhoneNumber()) + .verificationCode(dto.getVerificationCode()) + .build(); + checkVerificationCode(registerAndLoginDTO); + + memberBasicInfoService.memberBindingCarNo(dto); + } } diff --git a/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java b/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java index 9943ac46e..747e11ad0 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java +++ b/jsowell-common/src/main/java/com/jsowell/common/constant/Constants.java @@ -20,16 +20,16 @@ public class Constants { public static final String SOCKET_IP = "127.0.0.1"; public static final Integer SOCKET_PORT = 9011; - public static final String updateServerIP = "192.168.2.5"; - public static final int port = 0x15; + public static final String updateServerIP = "192.168.2.2"; + public static final int port = 0x21; public static final byte[] updateServerPort = new byte[]{port}; - public static final String updateServerUserName = "ftpuser"; + public static final String updateServerUserName = "vuser"; - public static final String updateServerPassword = "ftp123456"; + public static final String updateServerPassword = "123456"; - public static final String filePath = "/pile/test.bin"; + public static final String filePath = "/test.bin"; public static final String partnerId = "1632405339"; // 商户号Id diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberBasicInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberBasicInfo.java index e1a597936..130700029 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberBasicInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberBasicInfo.java @@ -42,6 +42,11 @@ public class MemberBasicInfo extends BaseEntity { */ private String openId; + /** + * 车牌号 + */ + private String licensePlateNumber; + /** * 昵称 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/BindingCarNoDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/BindingCarNoDTO.java new file mode 100644 index 000000000..c771f2662 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/BindingCarNoDTO.java @@ -0,0 +1,27 @@ +package com.jsowell.pile.dto; + +import lombok.Data; + +/** + * 用户绑定车牌号 + * + * @author JS-ZZA + * @date 2023/3/4 11:39 + */ +@Data +public class BindingCarNoDTO { + /** + * 手机号码 + */ + private String phoneNumber; + + /** + * 短信验证码 + */ + private String verificationCode; + + /** + * 车牌号 + */ + private String carNo; +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java index 8ffd77fcf..b19315adb 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberBasicInfoService.java @@ -1,6 +1,7 @@ package com.jsowell.pile.service; import com.jsowell.pile.domain.MemberBasicInfo; +import com.jsowell.pile.dto.BindingCarNoDTO; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO; @@ -115,4 +116,6 @@ public interface IMemberBasicInfoService { * @return */ List getMemberPersonPileInfo(String memberId); + + void memberBindingCarNo(BindingCarNoDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index 5cec801c2..68d638799 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -6,6 +6,8 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.MemberBasicInfo; import com.jsowell.pile.domain.MemberWalletInfo; import com.jsowell.pile.domain.MemberWalletLog; +import com.jsowell.pile.dto.BindingCarNoDTO; +import com.jsowell.pile.dto.MemberRegisterAndLoginDTO; import com.jsowell.pile.mapper.MemberBasicInfoMapper; import com.jsowell.pile.mapper.MemberWalletInfoMapper; import com.jsowell.pile.mapper.MemberWalletLogMapper; @@ -261,4 +263,17 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { return pileBasicInfoService.getPileInfoByMemberId(memberId); } + /** + * 用户绑定车牌号 + * @param dto + */ + @Override + public void memberBindingCarNo(BindingCarNoDTO dto) { + MemberBasicInfo memberBasicInfo = MemberBasicInfo.builder() + .mobileNumber(dto.getPhoneNumber()) + .licensePlateNumber(dto.getCarNo()) + .build(); + memberBasicInfoMapper.updateMemberBasicInfo(memberBasicInfo); + } + } diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml index 61bc083d6..f3f5fd8a6 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml @@ -8,6 +8,7 @@ + @@ -31,7 +32,7 @@ - id, member_id, open_id, nick_name,logic_card, physics_card, status, avatar_url, mobile_number, merchant_id, remark, + id, member_id, open_id, license_plate_number, nick_name,logic_card, physics_card, status, avatar_url, mobile_number, merchant_id, remark, create_time, create_by, update_time, update_by, del_flag @@ -58,6 +59,7 @@ member_id, open_id, + license_plate_number, nick_name, logic_card, physics_card, @@ -74,6 +76,7 @@ #{memberId}, #{openId}, + #{licensePlateNumber}, #{nickName}, #{logicCard}, #{physicsCard}, @@ -94,6 +97,7 @@ member_id = #{memberId}, open_id = #{openId}, + license_plate_number = #{licensePlateNumber}, nick_name = #{nickName}, logic_card = #{logicCard}, physics_card = #{physicsCard},