autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 03:25:12 +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
2024-06-21 13:50:30 +08:00
parent 55ae000f3d 207d680b29
commit 373e547f4a
9 changed files with 167 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java
View File

@@ -2,6 +2,7 @@ package com.jsowell.api.uniapp;
import com.alibaba.fastjson2.JSON;
import com.google.common.collect.ImmutableMap;
import com.jsowell.common.UserAgentUtils;
import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.page.PageResponse;
@@ -256,11 +257,15 @@ public class PersonPileController extends BaseController {
try {
String memberId = getMemberIdByAuthorization(request);
dto.setMemberId(memberId);
// 请求来源
dto.setRequestSource(UserAgentUtils.determineRequestSource(request));
// appId
dto.setAppId(request.getHeader("appId"));
String orderCode = pileService.startPersonalPileCharging(dto);
response = new RestApiResponse<>(ImmutableMap.of("orderCode", orderCode));
} catch (BusinessException e) {
logger.error("个人桩启动充电error, params:{}", dto, e);
response = new RestApiResponse<>(e.getCode(), e.getMessage());
logger.error("个人桩启动充电error, params:{}", dto, e);
} catch (Exception e) {
logger.error("个人桩启动充电error, params:{}", dto, e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_CREATE_RESERVED_ERROR);

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

@@ -16,6 +16,8 @@ import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.util.*;
import com.jsowell.pile.domain.*;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.service.programlogic.AbstractProgramLogic;
import com.jsowell.pile.service.programlogic.ProgramLogicFactory;
import com.jsowell.pile.util.SnUtils;
import com.jsowell.pile.service.*;
import com.jsowell.pile.transaction.dto.PileTransactionDTO;
@@ -631,7 +633,10 @@ public class PileService {
* @return
*/
public String startPersonalPileCharging(StartPersonPileDTO dto) {
String orderCode = "";
// 获取处理逻辑
String mode = pileMerchantInfoService.getDelayModeByAppIdAndRequestSource(dto.getAppId(), dto.getRequestSource());
AbstractProgramLogic orderLogic = ProgramLogicFactory.getProgramLogic(mode);
String orderCode = orderLogic.startPersonalPileCharging(dto);
return orderCode;
}