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

update 调试订单接口

Browse Source
This commit is contained in:
Guoqs
2025-05-05 13:51:17 +08:00
parent bbb507f4fe
commit 9cab1cccaa
4 changed files with 156 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@ package com.jsowell.api.uniapp.customer;
import com.alibaba.fastjson2.JSON;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.jsowell.adapay.dto.BalancePaymentRequestDTO;
import com.jsowell.adapay.service.AdapayService;
import com.jsowell.common.annotation.Anonymous;
@@ -11,6 +12,7 @@ import com.jsowell.common.enums.ykc.ReturnCodeEnum;
import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.response.RestApiResponse;
import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.domain.*;
import com.jsowell.pile.domain.ykcCommond.EBikeStartChargingCommand;
import com.jsowell.pile.domain.ykcCommond.ReservationChargingCommand;
@@ -767,9 +769,22 @@ public class TempController extends BaseController {
public RestApiResponse<?> debugOrder(@RequestBody DebugOrderDTO dto) {
RestApiResponse<?> response;
try {
// 调试结算订单逻辑
Map<String, Object> resultMap = tempService.debugOrder(dto);
response = new RestApiResponse<>(resultMap);
List<String> orderCodes = Lists.newArrayList();
if (StringUtils.isNotBlank(dto.getOrderCode())) {
orderCodes.add(dto.getOrderCode());
}
if (CollectionUtils.isNotEmpty(dto.getOrderCodeList())) {
orderCodes.addAll(dto.getOrderCodeList());
}
if (CollectionUtils.isEmpty(orderCodes)) {
for (String orderCode : orderCodes) {
dto.setOrderCode(orderCode);
// 调试结算订单逻辑
tempService.debugOrder(dto);
}
}
response = new RestApiResponse<>();
} catch (Exception e) {
logger.error("调试结算订单逻辑V2error,", e);
response = new RestApiResponse<>();

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

@@ -1178,7 +1178,7 @@ public class TempService {
logger.info(reSplitFlagResult);
}
resultMap.put("reSplit", ImmutableMap.of("value", reSplitFlag, "message", reSplitFlagResult));
logger.info("debugOrder结束, resultMap:{}", JSONObject.toJSONString(resultMap));
return resultMap;
}
}

140
jsowell-admin/src/test/resources/payment_ids
View File

@@ -1,7 +1,133 @@
002212024102416494410695447094223949824
002212024102419522510695493069857738752
002212024102423461110695551898497138688
002212024102508132610695679550910730240
002212024102508310310695683984625319936
002212024102508502610695688864317952000
002212024102513440210695762749414916096
002212025040920385410756023543294640128
002212025040923101110756061612118949888
002212025040923302110756066686920605696
002212025040923404710756069312755814400
002212025040923503610756071785384017920
002212025041000434910756085174723133440
002212025041000490210756086489189863424
002212025041001264110756095963539591168
002212025041001323110756097434365841408
002212025041001501210756101884107149312
002212025041002254910756110847312547840
002212025041003425010756130226642444288
002212025041003543110756133168339787776
002212025041004083710756136714713092096
002212025041004091410756136869396598784
002212025041004251110756140885388984320
002212025041004421210756145168630886400
002212025041004423310756145257737396224
002212025041004492310756146975124996096
002212025041007400110756189918842769408
002212025041007453810756191331502047232
002212025041008064610756196650514546688
002212025041008335210756203470319501312
002212025041008451110756206318226284544
002212025041009195510756215056060366849
002212025041009242410756216185537351680
002212025041009311310756217901982507008
002212025041009315610756218083656318976
002212025041009370710756219384473567232
002212025041009433210756221002568073216
002212025041009462410756221721784242176
002212025041010013410756225538773270528
002212025041010024010756225814593982464
002212025041010085310756227382348558336
002212025041010090710756227438929231872
002212025041010095210756227627187908608
002212025041010121010756228205098205184
002212025041010133910756228577829568512
002212025041010274310756232119278055424
002212025041010432210756236057307561984
002212025041010471010756237015793479680
002212025041010511610756238047993036800
002212025041010532910756238603531108352
002212025041011015010756240704206942208
002212025041011125310756243485137289216
002212025041011194710756245221518487552
002212025041011201110756245321857576960
002212025041011202410756245378826928128
002212025041011215110756245744268591105
002212025041011242210756246375629271040
002212025041011383010756249933940875264
002212025041011404210756250485997621248
002212025041011492410756252675356475392
002212025041011510910756253116180291584
002212025041011555710756254323948597248
002212025041011593110756255221186482176
002212025041011595110756255307745247232
002212025041012022610756255956725710848
002212025041012162210756259461278105600
002212025041012192410756260225593884672
002212025041012424410756266097732386816
002212025041012442110756266505242529792
002212025041012471810756267246980415488
002212025041012524610756268624325730304
002212025041012542310756269030096142336
002212025041013052310756271796147699712
002212025041013331910756278826143961088
002212025041013561210756284587130388480
002212025041014014110756285965258928128
002212025041014300510756293113402765312
002212025041014322810756293714117079040
002212025041014461110756297167006056448
002212025041014490310756297888475262976
002212025041014531710756298951873933312
002212025041015013110756301023439147008
002212025041015043510756301794515800064
002212025041015094410756303089866276864
002212025041015115810756303654716321792
002212025041015165810756304911908851712
002212025041015243010756306807537958912
002212025041015253310756307070368755712
002212025041015354510756309637114413056
002212025041015381310756310259702677504
002212025041015382610756310313390780416
002212025041015521110756313774299959296
002212025041015540310756314242770583552
002212025041015563110756314866935037952
002212025041015585710756315477116080128
002212025041016185610756320507218833408
002212025041016194310756320704637816832
002212025041016321910756323875355242496
002212025041016393410756325700724940800
002212025041016434710756326761920352256
002212025041016482910756327941088071680
002212025041016490510756328092145143808
002212025041016515110756328789683896320
002212025041017000110756330844439826432
002212025041017144110756334538133118976
002212025041017220510756336397326667776
002212025041017235010756336838158147584
002212025041017435410756341887544774656
002212025041018345910756354744850743296
002212025041018370910756355290661310464
002212025041018544810756359731394994176
002212025041018585910756360785208852480
002212025041019022710756361656363630592
002212025041019053210756362434626662400
002212025041019094410756363491374620672
002212025041019131610756364379544518656
002212025041019225410756366804975472640
002212025041019240510756367100629430272
002212025041019260610756367609979822080
002212025041019262810756367698932412416
002212025041019484010756373286025318400
002212025041019493510756373516254859264
002212025041019505310756373843755753472
002212025041020035110756377108128030720
002212025041020311210756383990946091008
002212025041020354210756385122278219776
002212025041020474610756388160301154304
002212025041020485610756388453619687424
002212025041021033510756392143078739968
002212025041021063010756392876514115584
002212025041021063810756392907593908224
002212025041021152110756395103323803648
002212025041021171810756395594739765248
002212025041021492010756403653756440576
002212025041022012810756406706155212800
002212025041022342810756415013036007424
002212025041022501710756418992113491968
002212025041023131610756424776389611520
002212025041023230910756427264938160128
002212025041023350610756430273181069312

7
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
View File

@@ -1,6 +1,5 @@
package com.jsowell.pile.service.impl;
import com.alibaba.fastjson2.JSON;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.google.common.collect.Lists;
@@ -10,7 +9,6 @@ import com.huifu.adapay.model.AdapayCommon;
import com.jsowell.adapay.dto.PaymentConfirmParam;
import com.jsowell.adapay.dto.SplitData;
import com.jsowell.adapay.response.PaymentConfirmResponse;
import com.jsowell.adapay.service.AdapayService;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.core.domain.model.LoginUser;
import com.jsowell.common.core.page.PageResponse;
@@ -21,7 +19,6 @@ import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.SecurityUtils;
import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.id.IdUtils;
import com.jsowell.pile.domain.AdapayMemberAccount;
import com.jsowell.pile.domain.OrderSplitRecord;
import com.jsowell.pile.domain.PileMerchantInfo;
@@ -66,6 +63,10 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
if (param == null || response == null || CollectionUtils.isEmpty(param.getDivMemberList()) || orderInfoDetailVO == null) {
return;
}
// response中status为failed 不保存
if (response.isFailed()) {
return;
}
String paymentConfirmId = response.getId(); // 支付确认id
String feeAmt = response.getFee_amt(); // 手续费
String orderCode = param.getOrderCode(); // 订单号