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

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2023-08-03 19:32:17 +08:00
parent e30ec8bd33 b0d56273a6
commit 9329001b87
24 changed files with 213 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java
View File

@@ -201,7 +201,8 @@ public class TempController extends BaseController {
List<String> dateList = DateUtils.getAllDatesInTheDateRange(startTime, endTime);
for (String tradeDate : dateList) {
orderBasicInfoService.tempOrderSplittingOperations(dto.getMerchantId(), tradeDate);
// orderBasicInfoService.tempOrderSplittingOperations(dto.getMerchantId(), tradeDate);
orderBasicInfoService.orderSplittingOperations(dto.getMerchantId(), tradeDate);
}
response = new RestApiResponse<>();

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

@@ -137,7 +137,7 @@ public class MemberService {
// throw new BusinessException(ReturnCodeEnum.CODE_GET_MERCHANT_ID_BY_APP_ID_ERROR);
// }
// 查询手机号码是否注册过
MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(phoneNumber);
MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(phoneNumber, merchantId);
if (Objects.isNull(memberBasicInfo)) {
// 不存在则新增数据
String memberId = generateNewMemberId();

2
jsowell-admin/src/main/java/com/jsowell/service/PileService.java
View File

@@ -354,7 +354,7 @@ public class PileService {
// 通过前端传的手机号查询是否有此用户
MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber());
MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber(), dto.getMerchantId());
if (memberBasicInfo == null) {
// 为空说明此用户未注册平台账号
throw new BusinessException(ReturnCodeEnum.CODE_USER_IS_NOT_REGISTER);

11
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java
View File

@@ -44,6 +44,17 @@ public class PileMerchantInfoController extends BaseController {
return getDataTable(list);
}
/**
* 查询一级运营商列表
*/
@PreAuthorize("@ss.hasPermi('pile:merchant:list')")
@GetMapping("queryFirstLevelMerchant")
public TableDataInfo queryFirstLevelMerchant() {
List<PileMerchantInfo> list = pileMerchantInfoService.queryFirstLevelMerchant();
return getDataTable(list);
}
/**
* 获取运营商列表 不分页
* @param pileMerchantInfo