autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-23 12:35:07 +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 
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java
This commit is contained in:
Lemon
2023-08-18 11:42:26 +08:00
parent 00cfd77eeb 027c7513aa
commit 5bf5ffc3b7
13 changed files with 235 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,10 +129,10 @@ public class PayController extends BaseController {
}
response = new RestApiResponse<>(map);
} catch (BusinessException e) {
logger.warn("wechatpay支付订单 warn param:{}", dto.toString(), e);
logger.warn("wechatpay支付订单 warn param:{}", dto, e);
response = new RestApiResponse<>(e.getCode(), e.getMessage());
} catch (Exception e) {
logger.error("wechatpay支付订单 error param:{}", dto.toString(), e);
logger.error("wechatpay支付订单 error param:{}", dto, e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_ORDER_PAY_ERROR);
} finally {
// 支付订单解锁
@@ -328,15 +328,16 @@ public class PayController extends BaseController {
}
/**
* 支付占桩订单
* 支付占桩订单/占桩订单支付
* https://api.jsowellcloud.com/uniapp/pay/payOccupyPileOrder
*/
@PostMapping("/payOccupyPileOrder")
public RestApiResponse<?> payOccupyPileOrder(HttpServletRequest request, @RequestBody PayOrderDTO dto) {
logger.info("wechatpay支付订单 param:{}", dto.toString());
logger.info("支付占桩订单 param:{}", dto.toString());
RestApiResponse<?> response;
// 支付订单加锁
String lockKey = "pay_order_" + dto.getOrderCode();
String lockKey = "pay_occupy_order_" + dto.getOrderCode();
String lockValue = IdUtils.fastUUID();
try {
String memberId = getMemberIdByAuthorization(request);
@@ -354,7 +355,7 @@ public class PayController extends BaseController {
if (isLock) {
String appId = request.getHeader("appId");
dto.setWechatAppId(appId);
map = orderService.payOrder(dto);
map = orderService.payOccupyPileOrder(dto);
}
response = new RestApiResponse<>(map);
} catch (BusinessException e) {

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

@@ -3,7 +3,7 @@ package com.jsowell.api.uniapp;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.jsowell.adapay.dto.BalancePaymentRequestDTO;
import com.jsowell.adapay.service.AdapayMemberService;
import com.jsowell.adapay.service.AdapayService;
import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.enums.ykc.ReturnCodeEnum;
@@ -48,7 +48,7 @@ public class TempController extends BaseController {
private IAdapayMemberAccountService adapayMemberAccountService;
@Autowired
private AdapayMemberService adapayMemberService;
private AdapayService adapayMemberService;
@Autowired
private IMemberBasicInfoService memberBasicInfoService;