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 HuiFu

Browse Source 
# Conflicts:
#	jsowell-admin/src/test/java/SpringBootTestController.java
#	jsowell-pile/pom.xml
This commit is contained in:
autumn.g@foxmail.com
2023-05-11 15:00:36 +08:00
parent 0bb109f523 e50be067ae
commit 2ef229e50c
39 changed files with 1657 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/adapay/demo/BillDemo.java
View File

@@ -1,8 +1,6 @@
package com.jsowell.adapay.demo;
import com.alibaba.fastjson.JSON;
import com.huifu.adapay.model.AdapayTools;
import com.huifu.adapay.model.Bill;
import java.util.HashMap;
import java.util.Map;

1
jsowell-pile/src/main/java/com/jsowell/adapay/demo/CorpMemberDemo.java
View File

@@ -1,7 +1,6 @@
package com.jsowell.adapay.demo;
import com.alibaba.fastjson.JSON;
import com.huifu.adapay.model.CorpMember;
import java.io.File;
import java.util.HashMap;

1
jsowell-pile/src/main/java/com/jsowell/adapay/demo/FastPayDemo.java
View File

@@ -1,7 +1,6 @@
package com.jsowell.adapay.demo;
import com.alibaba.fastjson.JSON;
import com.huifu.adapay.model.FastPay;
import java.util.HashMap;
import java.util.Map;

2
jsowell-pile/src/main/java/com/jsowell/adapay/demo/MainDemo.java
View File

@@ -1,7 +1,5 @@
package com.jsowell.adapay.demo;
import com.huifu.adapay.Adapay;
import com.huifu.adapay.model.MerConfig;
import java.util.HashMap;
import java.util.Map;

1
jsowell-pile/src/main/java/com/jsowell/adapay/demo/MemberDemo.java
View File

@@ -1,7 +1,6 @@
package com.jsowell.adapay.demo;
import com.alibaba.fastjson.JSON;
import com.huifu.adapay.model.Member;
import java.util.HashMap;
import java.util.Map;

5
jsowell-pile/src/main/java/com/jsowell/adapay/demo/PaymentDemo.java
View File

@@ -2,10 +2,7 @@ package com.jsowell.adapay.demo;
import com.alibaba.fastjson.JSON;
import com.huifu.adapay.core.exception.BaseAdaPayException;
import com.huifu.adapay.model.Checkout;
import com.huifu.adapay.model.Payment;
import com.huifu.adapay.model.PaymentConfirm;
import com.huifu.adapay.model.PaymentReverse;
import java.util.HashMap;
import java.util.Map;

1
jsowell-pile/src/main/java/com/jsowell/adapay/demo/PaymentRegionAndRequestTimeOutDemo.java
View File

@@ -2,7 +2,6 @@ package com.jsowell.adapay.demo;
import com.alibaba.fastjson.JSON;
import com.huifu.adapay.core.exception.BaseAdaPayException;
import com.huifu.adapay.model.Payment;
import java.util.HashMap;
import java.util.Map;

1
jsowell-pile/src/main/java/com/jsowell/adapay/demo/RefundDemo.java
View File

@@ -1,7 +1,6 @@
package com.jsowell.adapay.demo;
import com.alibaba.fastjson.JSON;
import com.huifu.adapay.model.Refund;
import java.util.HashMap;
import java.util.Map;

3
jsowell-pile/src/main/java/com/jsowell/adapay/demo/SettleAccountDemo.java
View File

@@ -1,8 +1,7 @@
package com.jsowell.adapay.demo;
import com.alibaba.fastjson.JSON;
import com.huifu.adapay.model.Drawcash;
import com.huifu.adapay.model.SettleAccount;
import java.util.HashMap;
import java.util.Map;