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

update 电单车

Browse Source
This commit is contained in:
Guoqs
2024-09-24 10:33:12 +08:00
parent 8e1a78743b
commit fc89dc2e65
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -350,9 +350,8 @@ public class PayController extends BaseController {
@PostMapping("/adapayCallback") @PostMapping("/adapayCallback")
public RestApiResponse<?> adapayCallback(HttpServletRequest request) { public RestApiResponse<?> adapayCallback(HttpServletRequest request) {
try { try {
orderService.adapayCallback(request);
// String type = request.getParameter("type");
logger.info("1汇付回调type:{}", request.getParameter("type")); logger.info("1汇付回调type:{}", request.getParameter("type"));
orderService.adapayCallback(request);
} catch (Exception e) { } catch (Exception e) {
logger.error("1汇付支付回调失败 error", e); logger.error("1汇付支付回调失败 error", e);
} }

3
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -3880,7 +3880,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
orderRefundInfoList.add(refundInfo); orderRefundInfoList.add(refundInfo);
} }
} }
} else if (OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue().equals(orderBasicInfo.getPayMode())) { } else if (OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue().equals(orderBasicInfo.getPayMode())
|| OrderPayModeEnum.PAYMENT_OF_ALIPAY.getValue().equals(orderBasicInfo.getPayMode())) {
// 新逻辑 // 新逻辑
String mode = pileMerchantInfoService.getDelayModeByMerchantId(orderBasicInfo.getMerchantId()); String mode = pileMerchantInfoService.getDelayModeByMerchantId(orderBasicInfo.getMerchantId());
AbstractProgramLogic orderLogic = ProgramLogicFactory.getProgramLogic(mode); AbstractProgramLogic orderLogic = ProgramLogicFactory.getProgramLogic(mode);

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java
View File

@@ -780,7 +780,7 @@ public class PileConnectorInfoServiceImpl implements PileConnectorInfoService {
// 获取充电站枪口列表 // 获取充电站枪口列表
List<ConnectorInfoVO> connectorList = getUniAppConnectorList(stationId); List<ConnectorInfoVO> connectorList = getUniAppConnectorList(stationId);
Map<String, Integer> pileTypeNum = getPileTypeNum(connectorList); Map<String, Integer> pileTypeNum = getPileTypeNum(connectorList);
log.info("根据站点id:{}, 查询快、慢充设备数量:{}", stationId, pileTypeNum); // log.info("根据站点id:{}, 查询快、慢充设备数量:{}", stationId, pileTypeNum);
return pileTypeNum; return pileTypeNum;
} }