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

Merge branch 'dev' into dev-g

Browse Source
This commit is contained in:
Guoqs
2025-03-21 15:16:39 +08:00
parent df4e7191a1 2cc26fc624
commit 2c7a206e2a
22 changed files with 848 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
jsowell-admin/src/main/java/com/jsowell/api/thirdparty/XDTController.java vendored
View File

@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Map;
/**
@@ -46,8 +47,8 @@ public class XDTController extends ThirdPartyBaseController {
@Qualifier("xinDiantuPlatfromServiceImpl")
private ThirdPartyPlatformService platformLogic;
// @Autowired
// private XDTService xdtService;
@Autowired
private XDTService xdtService;
/**
* 获取token接口
@@ -372,23 +373,52 @@ public class XDTController extends ThirdPartyBaseController {
* @param orderCode
* @return
*/
// @GetMapping("/pushChargeOrderInfo/{orderCode}")
// public RestApiResponse<?> pushChargeOrderInfo(@PathVariable("orderCode") String orderCode) {
// logger.info("新电途平台推送充电订单信息 params:{}", orderCode);
// RestApiResponse<?> response = null;
// try {
// String result = xdtService.pushChargeOrderInfo(orderCode);
// response = new RestApiResponse<>(result);
// }catch (BusinessException e) {
// logger.error("新电途平台推送充电订单信息 error",e);
// response = new RestApiResponse<>(e.getCode(), e.getMessage());
// }catch (Exception e) {
// logger.error("新电途平台推送充电订单信息 error", e);
// response = new RestApiResponse<>(e);
// }
// logger.info("新电途平台推送充电订单信息 result:{}", response);
// return response;
// }
@GetMapping("/pushChargeOrderInfo/{orderCode}")
public RestApiResponse<?> pushChargeOrderInfo(@PathVariable("orderCode") String orderCode) {
logger.info("新电途平台推送充电订单信息 params:{}", orderCode);
RestApiResponse<?> response = null;
try {
// String result = xdtService.pushChargeOrderInfo(orderCode);
String result = platformLogic.notificationChargeOrderInfo(orderCode);
response = new RestApiResponse<>(result);
}catch (BusinessException e) {
logger.error("新电途平台推送充电订单信息 error",e);
response = new RestApiResponse<>(e.getCode(), e.getMessage());
}catch (Exception e) {
logger.error("新电途平台推送充电订单信息 error", e);
response = new RestApiResponse<>(e);
}
logger.info("新电途平台推送充电订单信息 result:{}", response);
return response;
}
/**
* 批量推送订单接口
* @param dto
* @return
*/
@PostMapping("/pushChargeOrderInfoList")
public RestApiResponse<?> pushChargeOrderInfoList(@RequestBody PushInfoParamDTO dto) {
logger.info("新电途平台批量推送充电订单信息 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
List<String> orderCodeList = dto.getOrderCodeList();
for (String orderCode : orderCodeList) {
String result = platformLogic.notificationChargeOrderInfo(orderCode);
logger.info("新电途平台批量推送充电订单信息 result:{}", result);
}
response = new RestApiResponse<>();
}catch (BusinessException e) {
logger.error("新电途平台批量推送充电订单信息 error",e);
response = new RestApiResponse<>(e.getCode(), e.getMessage());
}catch (Exception e) {
logger.error("新电途平台批量推送充电订单信息 error", e);
response = new RestApiResponse<>(e);
}
logger.info("新电途平台批量推送充电订单信息 result:{}", response);
return response;
}
/**
* 新电途推送充电状态

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

@@ -14,9 +14,11 @@ import com.jsowell.common.response.RestApiResponse;
import com.jsowell.common.util.SMSUtil;
import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.domain.MemberPlateNumberRelation;
import com.jsowell.pile.domain.UserFrequentedStationInfo;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.service.MemberBasicInfoService;
import com.jsowell.pile.service.MemberPlateNumberRelationService;
import com.jsowell.pile.service.OrderBasicInfoService;
import com.jsowell.pile.service.PileMerchantInfoService;
import com.jsowell.pile.vo.base.MemberWalletVO;
import com.jsowell.pile.vo.uniapp.customer.InvoiceTitleVO;
@@ -51,6 +53,8 @@ public class MemberController extends BaseController {
@Autowired
private MemberPlateNumberRelationService memberPlateNumberRelationService;
@Autowired
private OrderBasicInfoService orderBasicInfoService;
/**
* 下发短信接口 business
* http://localhost:8080/uniapp/member/sendSMS
@@ -603,4 +607,26 @@ public class MemberController extends BaseController {
logger.info("查询会员钱包列表 result:{}", response);
return response;
}
/**
* 查询用户常去站点(最近半年)
*/
@GetMapping("/getUserFrequentedStationList")
public RestApiResponse<?> queryUserFrequentedStation(HttpServletRequest request) {
RestApiResponse<?> response;
try {
String memberId = getMemberIdByAuthorization(request);
//查询order_basic_info表,根据member_id,对应的station_id,,然后根据station_id查询pile_station_info表中的站点名称,最后统计每个站点的次数,查询当前时间前半年的记录
List<UserFrequentedStationInfo> list = orderBasicInfoService.queryUserFrequentedStation(memberId);
response = new RestApiResponse<>(ImmutableMap.of("list", list));
} catch (BusinessException e) {
logger.error("查询用户常去站点(最近半年) error", e);
response = new RestApiResponse<>(e.getCode(), e.getMessage());
} catch (Exception e) {
logger.error("查询用户常去站点(最近半年) error", e);
response = new RestApiResponse<>(e);
}
logger.info("查询用户常去站点(最近半年) result:{}", response);
return response;
}
}

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

@@ -847,4 +847,5 @@ public class MemberService {
public List<MemberWalletVO> queryMemberWalletList(String memberId) {
return memberWalletInfoService.selectByMemberWalletList(memberId);
}
}