autumn.g@foxmail.com c284445ce1 Merge branch 'adapay' into merge_adapay ...

# Conflicts:
#	jsowell-admin/src/test/java/SpringBootTestController.java

2023-08-30 11:19:54 +08:00

..

AdapayCallbackRecordServiceImpl.java

update 修改结算订单逻辑

2023-08-25 17:21:39 +08:00

AdapayMemberAccountServiceImpl.java

…

AdapayRefundRecordServiceImpl.java

…

ClearingBillDetailServiceImpl.java

查询站点订单日报详情

2023-08-22 09:42:30 +08:00

ClearingBillInfoServiceImpl.java

新增 后管查询运营商订单报表V2 接口

2023-08-28 14:58:34 +08:00

ClearingWithdrawInfoServiceImpl.java

update 查询站点报表详情

2023-08-22 13:44:10 +08:00

MemberAdapayRecordServiceImpl.java

交易分账 重构

2023-08-29 15:06:59 +08:00

MemberBasicInfoServiceImpl.java

交易分账 重构

2023-08-28 17:05:39 +08:00

MemberInvoiceTitleServiceImpl.java

…

MemberPlateNumberRelationServiceImpl.java

…

MemberTransactionRecordServiceImpl.java

…

MemberWalletInfoServiceImpl.java

…

MemberWalletLogServiceImpl.java

…

OrderAbnormalRecordServiceImpl.java

…

OrderBasicInfoServiceImpl.java

Merge branch 'adapay' into merge_adapay

2023-08-30 11:19:54 +08:00

OrderInvoiceRecordServiceImpl.java

update 后管计费模板页面

2023-08-21 14:38:30 +08:00

OrderMonitorDataServiceImpl.java

…

OrderPayRecordServiceImpl.java

更新会员交易记录的冻结金额

2023-08-28 11:17:06 +08:00

OrderPileOccupyServiceImpl.java

update 支付回调新增占桩逻辑处理、 后管运营商订单报表新增字段

2023-08-29 16:40:20 +08:00

PileAuthCardServiceImpl.java

update 修改鉴权卡校验规则

2023-08-11 11:56:09 +08:00

PileBasicInfoServiceImpl.java

update 新增桩时判断编号

2023-08-26 09:46:46 +08:00

PileBillingTemplateServiceImpl.java

update

2023-08-21 15:17:19 +08:00

PileConnectorInfoServiceImpl.java

新增字段

2023-08-25 09:36:07 +08:00

PileFirmwareInfoServiceImpl.java

…

PileLicenceInfoServiceImpl.java

…

PileMemberRelationServiceImpl.java

…

PileMerchantInfoServiceImpl.java

订单分账逻辑

2023-08-26 14:09:04 +08:00

PileModelInfoServiceImpl.java

…

PileMsgRecordServiceImpl.java

…

PileSimInfoServiceImpl.java

…

PileStationInfoServiceImpl.java

后管页面新增 停车平台配置

2023-08-25 15:50:23 +08:00

PileStationWhitelistServiceImpl.java

update 会员区分一级运营商

2023-08-03 17:14:10 +08:00

SettleOrderReportServiceImpl.java

update

2023-08-29 17:05:36 +08:00

ThirdPartyParkingConfigServiceImpl.java

后管页面新增 停车平台配置

2023-08-25 15:50:23 +08:00

ThirdPartyPlatformConfigServiceImpl.java

…

ThirdPartySettingInfoServiceImpl.java

…

ThirdPartyStationRelationServiceImpl.java

…

WechatPayServiceImpl.java

加注释

2023-08-11 17:18:21 +08:00

WxpayCallbackRecordServiceImpl.java

…

WxpayRefundCallbackServiceImpl.java

…

YKCPushCommandServiceImpl.java

…