From eb88e1b9c634496b7840dca48898510f36357d46 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 02 十一月 2023 08:52:11 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java | 56 +++----
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 1
cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AntMerchantExpandIndirectImageUpload.java | 124 -----------------
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 93 +++++++++++++
cloud-server-course/src/main/java/com/dsh/course/util/PayMoneyUtil.java | 2
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/Goods.java | 3
cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java | 15 +-
cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java | 21 +-
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 26 ++-
cloud-server-other/src/main/java/com/dsh/OtherApplication.java | 4
cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java | 17 +
cloud-server-gateway/src/main/java/cn/mb/cloud/gateway/filter/PermissionsFilter.java | 2
cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java | 22 ++-
13 files changed, 190 insertions(+), 196 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/Goods.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/Goods.java
index b651466..e75f187 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/Goods.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/Goods.java
@@ -39,5 +39,8 @@
private Integer nums;
@ApiModelProperty(value = "门店id")
private List<Integer> shopIds;
+ @ApiModelProperty(value = "使用范围")
+ private Integer useScope;
+
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
index ef9dd85..e24cde3 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
@@ -1,5 +1,6 @@
package com.dsh.account.service.impl;
+import com.alipay.api.response.AlipayTradeQueryResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.account.entity.RechargeRecords;
@@ -254,29 +255,34 @@
if(records.getPayStatus() == 2){
break;
}
- ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
- if(resultUtil.getCode() == 200 && records.getPayStatus() == 1){
+ AlipayTradeQueryResponse resultUtil = payMoneyUtil.queryALIOrder(code);
+
+ if(resultUtil.getCode().equals("10000")&& records.getPayStatus() == 1){
/**
* WAIT_BUYER_PAY（交易创建，等待买家付款）、
* TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
* TRADE_SUCCESS（交易支付成功）、
* TRADE_FINISHED（交易结束，不可退款）
*/
- Map<String, String> data1 = resultUtil.getData();
- String s = data1.get("tradeStatus");
- String tradeNo = data1.get("tradeNo");
- if("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10){
+// Map<String, String> data1 = resultUtil.getData();
+// String s = data1.get("tradeStatus");
+// String tradeNo = data1.get("tradeNo");
+
+ String tradeNo = resultUtil.getTradeNo();
+ String tradeStatus = resultUtil.getTradeStatus();
+ System.out.println("ssssss"+tradeStatus);
+ if("TRADE_CLOSED".equals(tradeStatus) || "TRADE_FINISHED".equals(tradeStatus) || num == 10){
records.setState(3);
rereMapper.deleteById(records.getId());
break;
}
- if("TRADE_SUCCESS".equals(s)){
+ if("TRADE_SUCCESS".equals(tradeStatus)){
records.setPayStatus(2);
records.setOrderNumber(tradeNo);
rereMapper.updateById(records);
break;
}
- if("WAIT_BUYER_PAY".equals(s)){
+ if("WAIT_BUYER_PAY".equals(tradeStatus)){
num++;
}
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 2426ac0..8f43a50 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -11,6 +11,7 @@
import com.alipay.api.request.AlipayTradeOrderSettleRequest;
import com.alipay.api.request.AlipayTradeRoyaltyRelationBindRequest;
import com.alipay.api.response.AlipayTradeOrderSettleResponse;
+import com.alipay.api.response.AlipayTradeQueryResponse;
import com.alipay.api.response.AlipayTradeRoyaltyRelationBindResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -943,6 +944,7 @@
commodity.setGoodsType(4);
commodity.setShopIds(ucponClient.getCouponStoreIds(allCoupon.getId()));
commodity.setNums(ucponClient.getRedeemedQuantity(allCoupon.getId()));
+ commodity.setUseScope(allCoupon.getUseScope());
goods.add(commodity);
}
}
@@ -958,7 +960,7 @@
if (request.getShopId()!=null){
if (goods.size() > 0 ){
goods = goods.stream()
- .filter(merchandise -> merchandise.getShopIds().contains(request.getShopId()))
+ .filter( merchandise ->(merchandise.getGoodsType() == 4&&merchandise.getUseScope() == 1)||merchandise.getShopIds().contains(request.getShopId()))
.collect(Collectors.toList());
}
}
@@ -1409,7 +1411,6 @@
}
-
return ResultUtil.success();
}catch (Exception e){
e.printStackTrace();
@@ -1462,22 +1463,27 @@
if(userPointsMerchandises.get(0).getPayStatus() == 2){
break;
}
- ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
- if(resultUtil.getCode() == 200 && userPointsMerchandises.get(0).getPayStatus() == 1){
+// ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
+ AlipayTradeQueryResponse resultUtil = payMoneyUtil.queryALIOrder(code);
+ if(resultUtil.getCode().equals("10000") && userPointsMerchandises.get(0).getPayStatus() == 1){
/**
* WAIT_BUYER_PAY（交易创建，等待买家付款）、
* TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
* TRADE_SUCCESS（交易支付成功）、
* TRADE_FINISHED（交易结束，不可退款）
*/
- Map<String, String> data1 = resultUtil.getData();
- String s = data1.get("tradeStatus");
- String tradeNo = data1.get("tradeNo");
- if("REFUND".equals(s) || "NOTPAY".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10){
+// Map<String, String> data1 = resultUtil.getData();
+// String s = data1.get("tradeStatus");
+// String tradeNo = data1.get("tradeNo");
+
+ String tradeNo = resultUtil.getTradeNo();
+ String tradeStatus = resultUtil.getTradeStatus();
+ System.out.println("ssssss"+tradeStatus);
+ if("REFUND".equals(tradeStatus) || "NOTPAY".equals(tradeStatus) || "CLOSED".equals(tradeStatus) || "REVOKED".equals(tradeStatus) || "PAYERROR".equals(tradeStatus) || num == 10){
mcClient.deletePaymentRecord(code);
break;
}
- if("TRADE_SUCCESS".equals(s)){
+ if("TRADE_SUCCESS".equals(tradeStatus)){
for (UserPointsMerchandise userPointsMerchandise : userPointsMerchandises) {
userPointsMerchandise.setPayStatus(2);
userPointsMerchandise.setOrderNumber(tradeNo);
@@ -1487,7 +1493,7 @@
moneyOut(tradeNo,tradeNo);
break;
}
- if("WAIT_BUYER_PAY".equals(s)){
+ if("WAIT_BUYER_PAY".equals(tradeStatus)){
num++;
}
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
index 2bee448..c9fef86 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
@@ -1,5 +1,6 @@
package com.dsh.account.service.impl;
+import com.alipay.api.response.AlipayTradeQueryResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -585,23 +586,27 @@
if(coursePackagePayment.getPayStatus() == 2){
break;
}
- ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
- if(resultUtil.getCode() == 200 && coursePackagePayment.getPayStatus() == 1){
+ AlipayTradeQueryResponse resultUtil = payMoneyUtil.queryALIOrder(code);
+
+ if(resultUtil.getCode().equals("10000") && coursePackagePayment.getPayStatus() == 1){
/**
* WAIT_BUYER_PAY（交易创建，等待买家付款）、
* TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
* TRADE_SUCCESS（交易支付成功）、
* TRADE_FINISHED（交易结束，不可退款）
*/
- Map<String, String> data1 = resultUtil.getData();
- String s = data1.get("tradeStatus");
- String tradeNo = data1.get("tradeNo");
- if("TRADE_CLOSED".equals(s) || "TRADE_FINISHED".equals(s) || num == 10){
+// Map<String, String> data1 = resultUtil.getData();
+// String s = data1.get("tradeStatus");
+// String tradeNo = data1.get("tradeNo");
+ String tradeNo = resultUtil.getTradeNo();
+ String tradeStatus = resultUtil.getTradeStatus();
+ System.out.println("ssssss"+tradeStatus);
+ if("TRADE_CLOSED".equals(tradeStatus) || "TRADE_FINISHED".equals(tradeStatus) || num == 10){
coursePackagePayment.setState(3);
couPayClient.delPaymentCoursePackage(coursePackagePayment.getId());
break;
}
- if("TRADE_SUCCESS".equals(s)){
+ if("TRADE_SUCCESS".equals(tradeStatus)){
coursePackagePayment.setPayStatus(2);
coursePackagePayment.setTotalClassHours(hour);
coursePackagePayment.setLaveClassHours(hour);
@@ -609,7 +614,7 @@
couPayClient.updatePaymentCoursePackage(coursePackagePayment);
break;
}
- if("WAIT_BUYER_PAY".equals(s)){
+ if("WAIT_BUYER_PAY".equals(tradeStatus)){
num++;
}
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java
index ba6c747..7619e28 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java
@@ -1,5 +1,6 @@
package com.dsh.account.service.impl;
+import com.alipay.api.response.AlipayTradeQueryResponse;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.account.entity.TAppUser;
@@ -180,11 +181,16 @@
* TRADE_SUCCESS（交易支付成功）、
* TRADE_FINISHED（交易结束，不可退款）
*/
- ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
- if(resultUtil.getCode() == 200){
- Map<String, String> map = resultUtil.getData();
- String tradeStatus = map.get("tradeStatus");
- String tradeNo = map.get("tradeNo");
+ AlipayTradeQueryResponse resultUtil = payMoneyUtil.queryALIOrder(code);
+
+ if(resultUtil.getCode().equals("10000")){
+// Map<String, String> map = resultUtil.getData();
+// String tradeStatus = map.get("tradeStatus");
+// String tradeNo = map.get("tradeNo");
+
+ String tradeNo = resultUtil.getTradeNo();
+ String tradeStatus = resultUtil.getTradeStatus();
+ System.out.println("ssssss"+tradeStatus);
if("TRADE_CLOSED".equals(tradeStatus) || "TRADE_FINISHED".equals(tradeStatus)){
vipPayment1.setState(3);
VipPaymentServiceImpl.this.updateById(vipPayment1);
@@ -198,6 +204,7 @@
TAppUser appUser = appUserService.getById(vipPayment1.getAppUserId());
Date vipEndTime = appUser.getVipEndTime();
+ appUser.setIsVip(1);
if(null == vipEndTime){
vipEndTime = new Date();
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java b/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
index 81bd0d1..e21ff45 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
@@ -314,19 +314,20 @@
* @return
* @throws Exception
*/
- public ResultUtil queryALIOrder(String out_trade_no) throws Exception{
+ public AlipayTradeQueryResponse queryALIOrder(String out_trade_no) throws Exception{
AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",aliAppid, appPrivateKey,"json","UTF-8",alipay_public_key,"RSA2");
AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
request.setBizContent("{" +
" \"out_trade_no\":\"" + out_trade_no + "\"" +
"}");
AlipayTradeQueryResponse response = alipayClient.execute(request);
- if(response.isSuccess()){
- String tradeStatus = response.getTradeStatus();//交易状态：WAIT_BUYER_PAY（交易创建，等待买家付款）、TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、TRADE_SUCCESS（交易支付成功）、TRADE_FINISHED（交易结束，不可退款）
- return ResultUtil.success(tradeStatus);
- } else {
- return ResultUtil.error(response.getMsg());
- }
+ return response;
+// if(response.isSuccess()){
+// String tradeStatus = response.getTradeStatus();//交易状态：WAIT_BUYER_PAY（交易创建，等待买家付款）、TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、TRADE_SUCCESS（交易支付成功）、TRADE_FINISHED（交易结束，不可退款）
+// return ResultUtil.success(response);
+// } else {
+// return ResultUtil.error(response.getMsg());
+// }
}
diff --git a/cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java b/cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java
index 84551a4..57a66c5 100644
--- a/cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java
+++ b/cloud-server-account/src/test/java/com/dsh/AccountApplicationTests.java
@@ -1,29 +1,27 @@
-package com.dsh;
-
-import com.dsh.account.controller.CoachTypeController;
-
-import com.dsh.account.controller.UseBenefitsController;
-import com.dsh.account.model.vo.userBenefitDetail.Goods;
-import com.dsh.account.util.ResultUtil;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import java.util.List;
-
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = AccountApplication.class)
-class AccountApplicationTests {
-
- @Autowired
- private UseBenefitsController useBenefitsController;
-
-
- @Test
- void contextLoads() {
-
-
-
-
- }
-
-}
+//package com.dsh;
+//
+//import com.dsh.account.controller.CoachTypeController;
+//
+//import org.junit.jupiter.api.Test;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//
+//import java.util.List;
+//
+//@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = AccountApplication.class)
+//class AccountApplicationTests {
+//
+// @Autowired
+// private CoachTypeController controller;
+//
+//
+// @Test
+// void contextLoads() {
+// System.out.println(System.getProperty("java.version"));
+// System.out.println(System.getProperty("java.compiler"));
+// System.out.println(System.getProperty("java.vm.specification.version"));
+// System.out.println(System.getProperty("java.specification.version"));
+//
+// }
+//
+//}
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index 55f23ea..e374344 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -763,7 +763,7 @@
String startDate = dateFormat.format(pointsMerchandise.getInsertTime());
String endDate = dateFormat.format(end);
detailsResponse.setStartTime(startDate);
- detailsResponse.setEndTime(endDate);
+ detailsResponse.setEndTime(startDate);
Date now = new Date();
Calendar cal1 = Calendar.getInstance();
@@ -821,7 +821,7 @@
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
calendar.setTime(pointsMerchandise.getInsertTime());
- calendar.add(Calendar.DAY_OF_MONTH, 365);
+ calendar.add(Calendar.DAY_OF_MONTH, 372);
Date end = calendar.getTime();
String startDate = dateFormat.format(pointsMerchandise.getInsertTime());
String endDate = dateFormat.format(end);
@@ -881,6 +881,95 @@
return 0; // 保持原顺序
}
});
+
+
+
+
+ if (pmdsServiceById.getCardType()==1){
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(pmdsServiceById.getInsertTime());
+ calendar.add(Calendar.DAY_OF_MONTH, 1);
+ Date end = calendar.getTime();
+ String startDate = dateFormat.format(pmdsServiceById.getInsertTime());
+ String endDate = dateFormat.format(end);
+ pmdsServiceById.setStartTime(pmdsServiceById.getInsertTime());
+ pmdsServiceById.setEndTime(pmdsServiceById.getInsertTime());
+
+ Date now = new Date();
+ Calendar cal1 = Calendar.getInstance();
+ cal1.setTime(pmdsServiceById.getInsertTime());
+
+ Calendar cal2 = Calendar.getInstance();
+ cal2.setTime(now);
+
+ // Compare the year, month, and day of the two Calendar instances
+ boolean isSameDate = cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) &&
+ cal1.get(Calendar.MONTH) == cal2.get(Calendar.MONTH) &&
+ cal1.get(Calendar.DAY_OF_MONTH) == cal2.get(Calendar.DAY_OF_MONTH);
+
+ // Print the result
+ if (isSameDate) {
+ detailsVo.setUseType(3);
+ } else {
+ System.out.println("The two dates do not have the same date.");
+ }
+
+
+ } else if (pmdsServiceById.getCardType()==2) {
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(pmdsServiceById.getInsertTime());
+ calendar.add(Calendar.DAY_OF_MONTH, 31);
+ Date end = calendar.getTime();
+ String startDate = dateFormat.format(pmdsServiceById.getInsertTime());
+ String endDate = dateFormat.format(end);
+ detailsVo.setStartTime(startDate);
+ detailsVo.setEndTime(endDate);
+
+ Date now = new Date();
+ if (now.after(end)){
+ detailsVo.setUseType(3);
+ }
+
+ } else if (pmdsServiceById.getCardType()==3) {
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(pmdsServiceById.getInsertTime());
+ calendar.add(Calendar.DAY_OF_MONTH, 93);
+ Date end = calendar.getTime();
+ String startDate = dateFormat.format(pmdsServiceById.getInsertTime());
+ String endDate = dateFormat.format(end);
+ detailsVo.setStartTime(startDate);
+ detailsVo.setEndTime(endDate);
+
+ Date now = new Date();
+ if (now.after(end)){
+ detailsVo.setUseType(3);
+ }
+
+ } else if (pmdsServiceById.getCardType()==4) {
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(pmdsServiceById.getInsertTime());
+ calendar.add(Calendar.DAY_OF_MONTH, 372);
+ Date end = calendar.getTime();
+ String startDate = dateFormat.format(pmdsServiceById.getInsertTime());
+ String endDate = dateFormat.format(end);
+ detailsVo.setStartTime(startDate);
+ detailsVo.setEndTime(endDate);
+
+ Date now = new Date();
+ if (now.after(end)){
+ detailsVo.setUseType(3);
+ }
+
+ }
+
+
+
+
+
break;
case 2:
CoursePackage coursePackage = cpClient.queryCoursePackageById(pmdsServiceById.getCoursePackageId());
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index 99037d0..d2f042b 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -1004,6 +1004,7 @@
*/
@PostMapping("/base/coursePackage/alipayRegisteredCoursesCallback")
public void alipayCallback(HttpServletRequest request, HttpServletResponse response){
+ System.err.println("========支付宝支付回调========");
try {
Map<String, String> map = payMoneyUtil.alipayCallback(request);
if(null != map){
diff --git a/cloud-server-course/src/main/java/com/dsh/course/util/PayMoneyUtil.java b/cloud-server-course/src/main/java/com/dsh/course/util/PayMoneyUtil.java
index ded08d6..4f7c791 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/util/PayMoneyUtil.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/util/PayMoneyUtil.java
@@ -59,7 +59,7 @@
private String key = "6f5e0c2dcabfa9c27b5da5836a362fef";//微信商户号
- private String callbackPath = "http://8.137.22.229:5004";//支付回调网关地址
+ private String callbackPath = "http://8.137.22.229:56666/course";//支付回调网关地址
private String app_cert_path = "C:/cert/alipay/user/app_cert_path.crt";//应用公钥证书路径
diff --git a/cloud-server-gateway/src/main/java/cn/mb/cloud/gateway/filter/PermissionsFilter.java b/cloud-server-gateway/src/main/java/cn/mb/cloud/gateway/filter/PermissionsFilter.java
index 3bb745e..3175fa5 100644
--- a/cloud-server-gateway/src/main/java/cn/mb/cloud/gateway/filter/PermissionsFilter.java
+++ b/cloud-server-gateway/src/main/java/cn/mb/cloud/gateway/filter/PermissionsFilter.java
@@ -259,7 +259,7 @@
}
//课程
- if (uri.startsWith(IGNORE_COURSE_URIS)) {
+ if (uri.startsWith(IGNORE_COURSE_PREFIX)) {
if(!StringUtils.isEmpty(IGNORE_COURSE_URIS)){
String[] split = IGNORE_COURSE_URIS.split(",");
for (String s : split) {
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AntMerchantExpandIndirectImageUpload.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AntMerchantExpandIndirectImageUpload.java
index e1e40bb..607ec5f 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AntMerchantExpandIndirectImageUpload.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/AntMerchantExpandIndirectImageUpload.java
@@ -45,128 +45,4 @@
// System.out.println("调用失败");
// }
// }
- public static void main(String[] args) {
- AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",
- "2021004124642138",
- "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC8Jqz8JmnbbggpEqdIyimlk1z7uq0W/rexxMZsh5f7LjSafci1/Gce3USgp1L2rVxEJPfL85rYXiLwnqUUPqi1P5MoymOU9GtK99dzlbkU8IPYKJWYWCtdnq5IdGLf4Kcs6ghYvTwbNHw5vl5QevtfEW8kzYxPrYkfO1i38i8zT8OTLHP2T+lRbfRvLMgScv+kiCWlI4k411yeeLxWm5ikg3M3zMjTl05VOqVhp45N3aglGzMMN3b6Ior73PzBUARmMeDQ73YX0l24acIpy1qNYkjZnvs0ghxd2eowgYgmaJBpfRZfD8NDFe20g/RQSK+mdJslxcdaFjW4OVUU8rdvAgMBAAECggEAeq1Q/vtg7BTbN0SVVC2UaAQkjXGTKDoetccShXMHklv3KoA3HQmchxBIjeNrgbFZRolAFHgaj1cZuwAFrKSKRdtU7TTBJz8SsgfVL+UAj3mezZLwrytV4y3yfwV77nNBLVTO6mVASpC3KsNIJXt6aOsqJ7np8Y25qWZ9mzpKsk4CPaSSPMj9KXZN1ivjfd4rscT9jPnzuTtcUwH2DBn4ykDsc1bnwRO/6IUwo7FJGK5IY7WRrmYFPqdqXpfmKZAMzBoRLJtBp+sbBkSjXHjVpsEJJYTgYqVaTc+iX3SjLi0a/7GieVd2U8OWVVmvbdJgawKWK1kEjCDIOVjOUzFI0QKBgQDlq+LiDPSjt2l+eosR1w82LdfaAyhh5Bhg3C9Or7GoP/PHvk/R3TfDR8yx1JJk1tM2PNg7gsx0KBnu8IKJviBNNvZ8ftMYL3Z3L+4SvUlD7sN01TUA1vPtWsMGEc73eqYy8a88H+rhUTSm6eHiq2sZGLKid+/ShLf+pXvHE5YRqQKBgQDRuE0ltOFbJHdDjP1W9xCZWbx3mDsSs/pZv761CLRKY0TVGq3QgakBJpjSX7OYJ4Cg2j+8R8PJjHsE1pnrRbiF63ypbCm2j5knCqgqFpctAqQ4fQk0263GORw+9FRPuVbL1zyFzFJTeOkwpK+p61tA0JAdDnymUKLdDuNZAl1fVwKBgQDZGPJdFTwGqW/p43IjyfMSFqFr7gI1DkRRArEhIwi+7rzEOcv/p6l3SR5fln1PHpYGNdt73Xbf8awZ5XSvOW4VLvgt1EA8I1lK7p6PTie8NCzD+mmgwo9O9LVWvmyyGFiT3Ur0fYMruvQXNwuTlM+mqGbrFo42o8e8yLZJBuWbCQKBgQCn901KmuE3BzDCGIS7ByvzNkzdGD6Pzzf+c7UA91S2k2UIrNJzQbWjJ0+UhnOntFOwALy1RmEH5oyMpngmV/PexmlUpD2QathFzaI7+1XfBdOTLomWHS/Dp+/4d+Wi6JUcs2lU2/0/v4I8pFnQ5KB0e9ZAf17UMZcPJ6Jsopk4BwKBgQCNnSK8b1xG/WMOae2HaHDjgwRCFJn5gS3NsLcj0zdFb9VfpaoxBd2vpR/kNO3VCEM6pZMOAGTYxaaS/27Wbavbu+m5oAZs1IwCjAryM9jSevwF59AX+OxOi8r4UYiEXMdmlSoNseIAe8U8X1/ZCGuLiS1p7k7nSkkCLBvWnzNKfA==","json","GBK",
- "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApCzq4BIE4gMdEXxIAAUbiMpSytkzp+LVLVsBtji87rFGfWUcnrr3NKftaw0WtRu+36d1nDVOWW4CmgsOPyj1GOFoTcJOR/BqyIriwyLxpuMS8qgOqGJZXi+W4Nw2AJL6iMVwY2eI8F1G10gACK2I9TNJRzHh3tMTA6ItysbGoekRDtn6Xrkh5V6cyHQjLw0Q6MJK/68XT6/LWzarDEEYrSnIevOydMY32ptAgm5fp/h08M2khCmI6CuMWKmc87dPpd2krGVTALqprAQvB74AIqO+5DE0fN4LoitOYXAtWDCEF4kHN0hQUygIEGCwtMgEVzkf92VLlCX35YtDhWd1yQIDAQAB","RSA2");
- AntMerchantExpandIndirectZftCreateRequest request = new AntMerchantExpandIndirectZftCreateRequest();
- request.setBizContent("{" +
- " \"in_door_images\":[" +
- " \"c6c0c7a1-b9d5-4e5d-b9d4-9eed39f00e65.jpg\"" +
- " ]," +
- " \"external_id\":\"105290059990194\"," +
- " \"merchant_type\":\"01\"," +
- " \"name\":\"蚂蚁金服（杭州）网络技术有限公司\"," +
- " \"alias_name\":\"支付宝\"," +
- " \"mcc\":\"B0007\"," +
- " \"cert_no\":\"9133010608210550XR\"," +
- " \"cert_type\":\"201\"," +
- " \"cert_image\":\"c6c0c7a1-b9d5-4e5d-b9d4-9eed39f00e65.jpg\"," +
- " \"cert_image_back\":\"25a10d04-ca9c-41aa-896f-3e0904bec470.jpg\"," +
- " \"legal_name\":\"马云\"," +
- " \"legal_cert_no\":\"100100198811110001\"," +
- " \"legal_cert_front_image\":\"25a10d04-ca9c-41aa-896f-3e0904bec470.jpg\"," +
- " \"legal_cert_back_image\":\"25a10d04-ca9c-41aa-896f-3e0904bec470.jpg\"," +
- " \"business_address\":{" +
- " \"city_code\":\"371000\"," +
- " \"district_code\":\"371002\"," +
- " \"address\":\"万塘路18号黄龙时代广场B座\"," +
- " \"province_code\":\"370000\"," +
- " \"poiid\":\"B0FFIVU189\"," +
- " \"longitude\":\"120.760001\"," +
- " \"latitude\":\"60.270001\"" +
- " }," +
- " \"service_phone\":\"0571-85022088\"," +
- " \"contact_infos\":[" +
- " {" +
- " \"name\":\"张三\"," +
- " \"phone\":\"0571-85022088\"," +
- " \"mobile\":\"13888888888\"," +
- " \"email\":\"user@domain.com\"," +
- " \"id_card_no\":\"110000199001011234\"" +
- " }" +
- " ]," +
- " \"biz_cards\":[" +
- " {" +
- " \"account_holder_name\":\"张三\"," +
- " \"account_no\":\"621485*****10408\"," +
- " \"account_inst_province\":\"浙江省\"," +
- " \"account_inst_city\":\"杭州市\"," +
- " \"account_branch_name\":\"招商银行杭州高新支行\"," +
- " \"usage_type\":\"01\"," +
- " \"account_type\":\"DC\"," +
- " \"account_inst_name\":\"招商银行\"," +
- " \"account_inst_id\":\"CMB\"," +
- " \"bank_code\":\"103290003044\"" +
- " }" +
- " ]," +
- " \"qualifications\":[" +
- " {" +
- " \"industry_qualification_type\":\"B0099\"," +
- " \"industry_qualification_image\":\"c6c0c7a1-b9d5-4e5d-b9d4-9eed39f00e65.jpg\"" +
- " }" +
- " ]," +
- " \"out_door_images\":[" +
- " \"c6c0c7a1-b9d5-4e5d-b9d4-9eed39f00e65.jpg\"" +
- " ]," +
- " \"license_auth_letter_image\":\"c6c0c7a1-b9d5-4e5d-b9d4-9eed39f00e65.jpg\"," +
- " \"service\":[" +
- " \"当面付\"" +
- " ]," +
- " \"sign_time_with_isv\":\"2015-04-15\"," +
- " \"alipay_logon_id\":\"qwert@163.com\"," +
- " \"sites\":[" +
- " {" +
- " \"site_type\":\"01\"," +
- " \"site_url\":\"www.xxx.com\"," +
- " \"site_name\":\"XXX网站\"," +
- " \"account\":\"测试账号\"," +
- " \"password\":\"测试密码\"" +
- " }" +
- " ]," +
- " \"invoice_info\":{" +
- " \"auto_invoice\":true," +
- " \"accept_electronic\":true," +
- " \"tax_payer_qualification\":\"01\"," +
- " \"title\":\"蚂蚁金服（杭州）信息技术有限公司\"," +
- " \"tax_no\":\"51010482542598631219\"," +
- " \"tax_payer_valid\":\"19981011\"," +
- " \"address\":\"浙江省杭州市*****路蚂蚁金服\"," +
- " \"telephone\":\"0571****8888\"," +
- " \"bank_account\":\"1234567******678123\"," +
- " \"mail_name\":\"张*\"," +
- " \"mail_address\":{" +
- " \"city_code\":\"371000\"," +
- " \"district_code\":\"371002\"," +
- " \"address\":\"万塘路18号黄龙时代广场B座\"," +
- " \"province_code\":\"370000\"," +
- " \"poiid\":\"B0FFIVU189\"," +
- " \"longitude\":\"120.760001\"," +
- " \"latitude\":\"60.270001\"," +
- " \"type\":\"BUSINESS_ADDRESS\"" +
- " }," +
- " \"mail_telephone\":\"0571****8888\"," +
- " \"bank_name\":\"中国银行\"" +
- " }," +
- " \"cert_name\":\"xxxx小卖铺\"," +
- " \"binding_alipay_logon_id\":\"asdf@163.com\"," +
- " \"legal_cert_type\":\"100\"," +
- " \"default_settle_rule\":{" +
- " \"default_settle_type\":\"alipayAccount\"," +
- " \"default_settle_target\":\"myalipay@alipay.com\"" +
- " }" +
- "}");
- AntMerchantExpandIndirectZftCreateResponse response = null;
- try {
- response = alipayClient.execute(request);
- } catch (AlipayApiException e) {
- e.printStackTrace();
- }
- if(response.isSuccess()){
- System.out.println("调用成功");
- } else {
- System.out.println("调用失败");
- }
- }
}
diff --git a/cloud-server-other/src/main/java/com/dsh/OtherApplication.java b/cloud-server-other/src/main/java/com/dsh/OtherApplication.java
index 4ace9f9..9788bd6 100644
--- a/cloud-server-other/src/main/java/com/dsh/OtherApplication.java
+++ b/cloud-server-other/src/main/java/com/dsh/OtherApplication.java
@@ -28,7 +28,9 @@
@MapperScan("com.dsh.other.mapper")
public class OtherApplication {
public static void main(String[] args) {
- SpringApplication.run(OtherApplication.class, args);
+ try {
+ SpringApplication.run(OtherApplication.class, args);
+ }catch (Exception e){e.printStackTrace();}
}
@Bean
--
Gitblit v1.7.1