autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 19:15:35 +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
2023-11-04 09:01:37 +08:00
parent c66e26b5f3 fe7385e4f4
commit 919f692ae7
6 changed files with 80 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileMerchantInfoController.java
View File

@@ -58,7 +58,7 @@ public class PileMerchantInfoController extends BaseController {
* @param pileMerchantInfo
* @return
*/
@PreAuthorize("@ss.hasPermi('pile:merchant:list')")
// @PreAuthorize("@ss.hasPermi('pile:merchant:list')")
@GetMapping("/getMerchantList")
public TableDataInfo getMerchantList(PileMerchantInfo pileMerchantInfo) {
List<PileMerchantInfo> list = pileMerchantInfoService.selectPileMerchantInfoListWithAuth(pileMerchantInfo);

3
jsowell-admin/src/test/java/SpringBootTestController.java
View File

@@ -242,8 +242,9 @@ public class SpringBootTestController {
@Test
public void queryPaymentByOrderNoTest() {
String orderNo = "C44903356969";
String wechatAppId = "wxbb3e0d474569481d";
try {
List<AdaPayment> adaPayments = adapayService.queryPaymentByOrderNo(orderNo);
List<AdaPayment> adaPayments = adapayService.queryPaymentByOrderNo(orderNo, wechatAppId);
System.out.println(JSON.toJSONString(adaPayments));
} catch (BaseAdaPayException e) {
throw new RuntimeException(e);