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

update 修改字段名

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-12-08 09:59:09 +08:00
parent 153404729b
commit 25bce49bcc
8 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@ import com.jsowell.pile.domain.MemberPlateNumberRelation;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.service.IMemberBasicInfoService;
import com.jsowell.pile.service.IMemberPlateNumberRelationService;
import com.jsowell.pile.service.IPileMerchantInfoService;
import com.jsowell.pile.vo.base.MemberWalletVO;
import com.jsowell.pile.vo.uniapp.InvoiceTitleVO;
import com.jsowell.pile.vo.uniapp.MemberVO;
@@ -44,6 +45,9 @@ public class MemberController extends BaseController {
@Autowired
private IMemberBasicInfoService memberBasicInfoService;
@Autowired
private IPileMerchantInfoService pileMerchantInfoService;
@Autowired
private IMemberPlateNumberRelationService memberPlateNumberRelationService;
@@ -80,6 +84,14 @@ public class MemberController extends BaseController {
logger.info("会员登录注册接口 param:{}", JSONObject.toJSONString(dto));
RestApiResponse<?> response = null;
try {
String appId = request.getHeader("appId");
if (StringUtils.isNotBlank(appId)) {
String firstLevelMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByAppId(appId);
if (StringUtils.isNotBlank(firstLevelMerchantId)) {
dto.setMerchantId(firstLevelMerchantId);
}
}
// 执行登录（查这个手机号在后台有没有数据，如果没有就静默注册）
String memberToken = memberService.memberRegisterAndLogin(dto);