autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 02:55:04 +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:
JSOWELL-PC\autum
2023-03-07 15:05:11 +08:00
parent ced0602a52 57a96d107b
commit abe5258634
14 changed files with 285 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,11 +12,10 @@ 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.domain.MemberBasicInfo;
import com.jsowell.pile.domain.MemberLicensePlateNumberRelation;
import com.jsowell.pile.domain.MemberPlateNumberRelation;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.service.IMemberBasicInfoService;
import com.jsowell.pile.service.IMemberLicensePlateNumberRelationService;
import com.jsowell.pile.service.IMemberPlateNumberRelationService;
import com.jsowell.pile.vo.uniapp.MemberVO;
import com.jsowell.service.MemberService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,7 +41,7 @@ public class MemberController extends BaseController {
private IMemberBasicInfoService memberBasicInfoService;
@Autowired
private IMemberLicensePlateNumberRelationService memberLicensePlateNumberRelationService;
private IMemberPlateNumberRelationService memberPlateNumberRelationService;
/**
* 下发短信接口 business
@@ -213,9 +212,9 @@ public class MemberController extends BaseController {
logger.info("通过 memberId 查询用户个人基本信息 param:{}", memberId);
RestApiResponse<?> response = null;
try {
MemberLicensePlateNumberRelation info = new MemberLicensePlateNumberRelation();
MemberPlateNumberRelation info = new MemberPlateNumberRelation();
info.setMemberId(memberId);
List<MemberLicensePlateNumberRelation> resultList = memberLicensePlateNumberRelationService.selectMemberLicensePlateNumberRelationList(info);
List<MemberPlateNumberRelation> resultList = memberPlateNumberRelationService.selectMemberLicensePlateNumberRelationList(info);
response = new RestApiResponse<>(resultList);
} catch (Exception e) {
logger.error("通过 memberId 查询用户个人基本信息 error", e);
@@ -251,4 +250,28 @@ public class MemberController extends BaseController {
logger.info("用户绑定车牌号 result:{}", response);
return response;
}
/**
* 用户解除绑定
* http://localhost:8080/uniapp/member/memberUnbindCarNo
*
* @return
*/
@PostMapping("/memberUnbindCarNo")
public RestApiResponse<?> memberUnbindCarNo(@RequestBody BindingCarNoDTO dto){
logger.info("用户解绑车牌号 params:{}", JSONObject.toJSONString(dto));
RestApiResponse<?> response = null;
try {
// String memberId = getMemberIdByAuthorization(request);
// dto.setMemberId(memberId);
int i = memberPlateNumberRelationService.deleteCarNoByParams(dto.getIds());
response = new RestApiResponse<>(i);
} catch (Exception e) {
logger.error("用户解绑车牌号 error", e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_USER_UNBIND_CARNO_ERROR);
}
logger.info("用户解绑车牌号 result:{}", response);
return response;
}
}

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

@@ -13,11 +13,11 @@ 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.MemberPlateNumberRelation;
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.IMemberPlateNumberRelationService;
import com.jsowell.pile.service.IPileMerchantInfoService;
import com.jsowell.pile.transaction.dto.MemberTransactionDTO;
import com.jsowell.pile.transaction.service.TransactionService;
@@ -53,7 +53,7 @@ public class MemberService {
private WxAppletRemoteService wxAppletRemoteService;
@Autowired
private IMemberLicensePlateNumberRelationService memberLicensePlateNumberRelationService;
private IMemberPlateNumberRelationService memberPlateNumberRelationService;
/**
* 校验短信验证码
@@ -248,15 +248,15 @@ public class MemberService {
checkVerificationCode(registerAndLoginDTO);
// 判断当前车牌号是否已经绑定
MemberLicensePlateNumberRelation relation = new MemberLicensePlateNumberRelation();
MemberPlateNumberRelation relation = new MemberPlateNumberRelation();
relation.setMemberId(dto.getMemberId());
relation.setLicensePlateNumber(dto.getCarNo());
List<MemberLicensePlateNumberRelation> list = memberLicensePlateNumberRelationService.selectMemberLicensePlateNumberRelationList(relation);
List<MemberPlateNumberRelation> list = memberPlateNumberRelationService.selectMemberLicensePlateNumberRelationList(relation);
if (CollectionUtils.isNotEmpty(list)) {
// 不为空说明该用户绑定过此车牌号
throw new BusinessException(ReturnCodeEnum.CODE_THIS_CARNO_HAS_BEEN_BINDING);
}
relation.setPhoneNumber(dto.getPhoneNumber());
memberLicensePlateNumberRelationService.insertMemberLicensePlateNumberRelation(relation);
memberPlateNumberRelationService.insertMemberLicensePlateNumberRelation(relation);
}
}