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

Merge branch 'dev' into merge_adapay

Browse Source 
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
#	jsowell-admin/src/main/resources/application-dev.yml
This commit is contained in:
autumn.g@foxmail.com
2023-09-08 15:48:57 +08:00
parent 7cc8563de6 cc1fd3fafd
commit aa345ee629
35 changed files with 3083 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -781,12 +781,12 @@ public class OrderService {
.build()
);
// 余额支付
// result.add(
// PayModeVO.builder()
// .payModeCode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue())
// .payModeName(OrderPayModeEnum.PAYMENT_OF_BALANCE.getLabel())
// .build()
// );
result.add(
PayModeVO.builder()
.payModeCode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue())
.payModeName(OrderPayModeEnum.PAYMENT_OF_BALANCE.getLabel())
.build()
);
}
return result;
}

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

@@ -441,4 +441,10 @@ public class TempService {
// logger.info("批量进行问题订单退款，orderCode:{}, result:{}", orderBasicInfo.getOrderCode(), JSON.toJSONString(result));
}
}
public void updateMemberAdapayRecord(String memberId) {
// 查询
List<MemberAdapayRecord> memberAdapayRecordList = memberAdapayRecordService.selectAdapayRecordList(memberId, ScenarioEnum.BALANCE.getValue());
}
}