autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-22 03:55:17 +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-03-26 15:35:16 +08:00
parent c6c7dd5b29 7db83ee738
commit b775074cfd
28 changed files with 1434 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -1090,9 +1090,6 @@ public class OrderService {
memberTransactionRecordService.insertSelective(record);
if (StringUtils.equals(scenarioType, ScenarioEnum.ORDER.getValue())) { // 1-订单支付
// JSONObject json = new JSONObject();
// json.put("paymentId", paymentId);
// json.put("amount", amount);
PaymentInfo paymentInfo = new PaymentInfo();
paymentInfo.setPaymentId(paymentId);
paymentInfo.setAmount(amount.toString());
@@ -1110,7 +1107,13 @@ public class OrderService {
orderPayRecordService.batchInsert(Lists.newArrayList(orderPayRecord));
// 更新冻结金额 支付成功后全部冻结
memberAdapayRecordService.updateFreezeAmount(paymentId, amount);
CompletableFuture.runAsync(() -> {
try {
memberAdapayRecordService.updateFreezeAmount(paymentId, amount);
} catch (Exception e) {
log.error("更新冻结金额 支付成功后全部冻结error", e);
}
});
// 支付订单成功
PayOrderSuccessCallbackDTO callbackDTO = PayOrderSuccessCallbackDTO.builder()