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

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

Browse Source
This commit is contained in:
Lemon
2024-08-13 15:47:41 +08:00
parent 8e53b07253 ff7fe68b58
commit 01b54a8b49
19 changed files with 535 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,7 +216,7 @@ public class PayController extends BaseController {
logger.info("微信退款回调接口 body:{}", JSON.toJSONString(body));
RestApiResponse<?> response;
try {
orderService.wechatPayRefundCallback(request, body);
// orderService.wechatPayRefundCallback(request, body);
response = new RestApiResponse<>();
} catch (BusinessException e) {
logger.warn("微信退款回调接口warn", e);
@@ -245,7 +245,7 @@ public class PayController extends BaseController {
}
dto.setMemberId(memberId);
dto.setRefundType("2");
orderService.weChatRefund(dto);
// orderService.weChatRefund(dto);
response = new RestApiResponse<>();
} catch (BusinessException e) {
logger.warn("微信退款接口 warn", e);

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

@@ -730,14 +730,14 @@ public class MemberService {
memberInvoiceTitleService.deleteMemberInvoiceTitleById(Long.valueOf(dto.getTitleId()));
}
public Map<String, Object> rechargeBalance(WeixinPayDTO dto) throws Exception {
PaymentScenarioDTO paymentScenarioDTO = new PaymentScenarioDTO();
paymentScenarioDTO.setType(ScenarioEnum.BALANCE.getValue());
paymentScenarioDTO.setMemberId(dto.getMemberId());
dto.setAttach(JSON.toJSONString(paymentScenarioDTO));
dto.setDescription("会员充值余额");
return orderService.weixinPayV3(dto);
}
// public Map<String, Object> rechargeBalance(WeixinPayDTO dto) throws Exception {
// PaymentScenarioDTO paymentScenarioDTO = new PaymentScenarioDTO();
// paymentScenarioDTO.setType(ScenarioEnum.BALANCE.getValue());
// paymentScenarioDTO.setMemberId(dto.getMemberId());
// dto.setAttach(JSON.toJSONString(paymentScenarioDTO));
// dto.setDescription("会员充值余额");
// return orderService.weixinPayV3(dto);
// }
/**
* 使用汇付支付充值余额

16
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -317,9 +317,9 @@ public class OrderService {
* @return
* @throws Exception
*/
public Map<String, Object> weixinPayV3(WeixinPayDTO dto) throws Exception {
return wechatPayService.weixinPayV3(dto);
}
// public Map<String, Object> weixinPayV3(WeixinPayDTO dto) throws Exception {
// return wechatPayService.weixinPayV3(dto);
// }
/**
* 用户停止充电
@@ -388,10 +388,10 @@ public class OrderService {
*
* @param dto
*/
public void weChatRefund(ApplyRefundDTO dto) {
log.info("微信退款接口 param:{}", JSON.toJSONString(dto));
orderBasicInfoService.weChatRefund(dto);
}
// public void weChatRefund(ApplyRefundDTO dto) {
// log.info("微信退款接口 param:{}", JSON.toJSONString(dto));
// orderBasicInfoService.weChatRefund(dto);
// }
/**
* 汇付退款
@@ -543,7 +543,7 @@ public class OrderService {
*/
public void wechatPayRefundCallback(HttpServletRequest request, WechatPayNotifyParameter body) throws Exception {
// 获取微信退款成功返回的信息
Map<String, Object> map = wechatPayService.wechatPayRefundCallbackInfo(request, body);
// Map<String, Object> map = wechatPayService.wechatPayRefundCallbackInfo(request, body);
}
/**

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

@@ -239,7 +239,7 @@ public class TempService {
weChatRefundDTO.setRefundType("1");
weChatRefundDTO.setRefundAmount(refundAmount);
try {
orderBasicInfoService.weChatRefund(weChatRefundDTO);
// orderBasicInfoService.weChatRefund(weChatRefundDTO);
} catch (Exception e) {
logger.error("临时订单退款接口发生异常 orderCode:{}", orderBasicInfo.getOrderCode(), e);
}

2
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileStationInfoController.java
View File

@@ -362,7 +362,7 @@ public class PileStationInfoController extends BaseController {
*/
@GetMapping("/getParkingInfoList")
public RestApiResponse<?> getParkingInfoList() {
logger.info("获取停车平台列表");
// logger.info("获取停车平台列表");
RestApiResponse<?> response = null;
try {
startPage();