From e899587f6d4abdc299b82bed0c043f88276a64c3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 10 七月 2023 19:08:45 +0800
Subject: [PATCH] 更新赛事模块剩余接口

---
 cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java                 |   35 
 cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java                    |  101 +
 cloud-server-course/src/main/java/com/dsh/course/util/PayMoneyUtil.java                                            |  523 ++++++-
 cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java                               |   17 
 cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java                |   20 
 cloud-server-competition/src/main/java/com/dsh/competition/model/ParticipantVo.java                                |    2 
 cloud-server-competition/src/main/java/com/dsh/competition/util/UUIDUtil.java                                      |  101 +
 cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java                    |   16 
 cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionInfo.java                              |    2 
 cloud-server-course/src/main/java/com/dsh/course/util/httpClinet/HttpClientUtil.java                               |    8 
 cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java                               |    2 
 cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java                         |    4 
 cloud-server-competition/src/main/java/com/dsh/competition/entity/PaymentCompetition.java                          |    5 
 cloud-server-competition/src/main/java/com/dsh/competition/entity/UserCompetition.java                             |    5 
 cloud-server-competition/src/main/java/com/dsh/competition/feignclient/course/model/PaymentDeductionClassHour.java |   23 
 cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/StudentClient.java                  |   22 
 cloud-server-account/src/main/java/com/dsh/account/util/httpClinet/HttpClientUtil.java                             |    8 
 cloud-server-competition/src/main/java/com/dsh/competition/util/httpClinet/HttpClientUtil.java                     |   10 
 cloud-server-competition/src/main/java/com/dsh/competition/util/PayMoneyUtil.java                                  | 1150 +++++++++++++++++
 cloud-server-course/src/main/java/com/dsh/course/entity/CancelledClasses.java                                      |   10 
 cloud-server-competition/pom.xml                                                                                   |   10 
 cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java                       |    6 
 cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/model/Student.java                  |   73 +
 cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/model/AppUser.java                  |  114 +
 cloud-server-competition/src/main/java/com/dsh/competition/service/CompetitionService.java                         |   12 
 cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml                                    |   31 
 cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java                |  246 +++
 cloud-server-competition/src/main/java/com/dsh/competition/model/PaymentCompetitionVo.java                         |   20 
 cloud-server-course/src/main/java/com/dsh/course/entity/PostCourseVideo.java                                       |    4 
 cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java                                          |  529 ++++++-
 cloud-server-course/src/main/java/com/dsh/course/feignclient/model/PaymentDeductionClassHour.java                  |   23 
 cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java                                 |    5 
 cloud-server-course/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java                                 |   44 
 cloud-server-competition/src/main/java/com/dsh/competition/util/MD5AndKL.java                                      |  112 +
 cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/AppUserClient.java                  |   29 
 cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java                |   19 
 cloud-server-competition/src/main/java/com/dsh/competition/feignclient/course/CoursePackagePaymentClient.java      |   37 
 cloud-server-course/src/main/java/com/dsh/course/entity/UserVideoDetails.java                                      |   12 
 cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java         |  207 +++
 cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java                   |  209 +++
 40 files changed, 3,581 insertions(+), 225 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
index 68a82f8..a108ba5 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
@@ -312,7 +312,7 @@
      */
     @ResponseBody
     @PostMapping("/base/appUser/queryAppUser")
-    public TAppUser queryAppUser(Integer appUserId){
+    public TAppUser queryAppUser(@RequestBody Integer appUserId){
         try {
             TAppUser appUser = appUserService.getById(appUserId);
             return appUser;
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
index eae162f..1f402b3 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java
@@ -94,4 +94,21 @@
         }
     }
 
+
+    /**
+     * 根据电话号码学员信息
+     * @param phone
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/student/queryStudentByPhone")
+    public TStudent queryStudentByPhone(@RequestBody String phone){
+        try {
+            TStudent one = studentService.getOne(new QueryWrapper<TStudent>().eq("phone", phone).eq("state", 1));
+            return one;
+        }catch (Exception e){
+            e.printStackTrace();
+            return null;
+        }
+    }
 }
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 63232b4..e378238 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
@@ -66,7 +66,7 @@
     public ResultUtil weixinpay(VipPayment vipPayment) throws Exception{
         String code = vipPayment.getCode();
         ResultUtil weixinpay = payMoneyUtil.weixinpay("购买年度会员", "", code, vipPayment.getAmount().toString(),
-                "/base/appUser/addVipPaymentWeChatCallback", "APP");
+                "/base/appUser/addVipPaymentWeChatCallback", "APP", "");
         if(weixinpay.getCode() == 200){
             new Thread(new Runnable() {
                 @Override
@@ -152,7 +152,7 @@
      */
     public ResultUtil alipay(VipPayment vipPayment) throws Exception{
         String code = vipPayment.getCode();
-        ResultUtil alipay = payMoneyUtil.alipay("购买年度会员", "", code, vipPayment.getAmount().toString(),
+        ResultUtil alipay = payMoneyUtil.alipay("购买年度会员", "", "", code, vipPayment.getAmount().toString(),
                 "/base/appUser/addVipPaymentAliCallback");
         if(alipay.getCode() == 200){
             new Thread(new Runnable() {
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 cd7526a..2d2a81b 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
@@ -4,16 +4,11 @@
 import com.alibaba.fastjson.JSONObject;
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.AlipayClient;
+import com.alipay.api.CertAlipayRequest;
 import com.alipay.api.DefaultAlipayClient;
 import com.alipay.api.domain.AlipayTradeAppPayModel;
-import com.alipay.api.request.AlipayTradeAppPayRequest;
-import com.alipay.api.request.AlipayTradePrecreateRequest;
-import com.alipay.api.request.AlipayTradeQueryRequest;
-import com.alipay.api.request.AlipayTradeRefundRequest;
-import com.alipay.api.response.AlipayTradeAppPayResponse;
-import com.alipay.api.response.AlipayTradePrecreateResponse;
-import com.alipay.api.response.AlipayTradeQueryResponse;
-import com.alipay.api.response.AlipayTradeRefundResponse;
+import com.alipay.api.request.*;
+import com.alipay.api.response.*;
 import com.dsh.account.util.httpClinet.HttpClientUtil;
 import org.apache.commons.collections.map.HashedMap;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -21,7 +16,6 @@
 import org.dom4j.DocumentException;
 import org.dom4j.Element;
 import org.dom4j.io.SAXReader;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
@@ -36,7 +30,10 @@
 import java.math.BigDecimal;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.security.*;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.Security;
 import java.util.*;
 
 /**
@@ -44,58 +41,116 @@
  */
 @Component
 public class PayMoneyUtil {
-    //支付宝appid
-    private String aliAppid = "";
-    //支付宝开发者应用私钥
-    private String appPrivateKey = "";
-    //支付宝应用公钥
-    private String alipayPublicKey = "";
-    //支付宝支付公钥
-    private String alipay_public_key = "";
-    //微信appid
-    private String appid = "";
-    //微信商户号
-    private String mchId = "";
-    //微信商户号
-    private String key = "";
-    //支付回调网关地址
-    @Value("${callbackPath}")
-    private String callbackPath;
-    //微信支付证书地址
-    private String wechatPayCertificatesFromPath = "/usr/local/server/app/cert/weixin/apiclient_cert.p12";
-    //微信私钥证书地址
-    private String privateKeyFromPath = "/usr/local/server/app/cert/weixin/apiclient_cert.pem";
+    private String aliAppid = "";//支付宝appid
 
+    private String appPrivateKey = "";//支付宝开发者应用私钥
+
+    private String alipayPublicKey = "";//支付宝应用公钥
+
+    private String alipay_public_key = "";//支付宝支付公钥
+
+    private String appid = "";//微信appid
+
+    private String appletsAppid = "";//微信小程序appid
+
+    private String mchId = "";//微信商户号
+
+    private String key = "";//微信商户号
+
+    private String callbackPath = "";//支付回调网关地址
+
+    private String app_cert_path = "C:/cert/alipay/user/app_cert_path.crt";//应用公钥证书路径
+
+    private String alipay_cert_path = "C:/cert/alipay/user/alipay_cert_path.crt";//支付宝公钥证书文件路径
+
+    private String alipay_root_cert_path = "C:/cert/alipay/user/alipay_root_cert_path.crt";//支付宝CA根证书文件路径
+
+    private String certPath = "C:\\cert\\1523106371_20211206_cert\\apiclient_cert.p12";//微信证书
 
 
 
     /**
      * 支付宝支付
      */
-    public ResultUtil<String> alipay(String body, String subject, String outTradeNo, String amount, String notifyUrl){
-        //实例化客户端
-        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipayPublicKey, "RSA2");
-        //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
-        AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
-        //SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
-        AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
-        model.setBody(body);//对一笔交易的具体描述信息。如果是多种商品，请将商品描述字符串累加传给body。
-        model.setSubject(subject);//商品的标题/交易标题/订单标题/订单关键字等。
-        model.setOutTradeNo(outTradeNo);//商户网站唯一订单号
-        model.setTimeoutExpress("30m");
-        model.setTotalAmount(amount);//付款金额
-        model.setProductCode("QUICK_MSECURITY_PAY");
-        request.setBizModel(model);
-        request.setNotifyUrl(callbackPath + notifyUrl);
+    public ResultUtil alipay(String body, String subject, String passbackParams, String outTradeNo, String amount, String notifyUrl){
+        //构造client
+        CertAlipayRequest certAlipayRequest = new CertAlipayRequest ();
+        //设置网关地址
+        certAlipayRequest.setServerUrl("https://openapi.alipay.com/gateway.do");
+        //设置应用Id
+        certAlipayRequest.setAppId(aliAppid);
+        //设置应用私钥
+        certAlipayRequest.setPrivateKey(appPrivateKey);
+        //设置请求格式，固定值json
+        certAlipayRequest.setFormat("json");
+        //设置字符集
+        certAlipayRequest.setCharset("UTF-8");
+        //设置签名类型
+        certAlipayRequest.setSignType("RSA2");
+        //设置应用公钥证书路径
+        certAlipayRequest.setCertPath(app_cert_path);
+        //设置支付宝公钥证书路径
+        certAlipayRequest.setAlipayPublicCertPath(alipay_cert_path);
+        //设置支付宝根证书路径
+        certAlipayRequest.setRootCertPath(alipay_root_cert_path);
+        //构造client
+        AlipayClient alipayClient = null;
         try {
-            //这里和普通的接口调用不同，使用的是sdkExecute
-            AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request);
-            System.out.println(response.getBody());//就是orderString 可以直接给客户端请求，无需再做处理。
-            return ResultUtil.success(response.getBody());
+            alipayClient = new DefaultAlipayClient(certAlipayRequest);
         } catch (AlipayApiException e) {
             e.printStackTrace();
-            return ResultUtil.error("调起支付异常", "");
         }
+        //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
+        AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest ();
+        //SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
+        AlipayTradeAppPayModel model = new AlipayTradeAppPayModel ();
+        model.setBody(body);
+        model.setSubject (subject);
+        model.setOutTradeNo (outTradeNo);
+        model.setTimeoutExpress ("30m" );
+        model.setTotalAmount (amount);
+        model.setProductCode ( "QUICK_MSECURITY_PAY" );
+        model.setPassbackParams(passbackParams);//自定义参数
+        request.setBizModel ( model );
+        request.setNotifyUrl (callbackPath + notifyUrl);
+        try  {
+            //这里和普通的接口调用不同，使用的是sdkExecute
+            AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request);
+            Map<String, String> map = new HashMap<>();
+            map.put("orderString", response.getBody());
+            System.out.println(map);//就是orderString 可以直接给客户端请求，无需再做处理。
+            return ResultUtil.success(map);
+        }  catch (AlipayApiException e ) {
+            e.printStackTrace();
+        }
+
+
+//        //实例化客户端
+//        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipay_public_key, "RSA2");
+//        //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
+//        AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
+//        //SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
+//        AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
+//        model.setBody(body);//对一笔交易的具体描述信息。如果是多种商品，请将商品描述字符串累加传给body。
+//        model.setSubject(subject);//商品的标题/交易标题/订单标题/订单关键字等。
+//        model.setOutTradeNo(outTradeNo);//商户网站唯一订单号
+//        model.setTimeoutExpress("30m");
+//        model.setTotalAmount(amount);//付款金额
+//        model.setProductCode("QUICK_MSECURITY_PAY");
+//        model.setPassbackParams(passbackParams);//自定义参数
+//        request.setBizModel(model);
+//        request.setNotifyUrl(callbackPath + notifyUrl);
+//        try {
+//            //这里和普通的接口调用不同，使用的是sdkExecute
+//            AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request);
+//            Map<String, String> map = new HashMap<>();
+//            map.put("orderString", response.getBody());
+//            System.out.println(map);//就是orderString 可以直接给客户端请求，无需再做处理。
+//            return ResultUtil.success(map);
+//        } catch (AlipayApiException e) {
+//            e.printStackTrace();
+//        }
+        return null;
     }
 
 
@@ -146,7 +201,7 @@
             String valueStr = "";
             for (int i = 0; i < values.length; i++) {
                 valueStr = (i == values.length - 1) ? valueStr + values[i]
-                        : valueStr + values[i] + ",";
+                        : valueStr + values[i] + "_";
             }
             //乱码解决，这段代码在出现乱码时使用。
             //valueStr = new String(valueStr.getBytes("ISO-8859-1"), "utf-8");
@@ -155,24 +210,42 @@
         //切记alipaypublickey是支付宝的公钥，请去open.alipay.com对应应用下查看。
         //boolean AlipaySignature.rsaCheckV1(Map<String, String> params, String publicKey, String charset, String sign_type)
 //        try {
-//            boolean flag = AlipaySignature.rsaCheckV1(params, alipayPublicKey, "UTF-8","RSA2");
+//            boolean flag = AlipaySignature.rsaCheckV1(params, alipay_public_key, "UTF-8","RSA2");
 //            if(flag){
-                Map<String, String> map = new HashMap<>();
-                String out_trade_no = params.get("out_trade_no");
-                String subject = params.get("subject");
-                String total_amount = params.get("total_amount");
-                String trade_no = params.get("trade_no");
-                map.put("out_trade_no", out_trade_no);//商家订单号
-                map.put("subject", subject);
-                map.put("total_amount", total_amount);
-                map.put("trade_no", trade_no);//支付宝交易号
-                return map;
+//                Map<String, String> map = new HashMap<>();
+//                String out_trade_no = params.get("out_trade_no");
+//                String subject = params.get("subject");
+//                String total_amount = params.get("total_amount");
+//                String trade_no = params.get("trade_no");
+//                String passback_params = params.get("passback_params");
+//                map.put("out_trade_no", out_trade_no);//商家订单号
+//                map.put("subject", subject);
+//                map.put("total_amount", total_amount);
+//                map.put("trade_no", trade_no);//支付宝交易号
+//                map.put("passback_params", passback_params);//回传参数
+//                return map;
+//            }else{
+//                System.err.println("验签失败");
 //            }
-
+//
 //        } catch (AlipayApiException e) {
 //            e.printStackTrace();
 //        }
 //        return null;
+
+
+        Map<String, String> map = new HashMap<>();
+        String out_trade_no = params.get("out_trade_no");
+        String subject = params.get("subject");
+        String total_amount = params.get("total_amount");
+        String trade_no = params.get("trade_no");
+        String passback_params = params.get("passback_params");
+        map.put("out_trade_no", out_trade_no);//商家订单号
+        map.put("subject", subject);
+        map.put("total_amount", total_amount);
+        map.put("trade_no", trade_no);//支付宝交易号
+        map.put("passback_params", passback_params);//回传参数
+        return map;
     }
 
 
@@ -182,20 +255,16 @@
      * @return
      * @throws Exception
      */
-    public ResultUtil<Map<String, String>> queryALIOrder(String out_trade_no) throws Exception{
+    public ResultUtil 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 +
-                "\"}");
+                "\"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（交易结束，不可退款）
-            String tradeNo = response.getTradeNo();
-            Map<String, String> map = new HashMap<>();
-            map.put("tradeStatus", tradeStatus);
-            map.put("tradeNo", tradeNo);
-            return ResultUtil.success(map);
+            return ResultUtil.success(tradeStatus);
         } else {
             return ResultUtil.error(response.getMsg());
         }
@@ -213,7 +282,7 @@
      * @param tradeType     交易类型
      * @return
      */
-    public ResultUtil weixinpay(String body, String attach, String out_trade_no, String total_fee, String notify_url, String tradeType) throws Exception{
+    public ResultUtil weixinpay(String body, String attach, String out_trade_no, String total_fee, String notify_url, String tradeType, String openId) throws Exception{
         int i = new BigDecimal(total_fee).multiply(new BigDecimal("100")).intValue();
         String hostAddress = null;
         try {
@@ -223,7 +292,7 @@
         }
         String nonce_str = UUIDUtil.getRandomCode(16);
         Map<String, Object> map = new HashMap<>();
-        map.put("appid", appid);
+        map.put("appid", "APP".equals(tradeType) ? appid : appletsAppid);
         map.put("mch_id", mchId);
         map.put("nonce_str", nonce_str);
         map.put("body", body);
@@ -233,6 +302,9 @@
         map.put("spbill_create_ip", hostAddress);
         map.put("notify_url", callbackPath + notify_url);
         map.put("trade_type", tradeType);
+        if("JSAPI".equals(tradeType)){
+            map.put("openid", openId);
+        }
         String s = this.weixinSignature(map);
         map.put("sign", s);
 
@@ -268,26 +340,40 @@
             String result_code = map1.get("result_code");
             if("SUCCESS".equals(result_code)){
                 String type = map1.get("trade_type");
+                String prepay_id = map1.get("prepay_id");
                 switch (type){
                     case "JSAPI":
-                        break;
+                        //重新进行签名后返回给前端
+                        Map<String, Object> map2 = new HashMap<>();
+                        map2.put("appId", map1.get("appid"));
+                        map2.put("nonceStr", map1.get("nonce_str"));
+                        map2.put("package", "prepay_id=" + prepay_id);
+                        map2.put("signType", "MD5");
+                        map2.put("timeStamp", new Date().getTime() + "");
+                        String s2 = this.weixinSignature(map2);
+
+                        map2.put("prepay_id", prepay_id);
+                        map2.put("mch_id", map1.get("mch_id"));
+                        map2.put("trade_type", map1.get("trade_type"));
+
+                        map2.put("sign", s2);
+                        return ResultUtil.success(map2);
                     case "NATIVE":
                         String code_url = map1.get("code_url");
                         return ResultUtil.success(code_url);
                     case "APP":
-                        String prepay_id = map1.get("prepay_id");
                         //重新进行签名后返回给前端
-                        Map<String, Object> map2 = new HashMap<>();
-                        map2.put("appid", appid);
-                        map2.put("noncestr", nonce_str);
-                        map2.put("package", "Sign=WXPay");
-                        map2.put("partnerid", mchId);
-                        map2.put("prepayid", prepay_id);
-                        map2.put("timestamp", new Date().getTime() / 1000);
-                        String s1 = this.weixinSignature(map2);
-                        map2.put("sign", s1);
-                        System.err.println(map2);
-                        return ResultUtil.success(map2);
+                        Map<String, Object> map3 = new HashMap<>();
+                        map3.put("appid", appid);
+                        map3.put("noncestr", nonce_str);
+                        map3.put("package", "Sign=WXPay");
+                        map3.put("partnerid", mchId);
+                        map3.put("prepayid", prepay_id);
+                        map3.put("timestamp", new Date().getTime() / 1000);
+                        String s1 = this.weixinSignature(map3);
+                        map3.put("sign", s1);
+                        System.err.println(map3);
+                        return ResultUtil.success(map3);
                 }
                 return null;
             }else{
@@ -320,8 +406,8 @@
                 if("SUCCESS".equals(result_code)){
                     Map<String, String> map1 = new HashedMap();
                     map1.put("nonce_str", map.get("nonce_str"));
-                    map1.put("out_trade_no", map.get("out_trade_no"));
-                    map1.put("attach", map.get("attach"));
+                    map1.put("out_trade_no", map.get("out_trade_no"));//存储的订单code
+                    map1.put("attach", map.get("attach"));//存储订单id
                     map1.put("total_fee", map.get("total_fee"));
                     map1.put("transaction_id", map.get("transaction_id"));//微信支付订单号
                     String result = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
@@ -484,7 +570,7 @@
         map.put("total_fee", tf);
         map.put("refund_fee", rf);
         map.put("notify_url", callbackPath + notify_url);
-        String s = this.weixinSignature(map);
+        String s = this.weixinSignature(map, key);
         map.put("sign", s);
 
         String url = "https://api.mch.weixin.qq.com/secapi/pay/refund";
@@ -505,10 +591,11 @@
         Map<String, String> map1 = null;
         String body1 = null;
         try {
-            body1 = HttpClientUtil.pushHttpRequsetXml(url, xmlString.toString(), new HashMap<>()).getData();
+            body1 = HttpClientUtil.pushHttpsRequsetXml(url, xmlString.toString(), new HashMap<>(), mchId, certPath, "PKCS12");
         } catch (Exception e) {
             e.printStackTrace();
         }
+        System.err.println(body1);
         //将结果xml解析成map
         body1 = body1.replaceAll("<!\\[CDATA\\[","");
         body1 = body1.replaceAll("]]>", "");
@@ -562,6 +649,8 @@
                 Map<String, String> map1 = new HashMap<>();
                 map1.put("refund_id", map.get("refund_id"));
                 map1.put("out_refund_no", map.get("out_refund_no"));
+                String result = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
+                map1.put("result", result);
                 return map1;
             }else{
 //                System.err.println(map.get("return_msg"));
@@ -682,6 +771,229 @@
 
 
 
+    /**
+     * 微信转账功能（企业付款到零钱）
+     * @param openid                商户appid下，某用户的openid
+     * @param desc                  企业付款备注，必填。
+     * @param total_fee             企业付款金额
+     * @param partner_trade_no      商户订单号，需保持唯一性
+     * @return
+     */
+    public Map<String, String> wxTransfers(String openid, String desc, String total_fee, String partner_trade_no) throws Exception{
+        int amount = new BigDecimal(total_fee).multiply(new BigDecimal("100")).intValue();
+        String nonce_str = UUIDUtil.getRandomCode();
+        Map<String, Object> map = new HashMap<>();
+        map.put("mch_appid", appid);//申请商户号的appid或商户号绑定的appid
+        map.put("mchid", mchId);//微信支付分配的商户号
+        map.put("nonce_str", nonce_str);//随机字符串，不长于32位
+        map.put("partner_trade_no", partner_trade_no);//商户订单号，需保持唯一性
+        map.put("openid", openid);//商户appid下，某用户的openid
+        map.put("check_name", "NO_CHECK");//NO_CHECK：不校验真实姓名 FORCE_CHECK：强校验真实姓名
+        map.put("amount", amount);//企业付款金额，单位为分
+        map.put("desc", desc);//企业付款备注，必填。
+        String s = this.weixinSignature(map, key);
+        map.put("sign", s);
+
+        String url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers";
+        //设置请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_XML);
+        StringBuffer xmlString = new StringBuffer();
+        Set<String> strings = map.keySet();
+        String[] keys = {};
+        keys = strings.toArray(keys);
+        Arrays.sort(keys);
+        xmlString.append("<xml>");
+        for(int l = 0; l < keys.length; l++){
+            xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">");
+        }
+        xmlString.append("</xml>");
+
+        Map<String, String> map1 = null;
+        String body1 = HttpClientUtil.pushHttpsRequsetXml(url, xmlString.toString(), new HashMap<>(), mchId, certPath, "PKCS12");
+        //将结果xml解析成map
+        body1 = body1.replaceAll("<!\\[CDATA\\[","");
+        body1 = body1.replaceAll("]]>", "");
+        try {
+            map1 = this.xmlToMap(body1, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        } catch (DocumentException e) {
+            e.printStackTrace();
+        }
+        String return_code = map1.get("return_code");
+        Map<String, String> map2 = new HashMap<>();
+        if("SUCCESS".equals(return_code)){
+            String result_code = map1.get("result_code");
+            if("SUCCESS".equals(result_code)){
+                map2.put("return_code", result_code);
+                map2.put("payment_no", String.valueOf(map1.get("payment_no")));//付款订单号
+                map2.put("payment_time", String.valueOf(map1.get("payment_time")));//付款时间
+                return map2;
+            }else{
+                map2.put("return_code", result_code);
+                map2.put("err_code", map1.get("err_code"));
+                map2.put("err_code_des", map1.get("err_code_des"));
+                return map2;
+            }
+        }else{
+            map2.put("return_code", return_code);
+            map2.put("return_msg", map1.get("return_msg"));
+            return map2;
+        }
+    }
+
+
+    /**
+     * 微信转账功能（企业付款到银行卡）
+     * @param desc              备注信息
+     * @param total_fee         转账金额
+     * @param partner_trade_no  订单号
+     * @param enc_bank_no       银行卡号
+     * @param enc_true_name     收款方用户名
+     * @param bankName          银行名称
+     * @return
+     * @throws Exception
+     */
+    public Map<String, String> wxPayBank(String desc, String total_fee, String partner_trade_no, String enc_bank_no, String enc_true_name, String bankName) throws Exception{
+        int amount = new BigDecimal(total_fee).multiply(new BigDecimal("100")).intValue();
+        String nonce_str = UUIDUtil.getRandomCode();
+        Map<String, Object> map = new HashMap<>();
+        map.put("mch_id", mchId);//微信支付分配的商户号
+        map.put("nonce_str", nonce_str);//随机字符串，不长于32位
+        map.put("partner_trade_no", partner_trade_no);//商户订单号，需保持唯一性
+        map.put("enc_bank_no", enc_bank_no);//收款方银行卡号（采用标准RSA算法，公钥由微信侧提供）
+        map.put("enc_true_name", enc_true_name);//收款方用户名（采用标准RSA算法，公钥由微信侧提供）
+        map.put("bank_code", findBankCode(bankName));//
+        map.put("amount", amount);//企业付款金额，单位为分
+        map.put("desc", desc);//企业付款备注，必填。
+        String s = this.weixinSignature(map, key);
+        map.put("sign", s);
+
+        String url = "https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank";
+        //设置请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_XML);
+        StringBuffer xmlString = new StringBuffer();
+        Set<String> strings = map.keySet();
+        String[] keys = {};
+        keys = strings.toArray(keys);
+        Arrays.sort(keys);
+        xmlString.append("<xml>");
+        for(int l = 0; l < keys.length; l++){
+            xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">");
+        }
+        xmlString.append("</xml>");
+
+        Map<String, String> map1 = null;
+        String body1 = HttpClientUtil.pushHttpsRequsetXml(url, xmlString.toString(), new HashMap<>(), mchId, certPath, "PKCS12");
+        //将结果xml解析成map
+        body1 = body1.replaceAll("<!\\[CDATA\\[","");
+        body1 = body1.replaceAll("]]>", "");
+        try {
+            map1 = this.xmlToMap(body1, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        } catch (DocumentException e) {
+            e.printStackTrace();
+        }
+        String return_code = map1.get("return_code");
+        Map<String, String> map2 = new HashMap<>();
+        if("SUCCESS".equals(return_code)){
+            String result_code = map1.get("result_code");
+            if("SUCCESS".equals(result_code)){
+                map2.put("return_code", result_code);
+                map2.put("payment_no", String.valueOf(map1.get("payment_no")));//付款订单号
+                map2.put("cmms_amt", String.valueOf(map1.get("cmms_amt")));//手续费金额 RMB：分
+                return map2;
+            }else{
+                map2.put("return_code", result_code);
+                map2.put("err_code", map1.get("err_code"));
+                map2.put("err_code_des", map1.get("err_code_des"));
+                return map2;
+            }
+        }else{
+            map2.put("return_code", return_code);
+            map2.put("return_msg", map1.get("return_msg"));
+            return map2;
+        }
+    }
+
+    /**
+     * 微信转账到银行卡不编号
+     * @param bankName
+     * @return
+     */
+    public String findBankCode(String bankName){
+        String json = "{\"工商银行 \":1002,\"农业银行\":1005,\"建设银行\":1003,\"中国银行\":1026,\"交通银行 \":1020,\"招商银行 \":1001,\"邮储银行\":1066,\"民生银行 \":1006,\"平安银行 \":1010,\"中信银行\":1021,\"浦发银行 \":1004,\"兴业银行 \":1009,\"光大银行 \":1022,\"广发银行\":1027,\"华夏银行\":1025,\"宁波银行\":1056,\"北京银行\":4836,\"上海银行\":1024,\"南京银行\":1054,\"长子县融汇村镇银行\":4755,\"长沙银行\":4216,\"浙江泰隆商业银行\":4051,\"中原银行 \":4753,\"企业银行（中国）\":4761,\"顺德农商银行 \":4036,\"衡水银行\":4752,\"长治银行\":4756,\"大同银行\":4767,\"河南省农村信用社\":4115,\"宁夏黄河农村商业银行\":4150,\"山西省农村信用社\":4156,\"安徽省农村信用社\":4166,\"甘肃省农村信用社\":4157,\"天津农村商业银行\":4153,\"广西壮族自治区农村信用社\":4113,\"陕西省农村信用社\":4108,\"深圳农村商业银行\":4076,\"宁波鄞州农村商业银行\":4052,\"浙江省农村信用社联合社\":4764,\"江苏省农村信用社联合社\":4217,\"江苏紫金农村商业银行股份有限公司 \":4072,\"北京中关村银行股份有限公司 \":4769,\"星展银行（ 中国） 有限公司 \":4778,\"枣庄银行股份有限公司 \":4766,\"海口联合农村商业银行股份有限公司 \":4758,\"南洋商业银行（ 中国） 有限公司 \":4763}";
+        JSONObject jsonObject = JSON.parseObject(json);
+        Set<String> strings = jsonObject.keySet();
+        for(String key : strings){
+            if(key.indexOf(bankName) >= 0){
+                return jsonObject.getString(key);
+            }
+        }
+        return "";
+    }
+
+
+
+    /**
+     * 支付宝转账
+     * @param out_biz_no        商家侧唯一订单号，由商家自定义。对于不同转账请求，商家需保证该订单号在自身系统唯一。
+     * @param trans_amount      订单总金额，单位为元，精确到小数点后两位
+     * @param order_title       转账业务的标题，用于在支付宝用户的账单里显示
+     * @param identity          参与方的唯一标识（收款方支付宝账号）
+     * @param name              参与方真实姓名，如果非空，将校验收款支付宝账号姓名一致性。
+     * @param remark            业务备注
+     * @return
+     * @throws Exception
+     */
+    public Map<String, Object> aliTransfer(String out_biz_no, Double trans_amount, String order_title, String identity, String name, String remark) throws Exception{
+        CertAlipayRequest certAlipayRequest = new CertAlipayRequest();
+        certAlipayRequest.setServerUrl("https://openapi.alipay.com/gateway.do");  //gateway:支付宝网关（固定）https://openapi.alipay.com/gateway.do
+        certAlipayRequest.setAppId(aliAppid);  //APPID 即创建应用后生成,详情见创建应用并获取 APPID
+        certAlipayRequest.setPrivateKey(appPrivateKey);  //开发者应用私钥，由开发者自己生成
+        certAlipayRequest.setFormat("json");  //参数返回格式，只支持 json 格式
+        certAlipayRequest.setCharset("UTF-8");  //请求和签名使用的字符编码格式，支持 GBK和 UTF-8
+        certAlipayRequest.setSignType("RSA2");  //商户生成签名字符串所使用的签名算法类型，目前支持 RSA2 和 RSA，推荐商家使用 RSA2。
+        certAlipayRequest.setCertPath(app_cert_path); //应用公钥证书路径（app_cert_path 文件绝对路径）
+        certAlipayRequest.setAlipayPublicCertPath(alipay_cert_path); //支付宝公钥证书文件路径（alipay_cert_path 文件绝对路径）
+        certAlipayRequest.setRootCertPath(alipay_root_cert_path);  //支付宝CA根证书文件路径（alipay_root_cert_path 文件绝对路径）
+        AlipayClient alipayClient = new DefaultAlipayClient(certAlipayRequest);
+        AlipayFundTransUniTransferRequest request = new AlipayFundTransUniTransferRequest();
+        request.setBizContent("{" +
+                "\"out_biz_no\":\"" + out_biz_no + "\"," +
+                "\"trans_amount\":" + trans_amount + "," +
+                "\"product_code\":\"TRANS_ACCOUNT_NO_PWD\"," +
+                "\"biz_scene\":\"DIRECT_TRANSFER\"," +
+                "\"order_title\":\"" + order_title + "\"," +
+                "\"payee_info\":{" +
+                "\"identity\":\"" + identity + "\"," +
+                "\"identity_type\":\"ALIPAY_USER_ID\"," +
+                "\"name\":\"" + name + "\"," +
+                "}," +
+                "\"remark\":\"" + remark + "\"" +
+                "}");
+        AlipayFundTransUniTransferResponse response = alipayClient.certificateExecute(request);
+        Map<String, Object> map = new HashMap<>();
+        if(response.isSuccess()){
+            String status = response.getStatus();
+            if(status.equals("SUCCESS")){//成功
+                map.put("code", response.getCode());
+                map.put("order_id", response.getOrderId());//支付宝订单号
+                map.put("pay_fund_order_id", response.getPayFundOrderId());//支付宝流水号
+            }else{
+                map.put("code", response.getCode());
+                map.put("sub_msg", response.getSubMsg());
+            }
+        } else {
+            map.put("code", response.getSubCode());
+            map.put("sub_msg", response.getSubMsg());
+        }
+        return map;
+    }
+
 
     /**
      * 获取请求内容
@@ -741,6 +1053,41 @@
     }
 
 
+    /**
+     * 微信下单的签名算法
+     * @param map
+     * @return
+     */
+    private String weixinSignature(Map<String, Object> map, String key_){
+        try {
+            Set<Map.Entry<String, Object>> entries = map.entrySet();
+            List<Map.Entry<String, Object>> infoIds = new ArrayList<Map.Entry<String, Object>>(entries);
+            // 对所有传入参数按照字段名的 ASCII 码从小到大排序（字典序）
+            Collections.sort(infoIds, new Comparator<Map.Entry<String, Object>>() {
+                public int compare(Map.Entry<String, Object> o1, Map.Entry<String, Object> o2) {
+                    return (o1.getKey()).toString().compareTo(o2.getKey());
+                }
+            });
+            // 构造签名键值对的格式
+            StringBuilder sb = new StringBuilder();
+            for (Map.Entry<String, Object> item : infoIds) {
+                if (item.getKey() != null || item.getKey() != "") {
+                    String key = item.getKey();
+                    Object val = item.getValue();
+                    if (!(val == "" || val == null)) {
+                        sb.append(key + "=" + val + "&");
+                    }
+                }
+            }
+            sb.append("key=" + key_);
+            String sign = MD5AndKL.MD5Encode(sb.toString(), "UTF-8").toUpperCase(); //注：MD5签名方式
+            return sign;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
 
     /**
      * 微信退款成功后的解密
diff --git a/cloud-server-account/src/main/java/com/dsh/account/util/httpClinet/HttpClientUtil.java b/cloud-server-account/src/main/java/com/dsh/account/util/httpClinet/HttpClientUtil.java
index 78738b7..d69244d 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/util/httpClinet/HttpClientUtil.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/util/httpClinet/HttpClientUtil.java
@@ -197,14 +197,14 @@
      * @return
      * @throws Exception
      */
-    public String pushHttpsRequsetXml(String url, String xml, Map<String, String> header, String certPassword, String certPath, String certType) throws Exception{
+    public static String pushHttpsRequsetXml(String url, String xml, Map<String, String> header, String certPassword, String certPath, String certType) throws Exception{
         HttpPost httpPost = new HttpPost(url);
         for(String key : header.keySet()){
             httpPost.setHeader(key, header.get(key));
         }
         httpPost.setHeader("Content-Type", "application/xml");
         httpPost.setEntity(new StringEntity(xml, "UTF-8"));
-        CloseableHttpClient httpCline = this.initCert(certPassword, certPath, certType);
+        CloseableHttpClient httpCline = initCert(certPassword, certPath, certType);
         CloseableHttpResponse httpResponse = httpCline.execute(httpPost);
         String content = null;
         if(httpResponse.getStatusLine().getStatusCode() == 200){
@@ -212,7 +212,7 @@
         }else{
             content = "返回状态码：" + httpResponse.getStatusLine() + "。" + EntityUtils.toString(httpResponse.getEntity());
         }
-        this.close(httpResponse);
+        close(httpResponse);
         httpCline.close();
         return content;
     }
@@ -225,7 +225,7 @@
      * @param certType  证书类型
      * @throws Exception
      */
-    private CloseableHttpClient initCert(String key, String certPath, String certType) throws Exception {
+    private static CloseableHttpClient initCert(String key, String certPath, String certType) throws Exception {
         KeyStore keyStore = KeyStore.getInstance(certType);
         InputStream inputStream = new FileInputStream(new File(certPath));
         try {
diff --git a/cloud-server-competition/pom.xml b/cloud-server-competition/pom.xml
index b8cfa06..eaf86ec 100644
--- a/cloud-server-competition/pom.xml
+++ b/cloud-server-competition/pom.xml
@@ -99,6 +99,16 @@
             <artifactId>shardingsphere-jdbc-core</artifactId>
             <version>5.2.0</version>
         </dependency>
+        <dependency>
+            <groupId>dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>1.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alipay.sdk</groupId>
+            <artifactId>alipay-sdk-java</artifactId>
+            <version>4.8.10.ALL</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index 15f82ac..dfbb732 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -3,13 +3,17 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dsh.competition.entity.Competition;
+import com.dsh.competition.entity.PaymentCompetition;
 import com.dsh.competition.entity.UserCompetition;
 import com.dsh.competition.feignclient.model.GetStuSourseList;
 import com.dsh.competition.feignclient.model.PurchaseRecordVo;
 import com.dsh.competition.model.CompetitionInfo;
 import com.dsh.competition.model.CompetitionListVo;
+import com.dsh.competition.model.PaymentCompetitionVo;
 import com.dsh.competition.service.CompetitionService;
+import com.dsh.competition.service.IPaymentCompetitionService;
 import com.dsh.competition.service.UserCompetitionService;
+import com.dsh.competition.util.PayMoneyUtil;
 import com.dsh.competition.util.ResultUtil;
 import com.dsh.competition.util.TokenUtil;
 import io.swagger.annotations.ApiImplicitParam;
@@ -18,9 +22,14 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -46,6 +55,14 @@
 
     @Autowired
     private TokenUtil tokenUtil;
+
+    @Autowired
+    private PayMoneyUtil payMoneyUtil;
+
+    @Autowired
+    private IPaymentCompetitionService paymentCompetitionService;
+
+
 
 
 
@@ -127,7 +144,197 @@
 
 
 
+    @ResponseBody
+    @PostMapping("/api/competition/paymentCompetition")
+    @ApiOperation(value = "赛事报名", tags = {"APP-赛事活动列表"})
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+    })
+    public ResultUtil paymentCompetition(PaymentCompetitionVo paymentCompetitionVo){
+        try {
+            Integer uid = tokenUtil.getUserIdFormRedis();
+            if(null == uid){
+                return ResultUtil.tokenErr();
+            }
+            return cttService.paymentCompetition(uid, paymentCompetitionVo);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResultUtil.runErr();
+        }
+    }
 
-//    public ResultUtil
+
+    /**
+     * 报名赛事微信支付回调
+     * @param request
+     * @param response
+     */
+    @ResponseBody
+    @PostMapping("/base/competition/weChatPaymentCompetitionCallback")
+    public void weChatPaymentCompetitionCallback(HttpServletRequest request, HttpServletResponse response){
+        try {
+            Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
+            if(null != map){
+                String code = map.get("out_trade_no");
+                String transaction_id = map.get("transaction_id");
+                String result = map.get("result");
+
+                PaymentCompetition paymentCompetition = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", code).eq("payType", 1));
+                if(paymentCompetition.getPayStatus() == 1){
+                    paymentCompetition.setPayStatus(2);
+                    paymentCompetition.setPayTime(new Date());
+                    paymentCompetition.setPayOrderNo(transaction_id);
+                    paymentCompetitionService.updateById(paymentCompetition);
+
+                    Competition competition = cttService.getById(paymentCompetition.getCompetitionId());
+                    competition.setApplicantsNumber(competition.getApplicantsNumber() + 1);
+                    cttService.updateById(competition);
+                }
+
+                PrintWriter out = response.getWriter();
+                out.write(result);
+                out.flush();
+                out.close();
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+
+    /**
+     * 报名赛事支付宝支付回调
+     * @param request
+     * @param response
+     */
+    @ResponseBody
+    @PostMapping("/base/competition/aliPaymentCompetitionCallback")
+    public void aliPaymentCompetitionCallback(HttpServletRequest request, HttpServletResponse response){
+        try {
+            Map<String, String> map = payMoneyUtil.alipayCallback(request);
+            if(null != map){
+                String code = map.get("out_trade_no");
+                String trade_no = map.get("trade_no");
+
+                PaymentCompetition paymentCompetition = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", code).eq("payType", 2));
+                if(paymentCompetition.getPayStatus() == 1){
+                    paymentCompetition.setPayStatus(2);
+                    paymentCompetition.setPayTime(new Date());
+                    paymentCompetition.setPayOrderNo(trade_no);
+                    paymentCompetitionService.updateById(paymentCompetition);
+
+                    Competition competition = cttService.getById(paymentCompetition.getCompetitionId());
+                    competition.setApplicantsNumber(competition.getApplicantsNumber() + 1);
+                    cttService.updateById(competition);
+                }
+                PrintWriter out = response.getWriter();
+                out.write("success");
+                out.flush();
+                out.close();
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+
+
+
+    @ResponseBody
+    @PostMapping("/api/competition/queryMyCompetitionList")
+    @ApiOperation(value = "获取已报名赛事列表", tags = {"APP-赛事活动列表"})
+    @ApiImplicitParams({
+            @ApiImplicitParam(value = "类型（1=未开始，2=进行中，3=已结束，4=已取消）", name = "type", dataType = "int", required = true),
+            @ApiImplicitParam(value = "页码，首页1", name = "pageSize", dataType = "int", required = true),
+            @ApiImplicitParam(value = "页条数", name = "pageNo", dataType = "int", required = true),
+            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+    })
+    public ResultUtil<List<CompetitionListVo>> queryMyCompetitionList(Integer type, Integer pageSize, Integer pageNo){
+        try {
+            Integer uid = tokenUtil.getUserIdFormRedis();
+            if(null == uid){
+                return ResultUtil.tokenErr();
+            }
+            List<CompetitionListVo> competitionListVos = paymentCompetitionService.queryMyCompetitionList(uid, type, pageSize, pageNo);
+            return ResultUtil.success(competitionListVos);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResultUtil.runErr();
+        }
+    }
+
+
+
+    @ResponseBody
+    @PostMapping("/api/competition/queryMyCompetitionInfo")
+    @ApiOperation(value = "获取已报名赛事详情", tags = {"APP-赛事活动列表"})
+    @ApiImplicitParams({
+            @ApiImplicitParam(value = "赛事id", name = "id", dataType = "int", required = true),
+            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+    })
+    public ResultUtil<CompetitionInfo> queryMyCompetitionInfo(Long id){
+        try {
+            CompetitionInfo competitionInfo = paymentCompetitionService.queryMyCompetitionInfo(id);
+            return ResultUtil.success(competitionInfo);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResultUtil.runErr();
+        }
+    }
+
+
+
+    @ResponseBody
+    @PostMapping("/api/competition/cancelMyCompetition")
+    @ApiOperation(value = "取消报名的赛事", tags = {"APP-赛事活动列表"})
+    @ApiImplicitParams({
+            @ApiImplicitParam(value = "赛事id", name = "id", dataType = "int", required = true),
+            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+    })
+    public ResultUtil cancelMyCompetition(Long id){
+        try {
+            ResultUtil resultUtil = paymentCompetitionService.cancelMyCompetition(id);
+            return resultUtil;
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResultUtil.runErr();
+        }
+    }
+
+
+    /**
+     * 取消已报名赛事后微信回退金额回调
+     * @param request
+     * @param response
+     */
+    @ResponseBody
+    @PostMapping("/base/competition/weChatCancelPaymentCompetitionCallback")
+    public void weChatCancelPaymentCompetitionCallback(HttpServletRequest request, HttpServletResponse response){
+        try {
+            Map<String, String> map = payMoneyUtil.wxRefundCallback(request);
+            if(null != map){
+                String code = map.get("out_refund_no");
+                String refund_id = map.get("refund_id");
+                String result = map.get("result");
+                PaymentCompetition paymentCompetition = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", code).eq("payType", 1));
+                if(paymentCompetition.getPayStatus() == 1){
+                    paymentCompetition.setPayStatus(3);
+                    paymentCompetition.setRefundTime(new Date());
+                    paymentCompetition.setRefundOrderNo(refund_id);
+                    paymentCompetitionService.updateById(paymentCompetition);
+
+                    Competition competition = cttService.getById(paymentCompetition.getCompetitionId());
+                    competition.setApplicantsNumber(competition.getApplicantsNumber() - 1);
+                    cttService.updateById(competition);
+                }
+                PrintWriter out = response.getWriter();
+                out.write(result);
+                out.flush();
+                out.close();
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
 }
 
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/entity/PaymentCompetition.java b/cloud-server-competition/src/main/java/com/dsh/competition/entity/PaymentCompetition.java
index 2473805..f436d16 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/entity/PaymentCompetition.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/entity/PaymentCompetition.java
@@ -71,6 +71,11 @@
     @TableField("refundOrderNo")
     private String refundOrderNo;
     /**
+     * 状态（1=正常，2=冻结，3=删除）
+     */
+    @TableField("state")
+    private Integer state;
+    /**
      * 添加时间
      */
     @TableField("insertTime")
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/entity/UserCompetition.java b/cloud-server-competition/src/main/java/com/dsh/competition/entity/UserCompetition.java
index 49c2929..50444da 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/entity/UserCompetition.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/entity/UserCompetition.java
@@ -49,6 +49,11 @@
     @TableField("participantId")
     private Integer participantId;
     /**
+     * 支付记录id
+     */
+    @TableField("paymentCompetitionId")
+    private Long paymentCompetitionId;
+    /**
      * 参加时间
      */
     @TableField("insertTime")
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/AppUserClient.java b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/AppUserClient.java
new file mode 100644
index 0000000..5cc9c6d
--- /dev/null
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/AppUserClient.java
@@ -0,0 +1,29 @@
+package com.dsh.competition.feignclient.account;
+
+import com.dsh.competition.feignclient.account.model.AppUser;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/6/29 14:09
+ */
+@FeignClient("mb-cloud-account")
+public interface AppUserClient {
+
+    /**
+     * 根据用户id获取用户信息
+     * @param appUserId
+     * @return
+     */
+    @PostMapping("/base/appUser/queryAppUser")
+    AppUser queryAppUser(Integer appUserId);
+
+
+    /**
+     * 修改用户信息
+     * @param appUser
+     */
+    @PostMapping("/base/appUser/updateAppUser")
+    void updateAppUser(AppUser appUser);
+}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/StudentClient.java b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/StudentClient.java
new file mode 100644
index 0000000..9649557
--- /dev/null
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/StudentClient.java
@@ -0,0 +1,22 @@
+package com.dsh.competition.feignclient.account;
+
+import com.dsh.competition.feignclient.account.model.Student;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/7/10 9:59
+ */
+@FeignClient("mb-cloud-account")
+public interface StudentClient {
+
+
+    /**
+     * 根据电话号码获取学员
+     * @param phone
+     * @return
+     */
+    @PostMapping("/student/queryStudentByPhone")
+    Student queryStudentByPhone(String phone);
+}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/model/AppUser.java b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/model/AppUser.java
new file mode 100644
index 0000000..b6f3a17
--- /dev/null
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/model/AppUser.java
@@ -0,0 +1,114 @@
+package com.dsh.competition.feignclient.account.model;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/6/29 14:09
+ */
+@Data
+public class AppUser {
+    private Integer id;
+    /**
+     * 编号
+     */
+    private String code;
+    /**
+     * 姓名
+     */
+    private String name;
+    /**
+     * 电话
+     */
+    private String phone;
+    /**
+     * 密码
+     */
+    private String password;
+    /**
+     * 生日
+     */
+    private Date birthday;
+    /**
+     * 性别（1=男，2=女）
+     */
+    private Integer gender;
+    /**
+     * 身高
+     */
+    private Double height;
+    /**
+     * 体重
+     */
+    private Double weight;
+    /**
+     * bmi健康值
+     */
+    private Double bmi;
+    /**
+     * 身份证号
+     */
+    private String idCard;
+    /**
+     * 微信openid
+     */
+    private String openid;
+    /**
+     * 省
+     */
+    private String province;
+    /**
+     * 省编号
+     */
+    private String provinceCode;
+    /**
+     * 市
+     */
+    private String city;
+    /**
+     * 市编号
+     */
+    private String cityCode;
+    /**
+     * 是否是年度会员（0=否，1=是）
+     */
+    private Integer isVip;
+    /**
+     * 会员有效期
+     */
+    private Date vipEndTime;
+    /**
+     * 会员等级id
+     */
+    private Integer viplevelId;
+    /**
+     * 推荐用户id
+     */
+    private Integer referralUserId;
+    /**
+     * 销售员id
+     */
+    private Integer salesmanUserId;
+    /**
+     * 状态（1=正常，2=冻结，3=删除）
+     */
+    private Integer state;
+    /**
+     * 剩余积分
+     */
+    private Integer integral;
+    /**
+     * 玩湃币
+     */
+    private Integer playPaiCoins;
+    /**
+     * 用户头像
+     */
+    private String headImg;
+    /**
+     * 添加时间
+     */
+    private Date insertTime;
+}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/model/Student.java b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/model/Student.java
new file mode 100644
index 0000000..b97d134
--- /dev/null
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/account/model/Student.java
@@ -0,0 +1,73 @@
+package com.dsh.competition.feignclient.account.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/7/4 23:39
+ */
+@Data
+public class Student {
+    private Integer id;
+    /**
+     * 用户id
+     */
+    private Integer appUserId;
+    /**
+     * 学员姓名
+     */
+    private String name;
+    /**
+     * 学员电话
+     */
+    private String phone;
+    /**
+     * 生日
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date birthday;
+    /**
+     * 性别（1=男，2=女）
+     */
+    private Integer sex;
+    /**
+     * 身高
+     */
+    private Double height;
+    /**
+     * 体重
+     */
+    private Double weight;
+    /**
+     * bmi健康值
+     */
+    private Double bmi;
+    /**
+     * 身份证号
+     */
+    private String idCard;
+    /**
+     * 体侧表
+     */
+    private String lateralSurface;
+    /**
+     * 状态（1=正常，2=冻结，3=删除）
+     */
+    private Integer state;
+    /**
+     * 添加时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date insertTime;
+    /**
+     * 头像
+     */
+    private String headImg;
+    /**
+     * 是否默认 1默认 2不是默认
+     */
+    private Integer isDefault;
+}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/course/CoursePackagePaymentClient.java b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/course/CoursePackagePaymentClient.java
new file mode 100644
index 0000000..6bad81e
--- /dev/null
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/course/CoursePackagePaymentClient.java
@@ -0,0 +1,37 @@
+package com.dsh.competition.feignclient.course;
+
+import com.dsh.competition.feignclient.course.model.PaymentDeductionClassHour;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/7/10 9:54
+ */
+@FeignClient("mb-cloud-course")
+public interface CoursePackagePaymentClient {
+
+
+    /**
+     * 获取学员剩余课时
+     * @param id
+     * @return
+     */
+    @PostMapping("/coursePackagePayment/queryResidueClassHour")
+    Integer queryResidueClassHour(Integer id);
+
+
+    /**
+     * 支付扣减学员课时
+     */
+    @PostMapping("/coursePackagePayment/paymentDeductionClassHour")
+    void paymentDeductionClassHour(PaymentDeductionClassHour paymentDeductionClassHour);
+
+
+    /**
+     * 取消报名赛事后回退学员课时
+     * @param paymentDeductionClassHour
+     */
+    @PostMapping("/coursePackagePayment/rollbackPaymentDeductionClassHour")
+    void rollbackPaymentDeductionClassHour(PaymentDeductionClassHour paymentDeductionClassHour);
+}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/course/model/PaymentDeductionClassHour.java b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/course/model/PaymentDeductionClassHour.java
new file mode 100644
index 0000000..eb83edf
--- /dev/null
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/feignclient/course/model/PaymentDeductionClassHour.java
@@ -0,0 +1,23 @@
+package com.dsh.competition.feignclient.course.model;
+
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/7/10 15:05
+ */
+@Data
+public class PaymentDeductionClassHour {
+    /**
+     * 学员id
+     */
+    private Integer id;
+    /**
+     * 扣减课时
+     */
+    private Integer classHour;
+    /**
+     * 支付编号
+     */
+    private String code;
+}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java b/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java
index 12010e5..35c7a0e 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/mapper/PaymentCompetitionMapper.java
@@ -2,10 +2,26 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dsh.competition.entity.PaymentCompetition;
+import com.dsh.competition.model.CompetitionListVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @author zhibing.pu
  * @date 2023/7/6 16:36
  */
 public interface PaymentCompetitionMapper extends BaseMapper<PaymentCompetition> {
+
+
+    /**
+     * 获取已报名赛事列表
+     * @param uid
+     * @param type
+     * @param pageSize
+     * @param pageNo
+     * @return
+     */
+    List<CompetitionListVo> queryMyCompetitionList(@Param("uid") Integer uid, @Param("type") Integer type,
+                                                   @Param("pageSize") Integer pageSize, @Param("pageNo") Integer pageNo);
 }
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionInfo.java b/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionInfo.java
index 4824418..6ffed56 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionInfo.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/model/CompetitionInfo.java
@@ -14,7 +14,7 @@
 @ApiModel
 public class CompetitionInfo {
     @ApiModelProperty("赛事id")
-    private Integer id;
+    private Long id;
     @ApiModelProperty("赛事图片")
     private String imgs;
     @ApiModelProperty("赛事名称")
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/model/ParticipantVo.java b/cloud-server-competition/src/main/java/com/dsh/competition/model/ParticipantVo.java
index 7ecc696..ff64f22 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/model/ParticipantVo.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/model/ParticipantVo.java
@@ -20,5 +20,5 @@
     @ApiModelProperty("身份证号码")
     private String idcard;
     @ApiModelProperty("剩余课时")
-    private Integer lave;
+    private Integer residueClassHour;
 }
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/model/PaymentCompetitionVo.java b/cloud-server-competition/src/main/java/com/dsh/competition/model/PaymentCompetitionVo.java
new file mode 100644
index 0000000..0d0a6d5
--- /dev/null
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/model/PaymentCompetitionVo.java
@@ -0,0 +1,20 @@
+package com.dsh.competition.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/7/10 11:23
+ */
+@Data
+@ApiModel
+public class PaymentCompetitionVo {
+    @ApiModelProperty(value = "赛事id", dataType = "int", required = true)
+    private Integer id;
+    @ApiModelProperty(value = "参赛人员id，多个分号分隔", dataType = "String", required = true)
+    private String ids;
+    @ApiModelProperty(value = "支付方式（1=微信，2=支付宝，3=余额，4=课时）", dataType = "int", required = true)
+    private Integer payType;
+}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/CompetitionService.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/CompetitionService.java
index 964b9c7..005e215 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/CompetitionService.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/CompetitionService.java
@@ -4,6 +4,8 @@
 import com.dsh.competition.entity.Competition;
 import com.dsh.competition.model.CompetitionInfo;
 import com.dsh.competition.model.CompetitionListVo;
+import com.dsh.competition.model.PaymentCompetitionVo;
+import com.dsh.competition.util.ResultUtil;
 
 import java.util.List;
 
@@ -35,4 +37,14 @@
      * @return
      */
     CompetitionInfo queryCompetitionInfo(Integer uid, Integer id, String lon, String lat) throws Exception;
+
+
+    /**
+     * 赛事报名
+     * @param uid
+     * @param paymentCompetitionVo
+     * @return
+     * @throws Exception
+     */
+    ResultUtil paymentCompetition(Integer uid, PaymentCompetitionVo paymentCompetitionVo) throws Exception;
 }
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java
index 9bc0060..ee07f46 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/IPaymentCompetitionService.java
@@ -2,10 +2,45 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsh.competition.entity.PaymentCompetition;
+import com.dsh.competition.model.CompetitionInfo;
+import com.dsh.competition.model.CompetitionListVo;
+import com.dsh.competition.util.ResultUtil;
+
+import java.util.List;
 
 /**
  * @author zhibing.pu
  * @date 2023/7/6 16:37
  */
 public interface IPaymentCompetitionService extends IService<PaymentCompetition> {
+
+
+    /**
+     * 获取我的赛事报名记录
+     * @param uid
+     * @param type
+     * @param pageSize
+     * @param pageNo
+     * @return
+     * @throws Exception
+     */
+    List<CompetitionListVo> queryMyCompetitionList(Integer uid, Integer type, Integer pageSize, Integer pageNo) throws Exception;
+
+
+    /**
+     * 获取我报名的赛事详情
+     * @param id
+     * @return
+     * @throws Exception
+     */
+    CompetitionInfo queryMyCompetitionInfo(Long id) throws Exception;
+
+
+    /**
+     * 取消赛事报名
+     * @param id
+     * @return
+     * @throws Exception
+     */
+    ResultUtil cancelMyCompetition(Long id) throws Exception;
 }
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
index 724f75c..cae574a 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
@@ -1,23 +1,30 @@
 package com.dsh.competition.service.impl;
 
+import com.alibaba.nacos.common.utils.UuidUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsh.competition.entity.Competition;
 import com.dsh.competition.entity.Participant;
 import com.dsh.competition.entity.PaymentCompetition;
 import com.dsh.competition.entity.UserCompetition;
+import com.dsh.competition.feignclient.account.AppUserClient;
+import com.dsh.competition.feignclient.account.StudentClient;
+import com.dsh.competition.feignclient.account.model.AppUser;
+import com.dsh.competition.feignclient.account.model.Student;
+import com.dsh.competition.feignclient.course.CoursePackagePaymentClient;
+import com.dsh.competition.feignclient.course.model.PaymentDeductionClassHour;
 import com.dsh.competition.feignclient.other.StoreClient;
 import com.dsh.competition.feignclient.other.model.Store;
 import com.dsh.competition.mapper.CompetitionMapper;
 import com.dsh.competition.model.CompetitionInfo;
 import com.dsh.competition.model.CompetitionListVo;
 import com.dsh.competition.model.ParticipantVo;
+import com.dsh.competition.model.PaymentCompetitionVo;
 import com.dsh.competition.service.CompetitionService;
 import com.dsh.competition.service.IParticipantService;
 import com.dsh.competition.service.IPaymentCompetitionService;
 import com.dsh.competition.service.UserCompetitionService;
-import com.dsh.competition.util.GeodesyUtil;
-import com.dsh.competition.util.ToolUtil;
+import com.dsh.competition.util.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -54,6 +61,18 @@
     @Autowired
     private IParticipantService participantService;
 
+    @Resource
+    private AppUserClient appUserClient;
+
+    @Resource
+    private StudentClient studentClient;
+
+    @Resource
+    private CoursePackagePaymentClient coursePackagePaymentClient;
+
+    @Autowired
+    private PayMoneyUtil payMoneyUtil;
+
 
 
     /**
@@ -81,7 +100,7 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
         Competition competition = this.getById(id);
         CompetitionInfo competitionInfo = new CompetitionInfo();
-        competitionInfo.setId(competition.getId());
+        competitionInfo.setId(competition.getId().longValue());
         competitionInfo.setImgs(competition.getImgs());
         competitionInfo.setName(competition.getName());
         competitionInfo.setRegisterCondition(competition.getRegisterCondition());
@@ -129,4 +148,225 @@
         }
         return competitionInfo;
     }
+
+
+    /**
+     * 赛事报名
+     * @param uid
+     * @param paymentCompetitionVo
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public ResultUtil paymentCompetition(Integer uid, PaymentCompetitionVo paymentCompetitionVo) throws Exception {
+        AppUser appUser = appUserClient.queryAppUser(uid);
+        String[] split = paymentCompetitionVo.getIds().split(";");
+        Competition competition = this.getById(paymentCompetitionVo.getId());
+        BigDecimal money = competition.getPrice().multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN);
+        if(paymentCompetitionVo.getPayType() == 3){//玩湃币
+            if(money.compareTo(new BigDecimal(appUser.getPlayPaiCoins())) > 0){
+                return ResultUtil.error("报名失败，玩湃币不足，请充值");
+            }
+        }
+        if(paymentCompetitionVo.getPayType() == 4){//课程
+            for (String s : split) {
+                Participant participant = participantService.getById(s);
+                Student student = studentClient.queryStudentByPhone(participant.getPhone());
+                if(null == student){
+                    return ResultUtil.error(participant.getName() + "不是学员，无法使用课时支付。");
+                }
+                Integer integer = coursePackagePaymentClient.queryResidueClassHour(student.getId());
+                if(new BigDecimal(integer).compareTo(competition.getPrice()) < 0){
+                    return ResultUtil.error(participant.getName() + "剩余课时不足，无法完成支付。");
+                }
+            }
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+        PaymentCompetition paymentCompetition = new PaymentCompetition();
+        String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
+        paymentCompetition.setCode(code);
+        paymentCompetition.setCompetitionId(paymentCompetitionVo.getId());
+        paymentCompetition.setAppUserId(uid);
+        paymentCompetition.setPayType(paymentCompetitionVo.getPayType());
+        paymentCompetition.setAmount(competition.getPrice().multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+        paymentCompetition.setPayStatus(1);
+        paymentCompetition.setInsertTime(new Date());
+        paymentCompetitionService.save(paymentCompetition);
+
+        for (String s : split) {
+            UserCompetition userCompetition = new UserCompetition();
+            userCompetition.setAppUserId(uid);
+            userCompetition.setCompetitionId(paymentCompetitionVo.getId());
+            userCompetition.setParticipantId(Integer.valueOf(s));
+            userCompetition.setPaymentCompetitionId(paymentCompetition.getId());
+            userCompetition.setInsertTime(new Date());
+            userCompetitionService.save(userCompetition);
+        }
+        if(paymentCompetitionVo.getPayType() == 1){//微信
+            return weChatPaymentCompetition(code, money);
+        }
+
+        if(paymentCompetitionVo.getPayType() == 2){//支付宝
+            return aliPaymentCompetition(code, money);
+        }
+        if(paymentCompetitionVo.getPayType() == 3){//玩湃币
+            appUser.setPlayPaiCoins(appUser.getPlayPaiCoins() - money.intValue());
+            appUserClient.updateAppUser(appUser);
+
+            paymentCompetition.setPayStatus(2);
+            paymentCompetition.setPayTime(new Date());
+            paymentCompetition.setPayOrderNo("");
+            paymentCompetitionService.updateById(paymentCompetition);
+
+            competition.setApplicantsNumber(competition.getApplicantsNumber() + 1);
+            this.updateById(competition);
+        }
+        if(paymentCompetitionVo.getPayType() == 4){//课程
+            for (String s : split) {
+                Participant participant = participantService.getById(s);
+                Student student = studentClient.queryStudentByPhone(participant.getPhone());
+                PaymentDeductionClassHour paymentDeductionClassHour = new PaymentDeductionClassHour();
+                paymentDeductionClassHour.setId(student.getId());
+                paymentDeductionClassHour.setClassHour(competition.getPrice().intValue());
+                paymentDeductionClassHour.setCode(code);
+                coursePackagePaymentClient.paymentDeductionClassHour(paymentDeductionClassHour);
+            }
+            paymentCompetition.setPayStatus(2);
+            paymentCompetition.setPayTime(new Date());
+            paymentCompetition.setPayOrderNo("");
+            paymentCompetitionService.updateById(paymentCompetition);
+
+            competition.setApplicantsNumber(competition.getApplicantsNumber() + 1);
+            this.updateById(competition);
+        }
+        return ResultUtil.success();
+    }
+
+
+    /**
+     * 赛事微信支付
+     * @param code
+     * @param money
+     * @return
+     * @throws Exception
+     */
+    public ResultUtil weChatPaymentCompetition(String code, BigDecimal money) throws Exception{
+        ResultUtil weixinpay = payMoneyUtil.weixinpay("报名赛事", "", code, money.toString(), "/base/competition/weChatPaymentCompetitionCallback", "APP", "");
+        if(weixinpay.getCode() == 200){
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        int num = 1;
+                        int wait = 0;
+                        while (num <= 10){
+                            int min = 5000;
+                            wait += (min * num);
+                            Thread.sleep(wait);
+                            PaymentCompetition paymentCompetition = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", code).eq("payType", 1));
+                            if(paymentCompetition.getPayStatus() == 2){
+                                break;
+                            }
+                            ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(code, "");
+                            if(resultUtil.getCode() == 200 && paymentCompetition.getPayStatus() == 1){
+                                /**
+                                 * SUCCESS—支付成功，
+                                 * REFUND—转入退款，
+                                 * NOTPAY—未支付，
+                                 * CLOSED—已关闭，
+                                 * REVOKED—已撤销（刷卡支付），
+                                 * USERPAYING--用户支付中，
+                                 * PAYERROR--支付失败(其他原因，如银行返回失败)
+                                 */
+                                Map<String, String> data1 = resultUtil.getData();
+                                String s = data1.get("trade_state");
+                                String transaction_id = data1.get("transaction_id");
+                                if("REFUND".equals(s) || "NOTPAY".equals(s) || "CLOSED".equals(s) || "REVOKED".equals(s) || "PAYERROR".equals(s) || num == 10){
+                                    paymentCompetition.setState(3);
+                                    userCompetitionService.remove(new QueryWrapper<UserCompetition>().eq("paymentCompetitionId", paymentCompetition.getId()));
+                                    break;
+                                }
+                                if("SUCCESS".equals(s)){
+                                    paymentCompetition.setPayStatus(2);
+                                    paymentCompetition.setPayTime(new Date());
+                                    paymentCompetition.setPayOrderNo(transaction_id);
+                                    paymentCompetitionService.updateById(paymentCompetition);
+                                    break;
+                                }
+                                if("USERPAYING".equals(s)){
+                                    num++;
+                                }
+                            }
+                        }
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
+                }
+            }).start();
+        }
+        return weixinpay;
+    }
+
+
+    /**
+     * 赛事支付宝支付
+     * @param code
+     * @param money
+     * @return
+     * @throws Exception
+     */
+    public ResultUtil aliPaymentCompetition(String code, BigDecimal money) throws Exception{
+        ResultUtil alipay = payMoneyUtil.alipay("报名赛事", "", "", code, money.toString(), "/base/competition/aliPaymentCompetitionCallback");
+        if(alipay.getCode() == 200){
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        int num = 1;
+                        int wait = 0;
+                        while (num <= 10){
+                            int min = 5000;
+                            wait += (min * num);
+                            Thread.sleep(wait);
+                            PaymentCompetition paymentCompetition = paymentCompetitionService.getOne(new QueryWrapper<PaymentCompetition>().eq("code", code).eq("payType", 2));
+                            if(paymentCompetition.getPayStatus() == 2){
+                                break;
+                            }
+                            ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryALIOrder(code);
+                            if(resultUtil.getCode() == 200 && paymentCompetition.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){
+                                    paymentCompetition.setState(3);
+                                    userCompetitionService.remove(new QueryWrapper<UserCompetition>().eq("paymentCompetitionId", paymentCompetition.getId()));
+                                    break;
+                                }
+                                if("TRADE_SUCCESS".equals(s)){
+                                    paymentCompetition.setPayStatus(2);
+                                    paymentCompetition.setPayTime(new Date());
+                                    paymentCompetition.setPayOrderNo(tradeNo);
+                                    paymentCompetitionService.updateById(paymentCompetition);
+                                    break;
+                                }
+                                if("WAIT_BUYER_PAY".equals(s)){
+                                    num++;
+                                }
+                            }
+                        }
+                    }catch (Exception e){
+                        e.printStackTrace();
+                    }
+                }
+            }).start();
+        }
+        return alipay;
+    }
 }
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
index eab7639..2e4e589 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
@@ -3,6 +3,9 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsh.competition.entity.Participant;
+import com.dsh.competition.feignclient.account.StudentClient;
+import com.dsh.competition.feignclient.account.model.Student;
+import com.dsh.competition.feignclient.course.CoursePackagePaymentClient;
 import com.dsh.competition.mapper.ParticipantMapper;
 import com.dsh.competition.model.AddParticipant;
 import com.dsh.competition.model.EditParticipant;
@@ -14,6 +17,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -25,6 +29,15 @@
  */
 @Service
 public class ParticipantServiceImpl extends ServiceImpl<ParticipantMapper, Participant> implements IParticipantService {
+
+    @Resource
+    private CoursePackagePaymentClient coursePackagePaymentClient;
+
+    @Resource
+    private StudentClient studentClient;
+
+
+
 
 
     /**
@@ -68,6 +81,13 @@
             participantVo.setIdcard(participant.getIdcard());
             Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(participant.getBirthday()));
             participantVo.setAge(age);
+            Student student = studentClient.queryStudentByPhone(participant.getPhone());
+            if(null != student){
+                Integer integer = coursePackagePaymentClient.queryResidueClassHour(student.getId());
+                participantVo.setResidueClassHour(integer);
+            }else{
+                participantVo.setResidueClassHour(0);
+            }
             listVo.add(participantVo);
         }
         return listVo;
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java
index ec3eed7..6db453b 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java
@@ -1,10 +1,40 @@
 package com.dsh.competition.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.competition.entity.Competition;
+import com.dsh.competition.entity.Participant;
 import com.dsh.competition.entity.PaymentCompetition;
+import com.dsh.competition.entity.UserCompetition;
+import com.dsh.competition.feignclient.account.AppUserClient;
+import com.dsh.competition.feignclient.account.StudentClient;
+import com.dsh.competition.feignclient.account.model.AppUser;
+import com.dsh.competition.feignclient.account.model.Student;
+import com.dsh.competition.feignclient.course.CoursePackagePaymentClient;
+import com.dsh.competition.feignclient.course.model.PaymentDeductionClassHour;
+import com.dsh.competition.feignclient.other.StoreClient;
+import com.dsh.competition.feignclient.other.model.Store;
 import com.dsh.competition.mapper.PaymentCompetitionMapper;
+import com.dsh.competition.model.CompetitionInfo;
+import com.dsh.competition.model.CompetitionListVo;
+import com.dsh.competition.model.ParticipantVo;
+import com.dsh.competition.service.CompetitionService;
+import com.dsh.competition.service.IParticipantService;
 import com.dsh.competition.service.IPaymentCompetitionService;
+import com.dsh.competition.service.UserCompetitionService;
+import com.dsh.competition.util.*;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author zhibing.pu
@@ -12,4 +42,181 @@
  */
 @Service
 public class PaymentCompetitionServiceImpl extends ServiceImpl<PaymentCompetitionMapper, PaymentCompetition> implements IPaymentCompetitionService {
+
+    @Autowired
+    private CompetitionService competitionService;
+
+    @Resource
+    private StoreClient storeClient;
+
+    @Autowired
+    private UserCompetitionService userCompetitionService;
+
+    @Autowired
+    private IParticipantService participantService;
+
+    @Autowired
+    private PayMoneyUtil payMoneyUtil;
+
+    @Resource
+    private AppUserClient appUserClient;
+
+    @Resource
+    private CoursePackagePaymentClient coursePackagePaymentClient;
+
+    @Resource
+    private StudentClient studentClient;
+
+
+
+
+    /**
+     * 获取我的报名赛事记录
+     * @param uid
+     * @param type
+     * @param pageSize
+     * @param pageNo
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public List<CompetitionListVo> queryMyCompetitionList(Integer uid, Integer type, Integer pageSize, Integer pageNo) throws Exception {
+        pageSize = (pageSize - 1) * pageNo;
+        return this.baseMapper.queryMyCompetitionList(uid, type, pageSize, pageNo);
+    }
+
+
+    /**
+     * 获取我报名的赛事详情
+     * @param id
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public CompetitionInfo queryMyCompetitionInfo(Long id) throws Exception {
+        PaymentCompetition paymentCompetition = this.getById(id);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        Competition competition = competitionService.getById(paymentCompetition.getCompetitionId());
+        CompetitionInfo competitionInfo = new CompetitionInfo();
+        competitionInfo.setId(id);
+        competitionInfo.setImgs(competition.getImgs());
+        competitionInfo.setName(competition.getName());
+        competitionInfo.setRegisterCondition(competition.getRegisterCondition());
+        Store store = storeClient.queryStoreById(competition.getStoreId());
+        competitionInfo.setStoreName(store.getName());
+        competitionInfo.setStoreAddress(store.getAddress());
+        competitionInfo.setStoreLon(store.getLon());
+        competitionInfo.setStoreLat(store.getLat());
+        competitionInfo.setStoreCoverDrawing(store.getCoverDrawing());
+        competitionInfo.setRegisterEndTime(sdf.format(competition.getRegisterEndTime()));
+        competitionInfo.setStartTime(sdf.format(competition.getStartTime()));
+        competitionInfo.setEndTime(sdf.format(competition.getEndTime()));
+        competitionInfo.setAge(competition.getStartAge() + "-" + competition.getEndAge());
+        competitionInfo.setProvince(competition.getEntryProvince());
+        competitionInfo.setCity(competition.getEntryCity());
+        competitionInfo.setAddress(competition.getEntryAddress());
+        competitionInfo.setPayType(competition.getPayType());
+        competitionInfo.setPrice(competition.getPrice().doubleValue());
+        competitionInfo.setIntroduction(competition.getIntroduction());
+        competitionInfo.setRegistrationNotes(competition.getRegistrationNotes());
+        competitionInfo.setApply(1);
+        List<ParticipantVo> participant = new ArrayList<>();
+        List<UserCompetition> list = userCompetitionService.list(new QueryWrapper<UserCompetition>().eq("paymentCompetitionId", paymentCompetition.getId()));
+        List<Integer> collect = list.stream().map(UserCompetition::getParticipantId).collect(Collectors.toList());
+        List<Participant> participants = participantService.listByIds(collect);
+        SimpleDateFormat sdf_year = new SimpleDateFormat("yyyy");
+        for (Participant participant1 : participants) {
+            ParticipantVo participantVo = new ParticipantVo();
+            participantVo.setId(participant1.getId());
+            participantVo.setName(participant1.getName());
+            participantVo.setIdcard(participant1.getIdcard());
+            Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(participant1.getBirthday()));
+            participantVo.setAge(age);
+            participant.add(participantVo);
+        }
+        competitionInfo.setParticipant(participant);
+        return competitionInfo;
+    }
+
+
+    /**
+     * 取消赛事报名
+     * @param id
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public ResultUtil cancelMyCompetition(Long id) throws Exception {
+        PaymentCompetition paymentCompetition = this.getById(id);
+        if(paymentCompetition.getPayStatus() == 3){
+            return ResultUtil.error("不能重复取消");
+        }
+        String code = paymentCompetition.getCode();
+        Double amount = paymentCompetition.getAmount();
+        Competition competition = competitionService.getById(paymentCompetition.getCompetitionId());
+        if(System.currentTimeMillis() >= competition.getRegisterEndTime().getTime()){
+            return ResultUtil.error("赛事已结束报名，无法取消");
+        }
+
+        String payOrderNo = paymentCompetition.getPayOrderNo();
+        if(paymentCompetition.getPayType() == 1){//微信支付
+            Map<String, String> map = payMoneyUtil.wxRefund(payOrderNo, code, amount.toString(), amount.toString(), "/base/competition/weChatCancelPaymentCompetitionCallback");
+            String return_code = map.get("return_code");
+            if(!"SUCCESS".equals(return_code)){
+                return ResultUtil.error(map.get("return_msg"));
+            }
+            String refund_id = map.get("refund_id");
+            paymentCompetition.setRefundOrderNo(refund_id);
+            this.updateById(paymentCompetition);
+        }
+        if(paymentCompetition.getPayType() == 2){//支付宝支付
+            Map<String, String> map = payMoneyUtil.aliRefund(payOrderNo, amount.toString());
+            String return_code = map.get("code");
+            if(!"10000".equals(return_code)){
+                return ResultUtil.error(map.get("msg"));
+            }
+            String refund_id = map.get("trade_no");
+            paymentCompetition.setRefundOrderNo(refund_id);
+            paymentCompetition.setRefundTime(new Date());
+            paymentCompetition.setPayStatus(3);
+            this.updateById(paymentCompetition);
+
+            competition.setApplicantsNumber(competition.getApplicantsNumber() - 1);
+            competitionService.updateById(competition);
+        }
+        if(paymentCompetition.getPayType() == 3){//玩湃币支付
+            AppUser appUser = appUserClient.queryAppUser(paymentCompetition.getAppUserId());
+            appUser.setPlayPaiCoins(appUser.getPlayPaiCoins() + amount.intValue());
+            appUserClient.updateAppUser(appUser);
+
+            paymentCompetition.setRefundOrderNo("");
+            paymentCompetition.setRefundTime(new Date());
+            paymentCompetition.setPayStatus(3);
+            this.updateById(paymentCompetition);
+
+            competition.setApplicantsNumber(competition.getApplicantsNumber() - 1);
+            competitionService.updateById(competition);
+        }
+        if(paymentCompetition.getPayType() == 4){//课程支付
+            List<UserCompetition> list = userCompetitionService.list(new QueryWrapper<UserCompetition>().eq("paymentCompetitionId", paymentCompetition.getId()));
+            for (UserCompetition userCompetition : list) {
+                Participant participant = participantService.getById(userCompetition.getId());
+                Student student = studentClient.queryStudentByPhone(participant.getPhone());
+                PaymentDeductionClassHour paymentDeductionClassHour = new PaymentDeductionClassHour();
+                paymentDeductionClassHour.setId(student.getId());
+                paymentDeductionClassHour.setClassHour(competition.getPrice().intValue());
+                paymentDeductionClassHour.setCode(code);
+                coursePackagePaymentClient.rollbackPaymentDeductionClassHour(paymentDeductionClassHour);
+            }
+
+            paymentCompetition.setRefundOrderNo("");
+            paymentCompetition.setRefundTime(new Date());
+            paymentCompetition.setPayStatus(3);
+            this.updateById(paymentCompetition);
+
+            competition.setApplicantsNumber(competition.getApplicantsNumber() - 1);
+            competitionService.updateById(competition);
+        }
+        return ResultUtil.success();
+    }
 }
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/util/MD5AndKL.java b/cloud-server-competition/src/main/java/com/dsh/competition/util/MD5AndKL.java
new file mode 100644
index 0000000..8d1f4ce
--- /dev/null
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/util/MD5AndKL.java
@@ -0,0 +1,112 @@
+package com.dsh.competition.util;
+
+import java.security.MessageDigest;
+
+public class MD5AndKL {
+	
+	/**
+	 * MD5加码。32位
+	 * 
+	 * @param inStr
+	 * @return
+	 */
+	public static String MD5(String inStr) {
+		MessageDigest md5 = null;
+		try {
+			md5 = MessageDigest.getInstance("MD5");
+		} catch (Exception e) {
+			throw new RuntimeException(e.toString());
+		}
+		byte[] md5Bytes = md5.digest(inStr.getBytes());
+		StringBuffer hexValue = new StringBuffer();
+		for (int i = 0; i < md5Bytes.length; i++) {
+			int val = ((int) md5Bytes[i]) & 0xff;
+			if (val < 16) {
+				hexValue.append("0");
+			}
+			hexValue.append(Integer.toHexString(val));
+		}
+		return hexValue.toString();
+	}
+
+	/**
+	 * 可逆的加密算法
+	 * 
+	 * @param inStr
+	 * @return
+	 */
+	public static String KL(String inStr) {
+		char[] a = inStr.toCharArray();
+		for (int i = 0; i < a.length; i++) {
+			a[i] = (char) (a[i] ^ 't');
+		}
+		String s = new String(a);
+		return s;
+	}
+
+	/**
+	 * 加密后解密
+	 * 
+	 * @param inStr
+	 * @return
+	 */
+	public static String JM(String inStr) {
+		char[] a = inStr.toCharArray();
+		for (int i = 0; i < a.length; i++) {
+			a[i] = (char) (a[i] ^ 't');
+		}
+		String k = new String(a);
+		return k;
+	}
+
+
+
+	private static String byteArrayToHexString(byte b[]) {
+		StringBuffer resultSb = new StringBuffer();
+		for (int i = 0; i < b.length; i++)
+			resultSb.append(byteToHexString(b[i]));
+
+		return resultSb.toString();
+	}
+
+	private static String byteToHexString(byte b) {
+		int n = b;
+		if (n < 0)
+			n += 256;
+		int d1 = n / 16;
+		int d2 = n % 16;
+		return hexDigits[d1] + hexDigits[d2];
+	}
+
+	public static String MD5Encode(String origin, String charsetname) {
+		String resultString = null;
+		try {
+			resultString = new String(origin);
+			MessageDigest md = MessageDigest.getInstance("MD5");
+			if (charsetname == null || "".equals(charsetname)){
+				resultString = byteArrayToHexString(md.digest(resultString.getBytes()));
+			}else{
+				resultString = byteArrayToHexString(md.digest(resultString.getBytes(charsetname)));
+			}
+		} catch (Exception exception) {
+			exception.printStackTrace();
+		}
+		return resultString;
+	}
+
+	private static final String hexDigits[] = { "0", "1", "2", "3", "4", "5",
+			"6", "7", "8", "9", "a", "b", "c", "d", "e", "f" };
+
+	public static void main(String args[]) {
+
+		System.out.println("MD5后再加密：" + KL(MD5("123456")));
+		System.out.println(MD5("123456"));
+		// System.out.println("加密：" + KL(MD5("123456")));
+		// s = KL(s);
+		// System.out.println("解密：" + KL("81dc9bdb52d04dc20036dbd8313ed055"));
+		// System.out.println("解密：" + JM(KL(s)));
+		// System.out.println("解密为MD5后的：" + KL(KL(MD5(s))));
+		// System.out.println(JM("5d62957bb57d3e49dcf48a0df064be4c"));
+		// System.out.println(MD5AndKL.KL(MD5AndKL.MD5("admin"+"87654321")));
+	}
+}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/util/PayMoneyUtil.java b/cloud-server-competition/src/main/java/com/dsh/competition/util/PayMoneyUtil.java
new file mode 100644
index 0000000..5a67746
--- /dev/null
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/util/PayMoneyUtil.java
@@ -0,0 +1,1150 @@
+package com.dsh.competition.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.CertAlipayRequest;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.domain.AlipayTradeAppPayModel;
+import com.alipay.api.request.*;
+import com.alipay.api.response.*;
+import com.dsh.competition.util.httpClinet.HttpClientUtil;
+import org.apache.commons.collections.map.HashedMap;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.Element;
+import org.dom4j.io.SAXReader;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.spec.SecretKeySpec;
+import javax.servlet.http.HttpServletRequest;
+import java.io.*;
+import java.math.BigDecimal;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.Security;
+import java.util.*;
+
+/**
+ * 第三方支付工具类
+ */
+@Component
+public class PayMoneyUtil {
+    private String aliAppid = "";//支付宝appid
+
+    private String appPrivateKey = "";//支付宝开发者应用私钥
+
+    private String alipayPublicKey = "";//支付宝应用公钥
+
+    private String alipay_public_key = "";//支付宝支付公钥
+
+    private String appid = "";//微信appid
+
+    private String appletsAppid = "";//微信小程序appid
+
+    private String mchId = "";//微信商户号
+
+    private String key = "";//微信商户号
+
+    private String callbackPath = "";//支付回调网关地址
+
+    private String app_cert_path = "C:/cert/alipay/user/app_cert_path.crt";//应用公钥证书路径
+
+    private String alipay_cert_path = "C:/cert/alipay/user/alipay_cert_path.crt";//支付宝公钥证书文件路径
+
+    private String alipay_root_cert_path = "C:/cert/alipay/user/alipay_root_cert_path.crt";//支付宝CA根证书文件路径
+
+    private String certPath = "C:\\cert\\1523106371_20211206_cert\\apiclient_cert.p12";//微信证书
+
+
+
+    /**
+     * 支付宝支付
+     */
+    public ResultUtil alipay(String body, String subject, String passbackParams, String outTradeNo, String amount, String notifyUrl){
+        //构造client
+        CertAlipayRequest certAlipayRequest = new CertAlipayRequest ();
+        //设置网关地址
+        certAlipayRequest.setServerUrl("https://openapi.alipay.com/gateway.do");
+        //设置应用Id
+        certAlipayRequest.setAppId(aliAppid);
+        //设置应用私钥
+        certAlipayRequest.setPrivateKey(appPrivateKey);
+        //设置请求格式，固定值json
+        certAlipayRequest.setFormat("json");
+        //设置字符集
+        certAlipayRequest.setCharset("UTF-8");
+        //设置签名类型
+        certAlipayRequest.setSignType("RSA2");
+        //设置应用公钥证书路径
+        certAlipayRequest.setCertPath(app_cert_path);
+        //设置支付宝公钥证书路径
+        certAlipayRequest.setAlipayPublicCertPath(alipay_cert_path);
+        //设置支付宝根证书路径
+        certAlipayRequest.setRootCertPath(alipay_root_cert_path);
+        //构造client
+        AlipayClient alipayClient = null;
+        try {
+            alipayClient = new DefaultAlipayClient(certAlipayRequest);
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+        }
+        //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
+        AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest ();
+        //SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
+        AlipayTradeAppPayModel model = new AlipayTradeAppPayModel ();
+        model.setBody(body);
+        model.setSubject (subject);
+        model.setOutTradeNo (outTradeNo);
+        model.setTimeoutExpress ("30m" );
+        model.setTotalAmount (amount);
+        model.setProductCode ( "QUICK_MSECURITY_PAY" );
+        model.setPassbackParams(passbackParams);//自定义参数
+        request.setBizModel ( model );
+        request.setNotifyUrl (callbackPath + notifyUrl);
+        try  {
+            //这里和普通的接口调用不同，使用的是sdkExecute
+            AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request);
+            Map<String, String> map = new HashMap<>();
+            map.put("orderString", response.getBody());
+            System.out.println(map);//就是orderString 可以直接给客户端请求，无需再做处理。
+            return ResultUtil.success(map);
+        }  catch (AlipayApiException e ) {
+            e.printStackTrace();
+        }
+
+
+//        //实例化客户端
+//        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipay_public_key, "RSA2");
+//        //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
+//        AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
+//        //SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
+//        AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
+//        model.setBody(body);//对一笔交易的具体描述信息。如果是多种商品，请将商品描述字符串累加传给body。
+//        model.setSubject(subject);//商品的标题/交易标题/订单标题/订单关键字等。
+//        model.setOutTradeNo(outTradeNo);//商户网站唯一订单号
+//        model.setTimeoutExpress("30m");
+//        model.setTotalAmount(amount);//付款金额
+//        model.setProductCode("QUICK_MSECURITY_PAY");
+//        model.setPassbackParams(passbackParams);//自定义参数
+//        request.setBizModel(model);
+//        request.setNotifyUrl(callbackPath + notifyUrl);
+//        try {
+//            //这里和普通的接口调用不同，使用的是sdkExecute
+//            AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request);
+//            Map<String, String> map = new HashMap<>();
+//            map.put("orderString", response.getBody());
+//            System.out.println(map);//就是orderString 可以直接给客户端请求，无需再做处理。
+//            return ResultUtil.success(map);
+//        } catch (AlipayApiException e) {
+//            e.printStackTrace();
+//        }
+        return null;
+    }
+
+
+    /**
+     * 支付宝扫码支付下单
+     * @param body
+     * @param subject
+     * @param outTradeNo
+     * @param amount
+     * @param notifyUrl
+     * @return
+     */
+    public ResultUtil aliScanCodePay(String body, String subject, String outTradeNo, String amount, String notifyUrl){
+        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipay_public_key, "RSA2"); //获得初始化的AlipayClient
+        AlipayTradePrecreateRequest request = new AlipayTradePrecreateRequest();//创建API对应的request类
+        request.setBizContent("{" +
+                "    \"out_trade_no\":\"" + outTradeNo + "\"," +//商户订单号
+                "    \"total_amount\":\"" + 1 + "\"," +
+                "    \"subject\":\"" + subject + "\"," +
+                "    \"notify_url\":\"" + callbackPath + notifyUrl + "\"," +
+                "    \"body\":\"" + body + "\"," +
+                "    \"store_id\":\"NJ_001\"," +
+                "    \"timeout_express\":\"90m\"}");//订单允许的最晚付款时间
+        AlipayTradePrecreateResponse response = null;
+        try {
+            response = alipayClient.execute(request);
+        } catch (AlipayApiException e) {
+            e.printStackTrace();
+        }
+        JSONObject alipay_trade_precreate_response = JSON.parseObject(response.getBody()).getJSONObject("alipay_trade_precreate_response");
+
+        System.err.print(alipay_trade_precreate_response.getString("qr_code"));
+        return ResultUtil.success(alipay_trade_precreate_response.getString("qr_code"));
+    }
+
+
+    /**
+     * 支付成功后的回调处理逻辑
+     * @param request
+     */
+    public Map<String, String> alipayCallback(HttpServletRequest request){
+        //获取支付宝POST过来反馈信息
+        Map<String,String> params = new HashMap<String,String>();
+        Map requestParams = request.getParameterMap();
+        for (Iterator iter = requestParams.keySet().iterator(); iter.hasNext();) {
+            String name = (String) iter.next();
+            String[] values = (String[]) requestParams.get(name);
+            String valueStr = "";
+            for (int i = 0; i < values.length; i++) {
+                valueStr = (i == values.length - 1) ? valueStr + values[i]
+                        : valueStr + values[i] + "_";
+            }
+            //乱码解决，这段代码在出现乱码时使用。
+            //valueStr = new String(valueStr.getBytes("ISO-8859-1"), "utf-8");
+            params.put(name, valueStr);
+        }
+        //切记alipaypublickey是支付宝的公钥，请去open.alipay.com对应应用下查看。
+        //boolean AlipaySignature.rsaCheckV1(Map<String, String> params, String publicKey, String charset, String sign_type)
+//        try {
+//            boolean flag = AlipaySignature.rsaCheckV1(params, alipay_public_key, "UTF-8","RSA2");
+//            if(flag){
+//                Map<String, String> map = new HashMap<>();
+//                String out_trade_no = params.get("out_trade_no");
+//                String subject = params.get("subject");
+//                String total_amount = params.get("total_amount");
+//                String trade_no = params.get("trade_no");
+//                String passback_params = params.get("passback_params");
+//                map.put("out_trade_no", out_trade_no);//商家订单号
+//                map.put("subject", subject);
+//                map.put("total_amount", total_amount);
+//                map.put("trade_no", trade_no);//支付宝交易号
+//                map.put("passback_params", passback_params);//回传参数
+//                return map;
+//            }else{
+//                System.err.println("验签失败");
+//            }
+//
+//        } catch (AlipayApiException e) {
+//            e.printStackTrace();
+//        }
+//        return null;
+
+
+        Map<String, String> map = new HashMap<>();
+        String out_trade_no = params.get("out_trade_no");
+        String subject = params.get("subject");
+        String total_amount = params.get("total_amount");
+        String trade_no = params.get("trade_no");
+        String passback_params = params.get("passback_params");
+        map.put("out_trade_no", out_trade_no);//商家订单号
+        map.put("subject", subject);
+        map.put("total_amount", total_amount);
+        map.put("trade_no", trade_no);//支付宝交易号
+        map.put("passback_params", passback_params);//回传参数
+        return map;
+    }
+
+
+    /**
+     * 支付宝查询订单支付状态
+     * @param out_trade_no
+     * @return
+     * @throws Exception
+     */
+    public ResultUtil 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());
+        }
+    }
+
+
+
+    /**
+     * 微信统一下单
+     * @param body          商品描述
+     * @param attach        附加数据
+     * @param out_trade_no  商户订单号
+     * @param total_fee     标价金额
+     * @param notify_url    通知地址
+     * @param tradeType     交易类型
+     * @return
+     */
+    public ResultUtil weixinpay(String body, String attach, String out_trade_no, String total_fee, String notify_url, String tradeType, String openId) throws Exception{
+        int i = new BigDecimal(total_fee).multiply(new BigDecimal("100")).intValue();
+        String hostAddress = null;
+        try {
+            hostAddress = InetAddress.getLocalHost().getHostAddress();
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        }
+        String nonce_str = UUIDUtil.getRandomCode(16);
+        Map<String, Object> map = new HashMap<>();
+        map.put("appid", "APP".equals(tradeType) ? appid : appletsAppid);
+        map.put("mch_id", mchId);
+        map.put("nonce_str", nonce_str);
+        map.put("body", body);
+        map.put("attach", attach);//存储订单id
+        map.put("out_trade_no", out_trade_no);//存储的订单code
+        map.put("total_fee", i);
+        map.put("spbill_create_ip", hostAddress);
+        map.put("notify_url", callbackPath + notify_url);
+        map.put("trade_type", tradeType);
+        if("JSAPI".equals(tradeType)){
+            map.put("openid", openId);
+        }
+        String s = this.weixinSignature(map);
+        map.put("sign", s);
+
+        String url = "https://api.mch.weixin.qq.com/pay/unifiedorder";
+        //设置请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_XML);
+        StringBuffer xmlString = new StringBuffer();
+        Set<String> strings = map.keySet();
+        String[] keys = {};
+        keys = strings.toArray(keys);
+        Arrays.sort(keys);
+        xmlString.append("<xml>");
+        for(int l = 0; l < keys.length; l++){
+            xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">");
+        }
+        xmlString.append("</xml>");
+
+        Map<String, String> map1 = null;
+        String body1 = HttpClientUtil.pushHttpRequsetXml(url, xmlString.toString(), new HashMap<>()).getData();
+        //将结果xml解析成map
+        body1 = body1.replaceAll("<!\\[CDATA\\[","");
+        body1 = body1.replaceAll("]]>", "");
+        try {
+            map1 = this.xmlToMap(body1, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        } catch (DocumentException e) {
+            e.printStackTrace();
+        }
+        String return_code = map1.get("return_code");
+        if("SUCCESS".equals(return_code)){
+            String result_code = map1.get("result_code");
+            if("SUCCESS".equals(result_code)){
+                String type = map1.get("trade_type");
+                String prepay_id = map1.get("prepay_id");
+                switch (type){
+                    case "JSAPI":
+                        //重新进行签名后返回给前端
+                        Map<String, Object> map2 = new HashMap<>();
+                        map2.put("appId", map1.get("appid"));
+                        map2.put("nonceStr", map1.get("nonce_str"));
+                        map2.put("package", "prepay_id=" + prepay_id);
+                        map2.put("signType", "MD5");
+                        map2.put("timeStamp", new Date().getTime() + "");
+                        String s2 = this.weixinSignature(map2);
+
+                        map2.put("prepay_id", prepay_id);
+                        map2.put("mch_id", map1.get("mch_id"));
+                        map2.put("trade_type", map1.get("trade_type"));
+
+                        map2.put("sign", s2);
+                        return ResultUtil.success(map2);
+                    case "NATIVE":
+                        String code_url = map1.get("code_url");
+                        return ResultUtil.success(code_url);
+                    case "APP":
+                        //重新进行签名后返回给前端
+                        Map<String, Object> map3 = new HashMap<>();
+                        map3.put("appid", appid);
+                        map3.put("noncestr", nonce_str);
+                        map3.put("package", "Sign=WXPay");
+                        map3.put("partnerid", mchId);
+                        map3.put("prepayid", prepay_id);
+                        map3.put("timestamp", new Date().getTime() / 1000);
+                        String s1 = this.weixinSignature(map3);
+                        map3.put("sign", s1);
+                        System.err.println(map3);
+                        return ResultUtil.success(map3);
+                }
+                return null;
+            }else{
+                System.err.println(map1.get("err_code_des"));
+                return ResultUtil.error(map1.get("err_code_des"));
+            }
+        }else{
+            System.err.println(map1.get("return_msg") + appid + "----" + mchId);
+            return ResultUtil.error(map1.get("return_msg"), new JSONObject());
+        }
+    }
+
+
+
+
+
+    /**
+     * 微信支付成功后的回调处理
+     * @param request
+     */
+    public Map<String, String> weixinpayCallback(HttpServletRequest request){
+        try {
+            String param = this.getParam(request);
+            param = param.replaceAll("<!\\[CDATA\\[","");
+            param = param.replaceAll("]]>", "");
+            Map<String, String> map = this.xmlToMap(param, "UTF-8");
+            String return_code = map.get("return_code");
+            if("SUCCESS".equals(return_code)){
+                String result_code = map.get("result_code");
+                if("SUCCESS".equals(result_code)){
+                    Map<String, String> map1 = new HashedMap();
+                    map1.put("nonce_str", map.get("nonce_str"));
+                    map1.put("out_trade_no", map.get("out_trade_no"));//存储的订单code
+                    map1.put("attach", map.get("attach"));//存储订单id
+                    map1.put("total_fee", map.get("total_fee"));
+                    map1.put("transaction_id", map.get("transaction_id"));//微信支付订单号
+                    String result = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
+                    map1.put("result", result);
+                    return map1;
+                }else{
+                    System.err.println(map.get("err_code_des"));
+                }
+            }else{
+                System.err.println(map.get("return_msg"));
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (DocumentException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    /**
+     * 微信扫码收款
+     * @param body              商品描述
+     * @param attach            附加数据
+     * @param nonce_str         随机字符串
+     * @param out_trade_no      商户订单号
+     * @param total_fee         订单金额
+     * @param auth_code         授权码	扫码支付授权码，设备读取用户微信中的条码或者二维码信息（注：用户付款码条形码规则：18位纯数字，以10、11、12、13、14、15开头）
+     * @return
+     */
+    public ResultUtil wxScanQRCodePay(String body, String attach, String nonce_str, String out_trade_no, String total_fee, String auth_code){
+        int i = new BigDecimal(total_fee).multiply(new BigDecimal("100")).intValue();
+        String hostAddress = null;
+        try {
+            InetAddress address = InetAddress.getLocalHost();
+            hostAddress = address.getHostAddress();
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        }
+        String randomCode = null;
+        try {
+            randomCode = UUIDUtil.getRandomCode(10);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("appid", appid);
+        map.put("mch_id", mchId);
+        map.put("nonce_str", nonce_str);//存储的支付人员id，员工扫描二维码支付的时候存储的是收款员工id
+        map.put("body", body);
+        map.put("attach", attach);//存储的费用月份数据，员工扫描二维码支付的时候存储的是收费项id
+        map.put("out_trade_no", randomCode + "_" + out_trade_no);//存储的房间id
+        map.put("total_fee", i);
+        map.put("spbill_create_ip", hostAddress);
+        map.put("auth_code", auth_code);
+        String s = this.weixinSignature(map);
+        map.put("sign", s);
+
+        String url = "https://api.mch.weixin.qq.com/pay/unifiedorder";
+        //设置请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_XML);
+        StringBuffer xmlString = new StringBuffer();
+        Set<String> strings = map.keySet();
+        String[] keys = {};
+        keys = strings.toArray(keys);
+        Arrays.sort(keys);
+        xmlString.append("<xml>");
+        for(int l = 0; l < keys.length; l++){
+            xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">");
+        }
+        xmlString.append("</xml>");
+
+        Map<String, String> map1 = null;
+        String body1 = null;
+        try {
+            body1 = HttpClientUtil.pushHttpRequsetXml(url, xmlString.toString(), new HashMap<>()).getData();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        //将结果xml解析成map
+        body1 = body1.replaceAll("<!\\[CDATA\\[","");
+        body1 = body1.replaceAll("]]>", "");
+        try {
+            map1 = this.xmlToMap(body1, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        } catch (DocumentException e) {
+            e.printStackTrace();
+        }
+        String return_code = map1.get("return_code");
+        if("SUCCESS".equals(return_code)){
+            String result_code = map1.get("result_code");
+            if("SUCCESS".equals(result_code)){
+                String type = map1.get("trade_type");
+                switch (type){
+                    case "JSAPI":
+                        break;
+                    case "NATIVE":
+                        String code_url = map1.get("code_url");
+                        return ResultUtil.success(code_url);
+                    case "APP":
+                        String prepay_id = map1.get("prepay_id");
+                        //重新进行签名后返回给前端
+                        Map<String, Object> map2 = new HashMap<>();
+                        map2.put("appid", appid);
+                        map2.put("noncestr", nonce_str);
+                        map2.put("package", "Sign=WXPay");
+                        map2.put("partnerid", mchId);
+                        map2.put("prepayid", prepay_id);
+                        map2.put("timestamp", new Date().getTime() + "");
+                        String s1 = this.weixinSignature(map2);
+
+                        map2.put("pac", "Sign=WXPay");
+                        map2.put("sign", s1);
+//                      System.err.println(map2);
+                        return ResultUtil.success(map2);
+                }
+                return null;
+            }else{
+//                System.err.println(map1.get("err_code_des"));
+                return ResultUtil.error(map1.get("err_code_des"));
+            }
+        }else{
+//            System.err.println(map1.get("return_msg") + appid + "----" + mchId);
+            return ResultUtil.error(map1.get("return_msg"), new JSONObject());
+        }
+    }
+
+
+    /**
+     * 支付宝扫码收款
+     * @param data
+     * @return
+     */
+    public Object aliScanQRCodePay(String data){
+        return null;
+    }
+
+
+    /**
+     * 微信退款申请
+     * @param transaction_id    微信订单号。微信生成的订单号，在支付通知中有返回
+     * @param out_refund_no     商户退款单号。商户系统内部的退款单号，商户系统内部唯一，只能是数字、大小写字母_-|*@ ，同一退款单号多次请求只退一笔。
+     * @param total_fee         订单金额。订单总金额，单位为分，只能为整数
+     * @param refund_fee        退款金额。退款总金额，订单总金额，单位为分，只能为整数
+     * @param notify_url        退款结果通知url。异步接收微信支付退款结果通知的回调地址，通知URL必须为外网可访问的url，不允许带参数 如果参数中传了notify_url，则商户平台上配置的回调地址将不会生效。
+     * @return
+     */
+    public Map<String, String> wxRefund(String transaction_id, String out_refund_no, String total_fee, String refund_fee, String notify_url){
+        int tf = new BigDecimal(total_fee).multiply(new BigDecimal("100")).intValue();
+        int rf = new BigDecimal(refund_fee).multiply(new BigDecimal("100")).intValue();
+        String nonce_str = UUIDUtil.getRandomCode();
+        Map<String, Object> map = new HashMap<>();
+        map.put("appid", appid);
+        map.put("mch_id", mchId);
+        map.put("nonce_str", nonce_str);
+        map.put("transaction_id", transaction_id);
+        map.put("out_refund_no", out_refund_no);
+        map.put("total_fee", tf);
+        map.put("refund_fee", rf);
+        map.put("notify_url", callbackPath + notify_url);
+        String s = this.weixinSignature(map, key);
+        map.put("sign", s);
+
+        String url = "https://api.mch.weixin.qq.com/secapi/pay/refund";
+        //设置请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_XML);
+        StringBuffer xmlString = new StringBuffer();
+        Set<String> strings = map.keySet();
+        String[] keys = {};
+        keys = strings.toArray(keys);
+        Arrays.sort(keys);
+        xmlString.append("<xml>");
+        for(int l = 0; l < keys.length; l++){
+            xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">");
+        }
+        xmlString.append("</xml>");
+
+        Map<String, String> map1 = null;
+        String body1 = null;
+        try {
+            body1 = HttpClientUtil.pushHttpsRequsetXml(url, xmlString.toString(), new HashMap<>(), mchId, certPath, "PKCS12");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        System.err.println(body1);
+        //将结果xml解析成map
+        body1 = body1.replaceAll("<!\\[CDATA\\[","");
+        body1 = body1.replaceAll("]]>", "");
+        try {
+            map1 = this.xmlToMap(body1, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        } catch (DocumentException e) {
+            e.printStackTrace();
+        }
+        String return_code = map1.get("return_code");
+        Map<String, String> map2 = new HashMap<>();
+        if("SUCCESS".equals(return_code)){
+            String result_code = map1.get("result_code");
+            if("SUCCESS".equals(result_code)){
+                map2.put("return_code", result_code);
+                map2.put("refund_id", String.valueOf(map1.get("refund_id")));//微信退款订单号
+                map2.put("refund_fee", String.valueOf(map1.get("refund_fee")));//退款金额
+                return map2;
+            }else{
+                map2.put("return_code", result_code);
+                map2.put("return_msg", map1.get("err_code_des"));
+                return map2;
+            }
+        }else{
+            map2.put("return_code", return_code);
+            map2.put("return_msg", map1.get("return_msg"));
+            return map2;
+        }
+    }
+
+
+    /**
+     * 微信退款成功后的回调处理
+     * @param request
+     * @return
+     */
+    public Map<String, String> wxRefundCallback(HttpServletRequest request){
+        try {
+            String param = this.getParam(request);
+            param = param.replaceAll("<!\\[CDATA\\[","");
+            param = param.replaceAll("]]>", "");
+            Map<String, String> map = this.xmlToMap(param, "UTF-8");
+            String return_code = map.get("return_code");
+            if("SUCCESS".equals(return_code)){
+                String req_info = map.get("req_info");//加密信息请用商户秘钥进行解密
+                String s = this.wxDecrypt(req_info);
+                s = s.replaceAll("<!\\[CDATA\\[","");
+                s = s.replaceAll("]]>", "");
+                map = this.xmlToMap(s, "UTF-8");
+                Map<String, String> map1 = new HashMap<>();
+                map1.put("refund_id", map.get("refund_id"));
+                map1.put("out_refund_no", map.get("out_refund_no"));
+                String result = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
+                map1.put("result", result);
+                return map1;
+            }else{
+//                System.err.println(map.get("return_msg"));
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (DocumentException e) {
+            e.printStackTrace();
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        } catch (InvalidKeyException e) {
+            e.printStackTrace();
+        } catch (NoSuchPaddingException e) {
+            e.printStackTrace();
+        } catch (BadPaddingException e) {
+            e.printStackTrace();
+        } catch (NoSuchProviderException e) {
+            e.printStackTrace();
+        } catch (IllegalBlockSizeException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    /**
+     * 支付宝退款
+     * @param trade_no          支付宝交易号
+     * @param refund_amount     退款金额
+     * @return
+     * @throws AlipayApiException
+     */
+    public Map<String, String> aliRefund(String trade_no, String refund_amount) throws AlipayApiException {
+        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey,"json","UTF-8", alipay_public_key,"RSA2");
+        AlipayTradeRefundRequest request = new AlipayTradeRefundRequest();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("trade_no", trade_no);
+        jsonObject.put("refund_amount", refund_amount);
+        request.setBizContent(jsonObject.toJSONString());
+        AlipayTradeRefundResponse response = alipayClient.execute(request);
+        Map<String, String> map = new HashMap<>();
+        if(response.isSuccess()){
+            System.out.println("调用成功");
+            String outTradeNo = response.getOutTradeNo();
+            map.put("code", response.getCode());//10000
+            map.put("trade_no", response.getTradeNo());//支付宝交易号
+            map.put("out_trade_no", outTradeNo);//商户订单号
+        } else {
+            System.out.println("调用失败");
+            map.put("code", response.getCode());
+            map.put("msg", response.getSubMsg());
+        }
+        return map;
+    }
+
+
+    /**
+     * 查询微信支付订单
+     * @return
+     * @throws Exception
+     */
+    public ResultUtil<Map<String, String>> queryWXOrder(String out_trade_no, String transaction_id) throws Exception{
+        String url = "https://api.mch.weixin.qq.com/pay/orderquery";
+        String nonce_str = UUIDUtil.getRandomCode(16);
+        Map<String, Object> map = new HashMap<>();
+        map.put("appid", appid);
+        map.put("mch_id", mchId);
+        map.put("out_trade_no", out_trade_no);//商户订单号
+        map.put("transaction_id", transaction_id);//微信订单号
+        map.put("nonce_str", nonce_str);//随机字符串
+        String s = this.weixinSignature(map);
+        map.put("sign", s);
+
+        //设置请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_XML);
+        StringBuffer xmlString = new StringBuffer();
+        Set<String> strings = map.keySet();
+        String[] keys = {};
+        keys = strings.toArray(keys);
+        Arrays.sort(keys);
+        xmlString.append("<xml>");
+        for(int l = 0; l < keys.length; l++){
+            xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">");
+        }
+        xmlString.append("</xml>");
+
+        Map<String, String> map1 = null;
+        String body1 = HttpClientUtil.pushHttpRequsetXml(url, xmlString.toString(), new HashMap<>()).getData();
+        //将结果xml解析成map
+        body1 = body1.replaceAll("<!\\[CDATA\\[","");
+        body1 = body1.replaceAll("]]>", "");
+        try {
+            map1 = this.xmlToMap(body1, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        } catch (DocumentException e) {
+            e.printStackTrace();
+        }
+        String return_code = map1.get("return_code");
+        if("SUCCESS".equals(return_code)){
+            String result_code = map1.get("result_code");
+            if("SUCCESS".equals(result_code)){
+                Map<String, String> map2 = new HashMap<>();
+                map2.put("trade_type", map1.get("trade_type"));
+                map2.put("trade_state", map1.get("trade_state"));//订单状态SUCCESS—支付成功，REFUND—转入退款，NOTPAY—未支付，CLOSED—已关闭，REVOKED—已撤销（刷卡支付），USERPAYING--用户支付中，PAYERROR--支付失败(其他原因，如银行返回失败)
+                map2.put("transaction_id", map1.get("transaction_id"));
+                return ResultUtil.success(map2);
+            }else{
+                System.err.println(map1.get("err_code_des"));
+                return ResultUtil.error(map1.get("err_code_des"));
+            }
+        }else{
+            System.err.println(map1.get("return_msg") + appid + "----" + mchId);
+            return ResultUtil.error(map1.get("return_msg"));
+        }
+    }
+
+
+
+    /**
+     * 微信转账功能（企业付款到零钱）
+     * @param openid                商户appid下，某用户的openid
+     * @param desc                  企业付款备注，必填。
+     * @param total_fee             企业付款金额
+     * @param partner_trade_no      商户订单号，需保持唯一性
+     * @return
+     */
+    public Map<String, String> wxTransfers(String openid, String desc, String total_fee, String partner_trade_no) throws Exception{
+        int amount = new BigDecimal(total_fee).multiply(new BigDecimal("100")).intValue();
+        String nonce_str = UUIDUtil.getRandomCode();
+        Map<String, Object> map = new HashMap<>();
+        map.put("mch_appid", appid);//申请商户号的appid或商户号绑定的appid
+        map.put("mchid", mchId);//微信支付分配的商户号
+        map.put("nonce_str", nonce_str);//随机字符串，不长于32位
+        map.put("partner_trade_no", partner_trade_no);//商户订单号，需保持唯一性
+        map.put("openid", openid);//商户appid下，某用户的openid
+        map.put("check_name", "NO_CHECK");//NO_CHECK：不校验真实姓名 FORCE_CHECK：强校验真实姓名
+        map.put("amount", amount);//企业付款金额，单位为分
+        map.put("desc", desc);//企业付款备注，必填。
+        String s = this.weixinSignature(map, key);
+        map.put("sign", s);
+
+        String url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers";
+        //设置请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_XML);
+        StringBuffer xmlString = new StringBuffer();
+        Set<String> strings = map.keySet();
+        String[] keys = {};
+        keys = strings.toArray(keys);
+        Arrays.sort(keys);
+        xmlString.append("<xml>");
+        for(int l = 0; l < keys.length; l++){
+            xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">");
+        }
+        xmlString.append("</xml>");
+
+        Map<String, String> map1 = null;
+        String body1 = HttpClientUtil.pushHttpsRequsetXml(url, xmlString.toString(), new HashMap<>(), mchId, certPath, "PKCS12");
+        //将结果xml解析成map
+        body1 = body1.replaceAll("<!\\[CDATA\\[","");
+        body1 = body1.replaceAll("]]>", "");
+        try {
+            map1 = this.xmlToMap(body1, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        } catch (DocumentException e) {
+            e.printStackTrace();
+        }
+        String return_code = map1.get("return_code");
+        Map<String, String> map2 = new HashMap<>();
+        if("SUCCESS".equals(return_code)){
+            String result_code = map1.get("result_code");
+            if("SUCCESS".equals(result_code)){
+                map2.put("return_code", result_code);
+                map2.put("payment_no", String.valueOf(map1.get("payment_no")));//付款订单号
+                map2.put("payment_time", String.valueOf(map1.get("payment_time")));//付款时间
+                return map2;
+            }else{
+                map2.put("return_code", result_code);
+                map2.put("err_code", map1.get("err_code"));
+                map2.put("err_code_des", map1.get("err_code_des"));
+                return map2;
+            }
+        }else{
+            map2.put("return_code", return_code);
+            map2.put("return_msg", map1.get("return_msg"));
+            return map2;
+        }
+    }
+
+
+    /**
+     * 微信转账功能（企业付款到银行卡）
+     * @param desc              备注信息
+     * @param total_fee         转账金额
+     * @param partner_trade_no  订单号
+     * @param enc_bank_no       银行卡号
+     * @param enc_true_name     收款方用户名
+     * @param bankName          银行名称
+     * @return
+     * @throws Exception
+     */
+    public Map<String, String> wxPayBank(String desc, String total_fee, String partner_trade_no, String enc_bank_no, String enc_true_name, String bankName) throws Exception{
+        int amount = new BigDecimal(total_fee).multiply(new BigDecimal("100")).intValue();
+        String nonce_str = UUIDUtil.getRandomCode();
+        Map<String, Object> map = new HashMap<>();
+        map.put("mch_id", mchId);//微信支付分配的商户号
+        map.put("nonce_str", nonce_str);//随机字符串，不长于32位
+        map.put("partner_trade_no", partner_trade_no);//商户订单号，需保持唯一性
+        map.put("enc_bank_no", enc_bank_no);//收款方银行卡号（采用标准RSA算法，公钥由微信侧提供）
+        map.put("enc_true_name", enc_true_name);//收款方用户名（采用标准RSA算法，公钥由微信侧提供）
+        map.put("bank_code", findBankCode(bankName));//
+        map.put("amount", amount);//企业付款金额，单位为分
+        map.put("desc", desc);//企业付款备注，必填。
+        String s = this.weixinSignature(map, key);
+        map.put("sign", s);
+
+        String url = "https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank";
+        //设置请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_XML);
+        StringBuffer xmlString = new StringBuffer();
+        Set<String> strings = map.keySet();
+        String[] keys = {};
+        keys = strings.toArray(keys);
+        Arrays.sort(keys);
+        xmlString.append("<xml>");
+        for(int l = 0; l < keys.length; l++){
+            xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">");
+        }
+        xmlString.append("</xml>");
+
+        Map<String, String> map1 = null;
+        String body1 = HttpClientUtil.pushHttpsRequsetXml(url, xmlString.toString(), new HashMap<>(), mchId, certPath, "PKCS12");
+        //将结果xml解析成map
+        body1 = body1.replaceAll("<!\\[CDATA\\[","");
+        body1 = body1.replaceAll("]]>", "");
+        try {
+            map1 = this.xmlToMap(body1, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        } catch (DocumentException e) {
+            e.printStackTrace();
+        }
+        String return_code = map1.get("return_code");
+        Map<String, String> map2 = new HashMap<>();
+        if("SUCCESS".equals(return_code)){
+            String result_code = map1.get("result_code");
+            if("SUCCESS".equals(result_code)){
+                map2.put("return_code", result_code);
+                map2.put("payment_no", String.valueOf(map1.get("payment_no")));//付款订单号
+                map2.put("cmms_amt", String.valueOf(map1.get("cmms_amt")));//手续费金额 RMB：分
+                return map2;
+            }else{
+                map2.put("return_code", result_code);
+                map2.put("err_code", map1.get("err_code"));
+                map2.put("err_code_des", map1.get("err_code_des"));
+                return map2;
+            }
+        }else{
+            map2.put("return_code", return_code);
+            map2.put("return_msg", map1.get("return_msg"));
+            return map2;
+        }
+    }
+
+    /**
+     * 微信转账到银行卡不编号
+     * @param bankName
+     * @return
+     */
+    public String findBankCode(String bankName){
+        String json = "{\"工商银行 \":1002,\"农业银行\":1005,\"建设银行\":1003,\"中国银行\":1026,\"交通银行 \":1020,\"招商银行 \":1001,\"邮储银行\":1066,\"民生银行 \":1006,\"平安银行 \":1010,\"中信银行\":1021,\"浦发银行 \":1004,\"兴业银行 \":1009,\"光大银行 \":1022,\"广发银行\":1027,\"华夏银行\":1025,\"宁波银行\":1056,\"北京银行\":4836,\"上海银行\":1024,\"南京银行\":1054,\"长子县融汇村镇银行\":4755,\"长沙银行\":4216,\"浙江泰隆商业银行\":4051,\"中原银行 \":4753,\"企业银行（中国）\":4761,\"顺德农商银行 \":4036,\"衡水银行\":4752,\"长治银行\":4756,\"大同银行\":4767,\"河南省农村信用社\":4115,\"宁夏黄河农村商业银行\":4150,\"山西省农村信用社\":4156,\"安徽省农村信用社\":4166,\"甘肃省农村信用社\":4157,\"天津农村商业银行\":4153,\"广西壮族自治区农村信用社\":4113,\"陕西省农村信用社\":4108,\"深圳农村商业银行\":4076,\"宁波鄞州农村商业银行\":4052,\"浙江省农村信用社联合社\":4764,\"江苏省农村信用社联合社\":4217,\"江苏紫金农村商业银行股份有限公司 \":4072,\"北京中关村银行股份有限公司 \":4769,\"星展银行（ 中国） 有限公司 \":4778,\"枣庄银行股份有限公司 \":4766,\"海口联合农村商业银行股份有限公司 \":4758,\"南洋商业银行（ 中国） 有限公司 \":4763}";
+        JSONObject jsonObject = JSON.parseObject(json);
+        Set<String> strings = jsonObject.keySet();
+        for(String key : strings){
+            if(key.indexOf(bankName) >= 0){
+                return jsonObject.getString(key);
+            }
+        }
+        return "";
+    }
+
+
+
+    /**
+     * 支付宝转账
+     * @param out_biz_no        商家侧唯一订单号，由商家自定义。对于不同转账请求，商家需保证该订单号在自身系统唯一。
+     * @param trans_amount      订单总金额，单位为元，精确到小数点后两位
+     * @param order_title       转账业务的标题，用于在支付宝用户的账单里显示
+     * @param identity          参与方的唯一标识（收款方支付宝账号）
+     * @param name              参与方真实姓名，如果非空，将校验收款支付宝账号姓名一致性。
+     * @param remark            业务备注
+     * @return
+     * @throws Exception
+     */
+    public Map<String, Object> aliTransfer(String out_biz_no, Double trans_amount, String order_title, String identity, String name, String remark) throws Exception{
+        CertAlipayRequest certAlipayRequest = new CertAlipayRequest();
+        certAlipayRequest.setServerUrl("https://openapi.alipay.com/gateway.do");  //gateway:支付宝网关（固定）https://openapi.alipay.com/gateway.do
+        certAlipayRequest.setAppId(aliAppid);  //APPID 即创建应用后生成,详情见创建应用并获取 APPID
+        certAlipayRequest.setPrivateKey(appPrivateKey);  //开发者应用私钥，由开发者自己生成
+        certAlipayRequest.setFormat("json");  //参数返回格式，只支持 json 格式
+        certAlipayRequest.setCharset("UTF-8");  //请求和签名使用的字符编码格式，支持 GBK和 UTF-8
+        certAlipayRequest.setSignType("RSA2");  //商户生成签名字符串所使用的签名算法类型，目前支持 RSA2 和 RSA，推荐商家使用 RSA2。
+        certAlipayRequest.setCertPath(app_cert_path); //应用公钥证书路径（app_cert_path 文件绝对路径）
+        certAlipayRequest.setAlipayPublicCertPath(alipay_cert_path); //支付宝公钥证书文件路径（alipay_cert_path 文件绝对路径）
+        certAlipayRequest.setRootCertPath(alipay_root_cert_path);  //支付宝CA根证书文件路径（alipay_root_cert_path 文件绝对路径）
+        AlipayClient alipayClient = new DefaultAlipayClient(certAlipayRequest);
+        AlipayFundTransUniTransferRequest request = new AlipayFundTransUniTransferRequest();
+        request.setBizContent("{" +
+                "\"out_biz_no\":\"" + out_biz_no + "\"," +
+                "\"trans_amount\":" + trans_amount + "," +
+                "\"product_code\":\"TRANS_ACCOUNT_NO_PWD\"," +
+                "\"biz_scene\":\"DIRECT_TRANSFER\"," +
+                "\"order_title\":\"" + order_title + "\"," +
+                "\"payee_info\":{" +
+                "\"identity\":\"" + identity + "\"," +
+                "\"identity_type\":\"ALIPAY_USER_ID\"," +
+                "\"name\":\"" + name + "\"," +
+                "}," +
+                "\"remark\":\"" + remark + "\"" +
+                "}");
+        AlipayFundTransUniTransferResponse response = alipayClient.certificateExecute(request);
+        Map<String, Object> map = new HashMap<>();
+        if(response.isSuccess()){
+            String status = response.getStatus();
+            if(status.equals("SUCCESS")){//成功
+                map.put("code", response.getCode());
+                map.put("order_id", response.getOrderId());//支付宝订单号
+                map.put("pay_fund_order_id", response.getPayFundOrderId());//支付宝流水号
+            }else{
+                map.put("code", response.getCode());
+                map.put("sub_msg", response.getSubMsg());
+            }
+        } else {
+            map.put("code", response.getSubCode());
+            map.put("sub_msg", response.getSubMsg());
+        }
+        return map;
+    }
+
+
+    /**
+     * 获取请求内容
+     * @param request
+     * @return
+     * @throws IOException
+     */
+    private String getParam(HttpServletRequest request) throws IOException {
+        // 读取参数
+        InputStream inputStream;
+        StringBuilder sb = new StringBuilder();
+        inputStream = request.getInputStream();
+        String s;
+        BufferedReader in = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+        while ((s = in.readLine()) != null) {
+            sb.append(s);
+        }
+        in.close();
+        inputStream.close();
+        return sb.toString();
+    }
+
+
+    /**
+     * 微信下单的签名算法
+     * @param map
+     * @return
+     */
+    private String weixinSignature(Map<String, Object> map){
+        try {
+            Set<Map.Entry<String, Object>> entries = map.entrySet();
+            List<Map.Entry<String, Object>> infoIds = new ArrayList<Map.Entry<String, Object>>(entries);
+            // 对所有传入参数按照字段名的 ASCII 码从小到大排序（字典序）
+            Collections.sort(infoIds, new Comparator<Map.Entry<String, Object>>() {
+                public int compare(Map.Entry<String, Object> o1, Map.Entry<String, Object> o2) {
+                    return (o1.getKey()).toString().compareTo(o2.getKey());
+                }
+            });
+            // 构造签名键值对的格式
+            StringBuilder sb = new StringBuilder();
+            for (Map.Entry<String, Object> item : infoIds) {
+                if (item.getKey() != null || item.getKey() != "") {
+                    String key = item.getKey();
+                    Object val = item.getValue();
+                    if (!(val == "" || val == null)) {
+                        sb.append(key + "=" + val + "&");
+                    }
+                }
+            }
+            sb.append("key=" + key);
+            String sign = MD5AndKL.MD5Encode(sb.toString(), "UTF-8").toUpperCase(); //注：MD5签名方式
+            return sign;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    /**
+     * 微信下单的签名算法
+     * @param map
+     * @return
+     */
+    private String weixinSignature(Map<String, Object> map, String key_){
+        try {
+            Set<Map.Entry<String, Object>> entries = map.entrySet();
+            List<Map.Entry<String, Object>> infoIds = new ArrayList<Map.Entry<String, Object>>(entries);
+            // 对所有传入参数按照字段名的 ASCII 码从小到大排序（字典序）
+            Collections.sort(infoIds, new Comparator<Map.Entry<String, Object>>() {
+                public int compare(Map.Entry<String, Object> o1, Map.Entry<String, Object> o2) {
+                    return (o1.getKey()).toString().compareTo(o2.getKey());
+                }
+            });
+            // 构造签名键值对的格式
+            StringBuilder sb = new StringBuilder();
+            for (Map.Entry<String, Object> item : infoIds) {
+                if (item.getKey() != null || item.getKey() != "") {
+                    String key = item.getKey();
+                    Object val = item.getValue();
+                    if (!(val == "" || val == null)) {
+                        sb.append(key + "=" + val + "&");
+                    }
+                }
+            }
+            sb.append("key=" + key_);
+            String sign = MD5AndKL.MD5Encode(sb.toString(), "UTF-8").toUpperCase(); //注：MD5签名方式
+            return sign;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    /**
+     * 微信退款成功后的解密
+     * @param req_info
+     * @return
+     */
+    private String wxDecrypt(String req_info) throws NoSuchPaddingException, NoSuchAlgorithmException, NoSuchProviderException,
+            InvalidKeyException, BadPaddingException, IllegalBlockSizeException {
+        byte[] decode = Base64.getDecoder().decode(req_info);
+        String sign = MD5AndKL.MD5Encode(key, "UTF-8").toLowerCase();
+        if (Security.getProvider("BC") == null){
+            Security.addProvider(new BouncyCastleProvider());
+        }
+        Cipher cipher = Cipher.getInstance("AES/ECB/PKCS7Padding", "BC");
+        SecretKeySpec secretKeySpec = new SecretKeySpec(sign.getBytes(), "AES");
+        cipher.init(Cipher.DECRYPT_MODE, secretKeySpec);
+        return new String(cipher.doFinal(decode));
+    }
+
+
+    public static void main(String[] ages){
+//        PayMoneyUtil payMoneyUtil = new PayMoneyUtil();
+//        payMoneyUtil.weixinpay("测试", "123", "12.5", "");
+    }
+
+
+    /**
+     * xml转map
+     * @param xml
+     * @param charset
+     * @return
+     * @throws UnsupportedEncodingException
+     * @throws DocumentException
+     */
+    public static Map<String, String> xmlToMap(String xml, String charset) throws UnsupportedEncodingException, DocumentException {
+
+        Map<String, String> respMap = new HashMap<String, String>();
+
+        SAXReader reader = new SAXReader();
+        Document doc = reader.read(new ByteArrayInputStream(xml.getBytes(charset)));
+        Element root = doc.getRootElement();
+        xmlToMap(root, respMap);
+        return respMap;
+    }
+
+    public static Map<String, String> xmlToMap(Element tmpElement, Map<String, String> respMap){
+        if (tmpElement.isTextOnly()) {
+            respMap.put(tmpElement.getName(), tmpElement.getText());
+            return respMap;
+        }
+
+        @SuppressWarnings("unchecked")
+        Iterator<Element> eItor = tmpElement.elementIterator();
+        while (eItor.hasNext()) {
+            Element element = eItor.next();
+            xmlToMap(element, respMap);
+        }
+        return respMap;
+    }
+}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/util/UUIDUtil.java b/cloud-server-competition/src/main/java/com/dsh/competition/util/UUIDUtil.java
new file mode 100644
index 0000000..22ca17f
--- /dev/null
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/util/UUIDUtil.java
@@ -0,0 +1,101 @@
+package com.dsh.competition.util;
+
+
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * 定义生成随机码的工具类
+ */
+public class UUIDUtil {
+
+    private int i = 1;
+
+
+    /**
+     * 定义生成原生的UUID随机码
+     * @return
+     */
+    public static String getNativeUUID(){
+        return UUID.randomUUID().toString();
+    }
+
+
+    /**
+     * 生成32位随机码
+     * @return
+     */
+    public static String getRandomCode(){
+        return UUIDUtil.getNativeUUID().replaceAll("-", "");
+    }
+
+
+    /**
+     * 获取给定长度的随机码
+     * @param num
+     * @return
+     * @throws Exception
+     */
+    public static String getRandomCode(Integer num) throws Exception{
+        String str = null;
+        if(0 < num){
+            if(num % 32 > 0){
+                Integer s = num / 32;
+                Integer l = num % 32;
+                StringBuffer sb = new StringBuffer();
+                for(int i = 0; i < s; i++){
+                    sb.append(UUIDUtil.getRandomCode());
+                }
+                sb.append(UUIDUtil.getRandomCode().substring(0, l));
+                str = sb.toString();
+            }else if(num % 32 == 0){
+                Integer s = num / 32;
+                StringBuffer sb = new StringBuffer();
+                for(int i = 0; i < s; i++){
+                    sb.append(UUIDUtil.getRandomCode());
+                }
+                str = sb.toString();
+            }else{
+                str = UUIDUtil.getRandomCode().substring(0, num);
+            }
+        }else{
+            throw new Exception("参数只能大于0");
+        }
+        return str;
+    }
+
+
+    /**
+     * 获取根据当前时间的字符串数据
+     * @return
+     */
+    public synchronized static String getTimeStr(){
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmssS");
+        return simpleDateFormat.format(new Date());
+    }
+
+
+    /**
+     * @Description: 获取数字随机码
+     * @Author pzb
+     * @Date 2021/8/11 16:52
+     * @Param
+     * @Return
+     * @Exception
+     */
+    public static String getNumberRandom(Integer num){
+        if(null == num){
+            num = 32;
+        }
+        StringBuffer sb = new StringBuffer();
+        for(int i = 0; i < num; i++){
+            sb.append(Double.valueOf(Math.random() * 10).intValue());
+        }
+        return sb.toString();
+    }
+
+
+
+}
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/util/httpClinet/HttpClientUtil.java b/cloud-server-competition/src/main/java/com/dsh/competition/util/httpClinet/HttpClientUtil.java
index 800f58c..bc3969c 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/util/httpClinet/HttpClientUtil.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/util/httpClinet/HttpClientUtil.java
@@ -196,14 +196,14 @@
      * @return
      * @throws Exception
      */
-    public String pushHttpsRequsetXml(String url, String xml, Map<String, String> header, String certPassword, String certPath, String certType) throws Exception{
+    public static String pushHttpsRequsetXml(String url, String xml, Map<String, String> header, String certPassword, String certPath, String certType) throws Exception{
         HttpPost httpPost = new HttpPost(url);
         for(String key : header.keySet()){
             httpPost.setHeader(key, header.get(key));
         }
         httpPost.setHeader("Content-Type", "application/xml");
         httpPost.setEntity(new StringEntity(xml, "UTF-8"));
-        CloseableHttpClient httpCline = this.initCert(certPassword, certPath, certType);
+        CloseableHttpClient httpCline = initCert(certPassword, certPath, certType);
         CloseableHttpResponse httpResponse = httpCline.execute(httpPost);
         String content = null;
         if(httpResponse.getStatusLine().getStatusCode() == 200){
@@ -211,7 +211,7 @@
         }else{
             content = "返回状态码：" + httpResponse.getStatusLine() + "。" + EntityUtils.toString(httpResponse.getEntity());
         }
-        this.close(httpResponse);
+        close(httpResponse);
         httpCline.close();
         return content;
     }
@@ -224,7 +224,7 @@
      * @param certType  证书类型
      * @throws Exception
      */
-    private CloseableHttpClient initCert(String key, String certPath, String certType) throws Exception {
+    private static CloseableHttpClient initCert(String key, String certPath, String certType) throws Exception {
         KeyStore keyStore = KeyStore.getInstance(certType);
         InputStream inputStream = new FileInputStream(new File(certPath));
         try {
@@ -234,7 +234,7 @@
         }
         SSLContext sslcontext = SSLContexts.custom().loadKeyMaterial(keyStore, key.toCharArray()).build();
         SSLConnectionSocketFactory sslsf =
-                new SSLConnectionSocketFactory(sslcontext, new String[] {"TLSv1"}, null,
+                new SSLConnectionSocketFactory(sslcontext, null, null,
                         SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
         return HttpClients.custom().setSSLSocketFactory(sslsf).build();
     }
diff --git a/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml b/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml
index fdabd07..f702dc2 100644
--- a/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml
+++ b/cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml
@@ -1,4 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dsh.competition.mapper.PaymentCompetitionMapper">
+
+
+    <select id="queryMyCompetitionList" resultType="com.dsh.competition.model.CompetitionListVo">
+        select
+        a.id,
+        b.`name`,
+        b.coverDrawing,
+        b.city as cityName,
+        b.registerCondition,
+        b.introduction,
+        DATE_FORMAT(b.registerEndTime, '%Y-%m-%d %H:%i') as registerEndTime,
+        CONCAT(b.startAge, '-', b.endAge) as age,
+        b.baseNumber + b.applicantsNumber as heat
+        from t_payment_competition a
+        left join t_competition b on (a.competitionId = b.id)
+        where a.state = 1 and a.appUserId = #{uid} and a.payStatus != 1
+        <!--1=未开始，2=进行中，3=已结束，4=已取消-->
+        <if test="null != type and 1 == type">
+            and b.status = 1
+        </if>
+        <if test="null != type and 2 == type">
+            and b.status = 2
+        </if>
+        <if test="null != type and 3 == type">
+            and b.status = 3
+        </if>
+        <if test="null != type and 4 == type">
+            and a.payStatus = 3
+        </if>
+        order by a.insertTime desc limit #{pageSize}, #{pageNo}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/cloud-server-course/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java b/cloud-server-course/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java
index 79c5c4c..e0ef0b4 100644
--- a/cloud-server-course/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java
+++ b/cloud-server-course/src/main/java/com/dsh/config/Sharding_jdbc/ShardingConfig.java
@@ -84,6 +84,24 @@
         result2.getKeyGenerators().put("t_course_package_student-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
         linkedList.add(result2);
 
+        //分片规则配置
+        ShardingRuleConfiguration result3 = new ShardingRuleConfiguration();
+        result3.getTables().add(getPostCourseVideoTableRuleConfiguration());
+        Properties props3 = new Properties();
+        props3.setProperty("algorithm-expression", "t_post_course_video$->{coursePackageId % 5 + 1}");
+        result3.getShardingAlgorithms().put("t_post_course_video-inline", new AlgorithmConfiguration("INLINE", props3));
+        result3.getKeyGenerators().put("t_post_course_video-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
+        linkedList.add(result3);
+
+        //分片规则配置
+        ShardingRuleConfiguration result4 = new ShardingRuleConfiguration();
+        result4.getTables().add(getUserVideoDetailsTableRuleConfiguration());
+        Properties props4 = new Properties();
+        props4.setProperty("algorithm-expression", "t_user_video_details$->{appUserId % 5 + 1}");
+        result4.getShardingAlgorithms().put("t_user_video_details-inline", new AlgorithmConfiguration("INLINE", props4));
+        result4.getKeyGenerators().put("t_user_video_details-snowflake", new AlgorithmConfiguration("SNOWFLAKE", new Properties()));
+        linkedList.add(result4);
+
         return linkedList;
     }
 
@@ -111,4 +129,30 @@
         return result;
     }
 
+
+
+    /**
+     * 分片算法配置
+     * @return
+     */
+    private ShardingTableRuleConfiguration getPostCourseVideoTableRuleConfiguration() {
+        ShardingTableRuleConfiguration result = new ShardingTableRuleConfiguration("t_post_course_video", "m_$->{0}.t_post_course_video$->{1..5}");//30
+        result.setTableShardingStrategy(new StandardShardingStrategyConfiguration("coursePackageId", "t_post_course_video-inline"));
+        result.setKeyGenerateStrategy(new KeyGenerateStrategyConfiguration("id", "t_post_course_video-snowflake"));
+        return result;
+    }
+
+
+
+    /**
+     * 分片算法配置
+     * @return
+     */
+    private ShardingTableRuleConfiguration getUserVideoDetailsTableRuleConfiguration() {
+        ShardingTableRuleConfiguration result = new ShardingTableRuleConfiguration("t_user_video_details", "m_$->{0}.t_user_video_details$->{1..5}");//30
+        result.setTableShardingStrategy(new StandardShardingStrategyConfiguration("appUserId", "t_user_video_details-inline"));
+        result.setKeyGenerateStrategy(new KeyGenerateStrategyConfiguration("id", "t_user_video_details-snowflake"));
+        return result;
+    }
+
 }
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 06f3da1..cb29e84 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
@@ -2,11 +2,8 @@
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dsh.course.entity.PostCourseVideo;
-import com.dsh.course.entity.TCoursePackage;
-import com.dsh.course.entity.TCoursePackageDiscount;
-import com.dsh.course.entity.TCoursePackagePayment;
-import com.dsh.course.entity.TCoursePackageType;
+import com.dsh.course.entity.*;
+import com.dsh.course.feignclient.account.StudentClient;
 import com.dsh.course.feignclient.model.*;
 import com.dsh.course.model.BaseVo;
 import com.dsh.course.model.dto.DiscountJsonDto;
@@ -75,6 +72,9 @@
 
     @Autowired
     private TokenUtil tokenUtil;
+
+    @Autowired
+    private CancelledClassesService cancelledClassesService;
 
     private final SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");
 
@@ -489,7 +489,7 @@
     @ApiImplicitParams({
             @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
     })
-    public ResultUtil continuationOperation( ClasspaymentRequest request){
+    public ResultUtil continuationOperation(ClasspaymentRequest request){
         try {
             Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
             if(null == userIdFormRedis){
@@ -503,5 +503,94 @@
     }
 
 
+    /**
+     * 获取学员剩余课时
+     * @param id
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/coursePackagePayment/queryResidueClassHour")
+    public Integer queryResidueClassHour(@RequestBody Integer id){
+        try {
+            List<TCoursePackagePayment> list = packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>().eq("studentId", id).eq("payStatus", 2)
+                    .eq("status", 1).eq("state", 1).gt("laveClassHours", 0));
+            Integer total = 0;
+            for (TCoursePackagePayment coursePackagePayment : list) {
+                total += coursePackagePayment.getLaveClassHours();
+            }
+            return total;
+        }catch (Exception e){
+            e.printStackTrace();
+            return 0;
+        }
+    }
 
+
+    /**
+     * 课程用于支付进行扣减
+     * @param paymentDeductionClassHour
+     */
+    @ResponseBody
+    @PostMapping("/coursePackagePayment/paymentDeductionClassHour")
+    public void paymentDeductionClassHour(@RequestBody PaymentDeductionClassHour paymentDeductionClassHour){
+        try {
+            List<TCoursePackagePayment> list = packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>().eq("studentId", paymentDeductionClassHour.getId()).eq("payStatus", 2)
+                    .eq("status", 1).eq("state", 1).gt("laveClassHours", 0));
+            Integer classHour = paymentDeductionClassHour.getClassHour();
+            for (TCoursePackagePayment coursePackagePayment : list) {
+                if(coursePackagePayment.getLaveClassHours().compareTo(classHour) >= 0){
+                    coursePackagePayment.setLaveClassHours(coursePackagePayment.getLaveClassHours() - classHour);
+                    packagePaymentService.updateById(coursePackagePayment);
+
+                    CancelledClasses cancelledClasses = new CancelledClasses();
+                    cancelledClasses.setType(2);
+                    cancelledClasses.setVoucher(paymentDeductionClassHour.getCode());
+                    cancelledClasses.setCoursePackageId(coursePackagePayment.getCoursePackageId());
+                    cancelledClasses.setCoursePackagePaymentId(coursePackagePayment.getId());
+                    cancelledClasses.setCancelledClassesNumber(classHour);
+                    cancelledClasses.setInsertTime(new Date());
+                    cancelledClassesService.save(cancelledClasses);
+                    break;
+                }else{
+                    CancelledClasses cancelledClasses = new CancelledClasses();
+                    cancelledClasses.setType(2);
+                    cancelledClasses.setVoucher(paymentDeductionClassHour.getCode());
+                    cancelledClasses.setCoursePackageId(coursePackagePayment.getCoursePackageId());
+                    cancelledClasses.setCoursePackagePaymentId(coursePackagePayment.getId());
+                    cancelledClasses.setCancelledClassesNumber(coursePackagePayment.getLaveClassHours());
+                    cancelledClasses.setInsertTime(new Date());
+                    cancelledClassesService.save(cancelledClasses);
+
+                    coursePackagePayment.setLaveClassHours(0);
+                    packagePaymentService.updateById(coursePackagePayment);
+
+                    classHour -= cancelledClasses.getCancelledClassesNumber();
+                }
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+
+    /**
+     * 取消赛事回退支付课时
+     * @param paymentDeductionClassHour
+     */
+    @ResponseBody
+    @PostMapping("/coursePackagePayment/rollbackPaymentDeductionClassHour")
+    public void rollbackPaymentDeductionClassHour(@RequestBody PaymentDeductionClassHour paymentDeductionClassHour){
+        try {
+            List<CancelledClasses> voucher = cancelledClassesService.list(new QueryWrapper<CancelledClasses>().eq("voucher", paymentDeductionClassHour.getCode()));
+            for (CancelledClasses cancelledClasses : voucher) {
+                TCoursePackagePayment coursePackagePayment = packagePaymentService.getById(cancelledClasses.getCoursePackagePaymentId());
+                coursePackagePayment.setLaveClassHours(coursePackagePayment.getLaveClassHours() + cancelledClasses.getCancelledClassesNumber());
+                packagePaymentService.updateById(coursePackagePayment);
+
+                cancelledClassesService.removeById(cancelledClasses.getId());
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
 }
diff --git a/cloud-server-course/src/main/java/com/dsh/course/entity/CancelledClasses.java b/cloud-server-course/src/main/java/com/dsh/course/entity/CancelledClasses.java
index c28548d..dcb3bc7 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/entity/CancelledClasses.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/entity/CancelledClasses.java
@@ -34,11 +34,21 @@
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
     /**
+     * 消课类型（1=上课消课，2=支付消课）
+     */
+    @TableField("type")
+    private Integer type;
+    /**
      * 课包id
      */
     @TableField("coursePackageId")
     private Integer coursePackageId;
     /**
+     * 课程支付记录id
+     */
+    @TableField("coursePackagePaymentId")
+    private Long coursePackagePaymentId;
+    /**
      * 消课凭证
      */
     @TableField("voucher")
diff --git a/cloud-server-course/src/main/java/com/dsh/course/entity/PostCourseVideo.java b/cloud-server-course/src/main/java/com/dsh/course/entity/PostCourseVideo.java
index 465917b..9fd6f30 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/entity/PostCourseVideo.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/entity/PostCourseVideo.java
@@ -31,8 +31,8 @@
     /**
      * 主键id
      */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
     /**
      * 课包id
      */
diff --git a/cloud-server-course/src/main/java/com/dsh/course/entity/UserVideoDetails.java b/cloud-server-course/src/main/java/com/dsh/course/entity/UserVideoDetails.java
index fbbc9fe..2f2b85b 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/entity/UserVideoDetails.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/entity/UserVideoDetails.java
@@ -1,5 +1,8 @@
 package com.dsh.course.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
@@ -28,30 +31,37 @@
     /**
      * 主键id
      */
-    private Integer id;
+    @TableId(value = "id", type = IdType.INPUT)
+    private Long id;
     /**
      * 用户id
      */
+    @TableField("appUserId")
     private Integer appUserId;
     /**
      * 课包id
      */
+    @TableField("coursePackageId")
     private Integer coursePackageId;
     /**
      * 课后视频id
      */
+    @TableField("courseId")
     private Integer courseId;
     /**
      * 状态(1未学习 2已学习)
      */
+    @TableField("state")
     private Integer state;
     /**
      * 添加时间
      */
+    @TableField("insertTime")
     private Date insertTime;
     /**
      * 更新时间
      */
+    @TableField("updateTime")
     private Date updateTime;
 
 
diff --git a/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/PaymentDeductionClassHour.java b/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/PaymentDeductionClassHour.java
new file mode 100644
index 0000000..e472cf5
--- /dev/null
+++ b/cloud-server-course/src/main/java/com/dsh/course/feignclient/model/PaymentDeductionClassHour.java
@@ -0,0 +1,23 @@
+package com.dsh.course.feignclient.model;
+
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/7/10 15:05
+ */
+@Data
+public class PaymentDeductionClassHour {
+    /**
+     * 学员id
+     */
+    private Integer id;
+    /**
+     * 扣减课时
+     */
+    private Integer classHour;
+    /**
+     * 支付编号
+     */
+    private String code;
+}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
index 9c9e572..e147946 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -27,6 +27,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.regex.Matcher;
@@ -45,32 +46,32 @@
 public class TCoursePackagePaymentServiceImpl extends ServiceImpl<TCoursePackagePaymentMapper, TCoursePackagePayment> implements TCoursePackagePaymentService {
 
 
-    @Autowired
+    @Resource
     private BenefitVideoClient bfvoClient;
 
 
-    @Autowired
+    @Resource
     private UserVideoDetailsMapper uvdmapper;
 
-    @Autowired
+    @Resource
     private PostCourseVideoMapper pcvMapper;
 
-    @Autowired
+    @Resource
     private TCoursePackageMapper tcpmapper;
 
-    @Autowired
+    @Resource
     private StoreClient stoClient;
 
-    @Autowired
+    @Resource
     private CoachClient coachClient;
 
-    @Autowired
+    @Resource
     private CoursePackageStudentMapper cpsMapper;
 
-    @Autowired
+    @Resource
     private CancelledClassesMapper cacMapper;
 
-    @Autowired
+    @Resource
     private TCoursePackageDiscountMapper tcpdMapper;
 
 
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
index 2dbce49..982aa7a 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -126,7 +126,7 @@
             Store store = storeClient.queryStoreById(coursePackage.getStoreId());
             Integer integer = coursePackagePaymentService.queryCountNumber(coursePackage.getId());
             CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getOne(new QueryWrapper<CoursePackagePaymentConfig>()
-                    .eq("coursePackageId", coursePackage.getId()).orderByAsc("classHours limit 0, 1"));
+                    .eq("coursePackageId", coursePackage.getId()).orderByAsc("classHours").last(" limit 0, 1"));
             CoursePackageListVo coursePackageListVo = new CoursePackageListVo();
             coursePackageListVo.setId(coursePackage.getId());
             coursePackageListVo.setName(coursePackage.getName());
@@ -546,7 +546,7 @@
             coursePackagePaymentService.save(coursePackagePayment);
         }
 
-        ResultUtil weixinpay = payMoneyUtil.weixinpay("购买课程", "", code, paymentPrice.toString(), "/base/course/weChatPaymentCourseCallback", "APP");
+        ResultUtil weixinpay = payMoneyUtil.weixinpay("购买课程", "", code, paymentPrice.toString(), "/base/course/weChatPaymentCourseCallback", "APP", "");
         if(weixinpay.getCode() == 200){
             new Thread(new Runnable() {
                 @Override
@@ -643,7 +643,7 @@
             coursePackagePaymentService.save(coursePackagePayment);
         }
 
-        ResultUtil alipay = payMoneyUtil.alipay("购买课程", "", code, paymentPrice.toString(), "/base/course/aliPaymentCourseCallback");
+        ResultUtil alipay = payMoneyUtil.alipay("购买课程", "", "", code, paymentPrice.toString(), "/base/course/aliPaymentCourseCallback");
         if(alipay.getCode() == 200){
             new Thread(new Runnable() {
                 @Override
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 759c28d..39debe3 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
@@ -4,16 +4,11 @@
 import com.alibaba.fastjson.JSONObject;
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.AlipayClient;
+import com.alipay.api.CertAlipayRequest;
 import com.alipay.api.DefaultAlipayClient;
 import com.alipay.api.domain.AlipayTradeAppPayModel;
-import com.alipay.api.request.AlipayTradeAppPayRequest;
-import com.alipay.api.request.AlipayTradePrecreateRequest;
-import com.alipay.api.request.AlipayTradeQueryRequest;
-import com.alipay.api.request.AlipayTradeRefundRequest;
-import com.alipay.api.response.AlipayTradeAppPayResponse;
-import com.alipay.api.response.AlipayTradePrecreateResponse;
-import com.alipay.api.response.AlipayTradeQueryResponse;
-import com.alipay.api.response.AlipayTradeRefundResponse;
+import com.alipay.api.request.*;
+import com.alipay.api.response.*;
 import com.dsh.course.util.httpClinet.HttpClientUtil;
 import org.apache.commons.collections.map.HashedMap;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -47,58 +42,116 @@
  */
 @Component
 public class PayMoneyUtil {
-    //支付宝appid
-    private String aliAppid = "";
-    //支付宝开发者应用私钥
-    private String appPrivateKey = "";
-    //支付宝应用公钥
-    private String alipayPublicKey = "";
-    //支付宝支付公钥
-    private String alipay_public_key = "";
-    //微信appid
-    private String appid = "";
-    //微信商户号
-    private String mchId = "";
-    //微信商户号
-    private String key = "";
-    //支付回调网关地址
-    @Value("${callbackPath}")
-    private String callbackPath;
-    //微信支付证书地址
-    private String wechatPayCertificatesFromPath = "/usr/local/server/app/cert/weixin/apiclient_cert.p12";
-    //微信私钥证书地址
-    private String privateKeyFromPath = "/usr/local/server/app/cert/weixin/apiclient_cert.pem";
+    private String aliAppid = "";//支付宝appid
 
+    private String appPrivateKey = "";//支付宝开发者应用私钥
+
+    private String alipayPublicKey = "";//支付宝应用公钥
+
+    private String alipay_public_key = "";//支付宝支付公钥
+
+    private String appid = "";//微信appid
+
+    private String appletsAppid = "";//微信小程序appid
+
+    private String mchId = "";//微信商户号
+
+    private String key = "";//微信商户号
+
+    private String callbackPath = "";//支付回调网关地址
+
+    private String app_cert_path = "C:/cert/alipay/user/app_cert_path.crt";//应用公钥证书路径
+
+    private String alipay_cert_path = "C:/cert/alipay/user/alipay_cert_path.crt";//支付宝公钥证书文件路径
+
+    private String alipay_root_cert_path = "C:/cert/alipay/user/alipay_root_cert_path.crt";//支付宝CA根证书文件路径
+
+    private String certPath = "C:\\cert\\1523106371_20211206_cert\\apiclient_cert.p12";//微信证书
 
 
 
     /**
      * 支付宝支付
      */
-    public ResultUtil<String> alipay(String body, String subject, String outTradeNo, String amount, String notifyUrl){
-        //实例化客户端
-        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipayPublicKey, "RSA2");
-        //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
-        AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
-        //SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
-        AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
-        model.setBody(body);//对一笔交易的具体描述信息。如果是多种商品，请将商品描述字符串累加传给body。
-        model.setSubject(subject);//商品的标题/交易标题/订单标题/订单关键字等。
-        model.setOutTradeNo(outTradeNo);//商户网站唯一订单号
-        model.setTimeoutExpress("30m");
-        model.setTotalAmount(amount);//付款金额
-        model.setProductCode("QUICK_MSECURITY_PAY");
-        request.setBizModel(model);
-        request.setNotifyUrl(callbackPath + notifyUrl);
+    public ResultUtil alipay(String body, String subject, String passbackParams, String outTradeNo, String amount, String notifyUrl){
+        //构造client
+        CertAlipayRequest certAlipayRequest = new CertAlipayRequest ();
+        //设置网关地址
+        certAlipayRequest.setServerUrl("https://openapi.alipay.com/gateway.do");
+        //设置应用Id
+        certAlipayRequest.setAppId(aliAppid);
+        //设置应用私钥
+        certAlipayRequest.setPrivateKey(appPrivateKey);
+        //设置请求格式，固定值json
+        certAlipayRequest.setFormat("json");
+        //设置字符集
+        certAlipayRequest.setCharset("UTF-8");
+        //设置签名类型
+        certAlipayRequest.setSignType("RSA2");
+        //设置应用公钥证书路径
+        certAlipayRequest.setCertPath(app_cert_path);
+        //设置支付宝公钥证书路径
+        certAlipayRequest.setAlipayPublicCertPath(alipay_cert_path);
+        //设置支付宝根证书路径
+        certAlipayRequest.setRootCertPath(alipay_root_cert_path);
+        //构造client
+        AlipayClient alipayClient = null;
         try {
-            //这里和普通的接口调用不同，使用的是sdkExecute
-            AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request);
-            System.out.println(response.getBody());//就是orderString 可以直接给客户端请求，无需再做处理。
-            return ResultUtil.success(response.getBody());
+            alipayClient = new DefaultAlipayClient(certAlipayRequest);
         } catch (AlipayApiException e) {
             e.printStackTrace();
-            return ResultUtil.error("调起支付异常", "");
         }
+        //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
+        AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest ();
+        //SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
+        AlipayTradeAppPayModel model = new AlipayTradeAppPayModel ();
+        model.setBody(body);
+        model.setSubject (subject);
+        model.setOutTradeNo (outTradeNo);
+        model.setTimeoutExpress ("30m" );
+        model.setTotalAmount (amount);
+        model.setProductCode ( "QUICK_MSECURITY_PAY" );
+        model.setPassbackParams(passbackParams);//自定义参数
+        request.setBizModel ( model );
+        request.setNotifyUrl (callbackPath + notifyUrl);
+        try  {
+            //这里和普通的接口调用不同，使用的是sdkExecute
+            AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request);
+            Map<String, String> map = new HashMap<>();
+            map.put("orderString", response.getBody());
+            System.out.println(map);//就是orderString 可以直接给客户端请求，无需再做处理。
+            return ResultUtil.success(map);
+        }  catch (AlipayApiException e ) {
+            e.printStackTrace();
+        }
+
+
+//        //实例化客户端
+//        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do", aliAppid, appPrivateKey, "json", "UTF-8", alipay_public_key, "RSA2");
+//        //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
+//        AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
+//        //SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
+//        AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
+//        model.setBody(body);//对一笔交易的具体描述信息。如果是多种商品，请将商品描述字符串累加传给body。
+//        model.setSubject(subject);//商品的标题/交易标题/订单标题/订单关键字等。
+//        model.setOutTradeNo(outTradeNo);//商户网站唯一订单号
+//        model.setTimeoutExpress("30m");
+//        model.setTotalAmount(amount);//付款金额
+//        model.setProductCode("QUICK_MSECURITY_PAY");
+//        model.setPassbackParams(passbackParams);//自定义参数
+//        request.setBizModel(model);
+//        request.setNotifyUrl(callbackPath + notifyUrl);
+//        try {
+//            //这里和普通的接口调用不同，使用的是sdkExecute
+//            AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request);
+//            Map<String, String> map = new HashMap<>();
+//            map.put("orderString", response.getBody());
+//            System.out.println(map);//就是orderString 可以直接给客户端请求，无需再做处理。
+//            return ResultUtil.success(map);
+//        } catch (AlipayApiException e) {
+//            e.printStackTrace();
+//        }
+        return null;
     }
 
 
@@ -149,7 +202,7 @@
             String valueStr = "";
             for (int i = 0; i < values.length; i++) {
                 valueStr = (i == values.length - 1) ? valueStr + values[i]
-                        : valueStr + values[i] + ",";
+                        : valueStr + values[i] + "_";
             }
             //乱码解决，这段代码在出现乱码时使用。
             //valueStr = new String(valueStr.getBytes("ISO-8859-1"), "utf-8");
@@ -158,24 +211,42 @@
         //切记alipaypublickey是支付宝的公钥，请去open.alipay.com对应应用下查看。
         //boolean AlipaySignature.rsaCheckV1(Map<String, String> params, String publicKey, String charset, String sign_type)
 //        try {
-//            boolean flag = AlipaySignature.rsaCheckV1(params, alipayPublicKey, "UTF-8","RSA2");
+//            boolean flag = AlipaySignature.rsaCheckV1(params, alipay_public_key, "UTF-8","RSA2");
 //            if(flag){
-                Map<String, String> map = new HashMap<>();
-                String out_trade_no = params.get("out_trade_no");
-                String subject = params.get("subject");
-                String total_amount = params.get("total_amount");
-                String trade_no = params.get("trade_no");
-                map.put("out_trade_no", out_trade_no);//商家订单号
-                map.put("subject", subject);
-                map.put("total_amount", total_amount);
-                map.put("trade_no", trade_no);//支付宝交易号
-                return map;
+//                Map<String, String> map = new HashMap<>();
+//                String out_trade_no = params.get("out_trade_no");
+//                String subject = params.get("subject");
+//                String total_amount = params.get("total_amount");
+//                String trade_no = params.get("trade_no");
+//                String passback_params = params.get("passback_params");
+//                map.put("out_trade_no", out_trade_no);//商家订单号
+//                map.put("subject", subject);
+//                map.put("total_amount", total_amount);
+//                map.put("trade_no", trade_no);//支付宝交易号
+//                map.put("passback_params", passback_params);//回传参数
+//                return map;
+//            }else{
+//                System.err.println("验签失败");
 //            }
-
+//
 //        } catch (AlipayApiException e) {
 //            e.printStackTrace();
 //        }
 //        return null;
+
+
+        Map<String, String> map = new HashMap<>();
+        String out_trade_no = params.get("out_trade_no");
+        String subject = params.get("subject");
+        String total_amount = params.get("total_amount");
+        String trade_no = params.get("trade_no");
+        String passback_params = params.get("passback_params");
+        map.put("out_trade_no", out_trade_no);//商家订单号
+        map.put("subject", subject);
+        map.put("total_amount", total_amount);
+        map.put("trade_no", trade_no);//支付宝交易号
+        map.put("passback_params", passback_params);//回传参数
+        return map;
     }
 
 
@@ -185,20 +256,16 @@
      * @return
      * @throws Exception
      */
-    public ResultUtil<Map<String, String>> queryALIOrder(String out_trade_no) throws Exception{
+    public ResultUtil 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 +
-                "\"}");
+                "\"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（交易结束，不可退款）
-            String tradeNo = response.getTradeNo();
-            Map<String, String> map = new HashMap<>();
-            map.put("tradeStatus", tradeStatus);
-            map.put("tradeNo", tradeNo);
-            return ResultUtil.success(map);
+            return ResultUtil.success(tradeStatus);
         } else {
             return ResultUtil.error(response.getMsg());
         }
@@ -216,7 +283,7 @@
      * @param tradeType     交易类型
      * @return
      */
-    public ResultUtil weixinpay(String body, String attach, String out_trade_no, String total_fee, String notify_url, String tradeType) throws Exception{
+    public ResultUtil weixinpay(String body, String attach, String out_trade_no, String total_fee, String notify_url, String tradeType, String openId) throws Exception{
         int i = new BigDecimal(total_fee).multiply(new BigDecimal("100")).intValue();
         String hostAddress = null;
         try {
@@ -226,7 +293,7 @@
         }
         String nonce_str = UUIDUtil.getRandomCode(16);
         Map<String, Object> map = new HashMap<>();
-        map.put("appid", appid);
+        map.put("appid", "APP".equals(tradeType) ? appid : appletsAppid);
         map.put("mch_id", mchId);
         map.put("nonce_str", nonce_str);
         map.put("body", body);
@@ -236,6 +303,9 @@
         map.put("spbill_create_ip", hostAddress);
         map.put("notify_url", callbackPath + notify_url);
         map.put("trade_type", tradeType);
+        if("JSAPI".equals(tradeType)){
+            map.put("openid", openId);
+        }
         String s = this.weixinSignature(map);
         map.put("sign", s);
 
@@ -271,26 +341,40 @@
             String result_code = map1.get("result_code");
             if("SUCCESS".equals(result_code)){
                 String type = map1.get("trade_type");
+                String prepay_id = map1.get("prepay_id");
                 switch (type){
                     case "JSAPI":
-                        break;
+                        //重新进行签名后返回给前端
+                        Map<String, Object> map2 = new HashMap<>();
+                        map2.put("appId", map1.get("appid"));
+                        map2.put("nonceStr", map1.get("nonce_str"));
+                        map2.put("package", "prepay_id=" + prepay_id);
+                        map2.put("signType", "MD5");
+                        map2.put("timeStamp", new Date().getTime() + "");
+                        String s2 = this.weixinSignature(map2);
+
+                        map2.put("prepay_id", prepay_id);
+                        map2.put("mch_id", map1.get("mch_id"));
+                        map2.put("trade_type", map1.get("trade_type"));
+
+                        map2.put("sign", s2);
+                        return ResultUtil.success(map2);
                     case "NATIVE":
                         String code_url = map1.get("code_url");
                         return ResultUtil.success(code_url);
                     case "APP":
-                        String prepay_id = map1.get("prepay_id");
                         //重新进行签名后返回给前端
-                        Map<String, Object> map2 = new HashMap<>();
-                        map2.put("appid", appid);
-                        map2.put("noncestr", nonce_str);
-                        map2.put("package", "Sign=WXPay");
-                        map2.put("partnerid", mchId);
-                        map2.put("prepayid", prepay_id);
-                        map2.put("timestamp", new Date().getTime() / 1000);
-                        String s1 = this.weixinSignature(map2);
-                        map2.put("sign", s1);
-                        System.err.println(map2);
-                        return ResultUtil.success(map2);
+                        Map<String, Object> map3 = new HashMap<>();
+                        map3.put("appid", appid);
+                        map3.put("noncestr", nonce_str);
+                        map3.put("package", "Sign=WXPay");
+                        map3.put("partnerid", mchId);
+                        map3.put("prepayid", prepay_id);
+                        map3.put("timestamp", new Date().getTime() / 1000);
+                        String s1 = this.weixinSignature(map3);
+                        map3.put("sign", s1);
+                        System.err.println(map3);
+                        return ResultUtil.success(map3);
                 }
                 return null;
             }else{
@@ -323,8 +407,8 @@
                 if("SUCCESS".equals(result_code)){
                     Map<String, String> map1 = new HashedMap();
                     map1.put("nonce_str", map.get("nonce_str"));
-                    map1.put("out_trade_no", map.get("out_trade_no"));
-                    map1.put("attach", map.get("attach"));
+                    map1.put("out_trade_no", map.get("out_trade_no"));//存储的订单code
+                    map1.put("attach", map.get("attach"));//存储订单id
                     map1.put("total_fee", map.get("total_fee"));
                     map1.put("transaction_id", map.get("transaction_id"));//微信支付订单号
                     String result = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
@@ -487,7 +571,7 @@
         map.put("total_fee", tf);
         map.put("refund_fee", rf);
         map.put("notify_url", callbackPath + notify_url);
-        String s = this.weixinSignature(map);
+        String s = this.weixinSignature(map, key);
         map.put("sign", s);
 
         String url = "https://api.mch.weixin.qq.com/secapi/pay/refund";
@@ -508,10 +592,11 @@
         Map<String, String> map1 = null;
         String body1 = null;
         try {
-            body1 = HttpClientUtil.pushHttpRequsetXml(url, xmlString.toString(), new HashMap<>()).getData();
+            body1 = HttpClientUtil.pushHttpsRequsetXml(url, xmlString.toString(), new HashMap<>(), mchId, certPath, "PKCS12");
         } catch (Exception e) {
             e.printStackTrace();
         }
+        System.err.println(body1);
         //将结果xml解析成map
         body1 = body1.replaceAll("<!\\[CDATA\\[","");
         body1 = body1.replaceAll("]]>", "");
@@ -565,6 +650,8 @@
                 Map<String, String> map1 = new HashMap<>();
                 map1.put("refund_id", map.get("refund_id"));
                 map1.put("out_refund_no", map.get("out_refund_no"));
+                String result = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
+                map1.put("result", result);
                 return map1;
             }else{
 //                System.err.println(map.get("return_msg"));
@@ -685,6 +772,229 @@
 
 
 
+    /**
+     * 微信转账功能（企业付款到零钱）
+     * @param openid                商户appid下，某用户的openid
+     * @param desc                  企业付款备注，必填。
+     * @param total_fee             企业付款金额
+     * @param partner_trade_no      商户订单号，需保持唯一性
+     * @return
+     */
+    public Map<String, String> wxTransfers(String openid, String desc, String total_fee, String partner_trade_no) throws Exception{
+        int amount = new BigDecimal(total_fee).multiply(new BigDecimal("100")).intValue();
+        String nonce_str = UUIDUtil.getRandomCode();
+        Map<String, Object> map = new HashMap<>();
+        map.put("mch_appid", appid);//申请商户号的appid或商户号绑定的appid
+        map.put("mchid", mchId);//微信支付分配的商户号
+        map.put("nonce_str", nonce_str);//随机字符串，不长于32位
+        map.put("partner_trade_no", partner_trade_no);//商户订单号，需保持唯一性
+        map.put("openid", openid);//商户appid下，某用户的openid
+        map.put("check_name", "NO_CHECK");//NO_CHECK：不校验真实姓名 FORCE_CHECK：强校验真实姓名
+        map.put("amount", amount);//企业付款金额，单位为分
+        map.put("desc", desc);//企业付款备注，必填。
+        String s = this.weixinSignature(map, key);
+        map.put("sign", s);
+
+        String url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers";
+        //设置请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_XML);
+        StringBuffer xmlString = new StringBuffer();
+        Set<String> strings = map.keySet();
+        String[] keys = {};
+        keys = strings.toArray(keys);
+        Arrays.sort(keys);
+        xmlString.append("<xml>");
+        for(int l = 0; l < keys.length; l++){
+            xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">");
+        }
+        xmlString.append("</xml>");
+
+        Map<String, String> map1 = null;
+        String body1 = HttpClientUtil.pushHttpsRequsetXml(url, xmlString.toString(), new HashMap<>(), mchId, certPath, "PKCS12");
+        //将结果xml解析成map
+        body1 = body1.replaceAll("<!\\[CDATA\\[","");
+        body1 = body1.replaceAll("]]>", "");
+        try {
+            map1 = this.xmlToMap(body1, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        } catch (DocumentException e) {
+            e.printStackTrace();
+        }
+        String return_code = map1.get("return_code");
+        Map<String, String> map2 = new HashMap<>();
+        if("SUCCESS".equals(return_code)){
+            String result_code = map1.get("result_code");
+            if("SUCCESS".equals(result_code)){
+                map2.put("return_code", result_code);
+                map2.put("payment_no", String.valueOf(map1.get("payment_no")));//付款订单号
+                map2.put("payment_time", String.valueOf(map1.get("payment_time")));//付款时间
+                return map2;
+            }else{
+                map2.put("return_code", result_code);
+                map2.put("err_code", map1.get("err_code"));
+                map2.put("err_code_des", map1.get("err_code_des"));
+                return map2;
+            }
+        }else{
+            map2.put("return_code", return_code);
+            map2.put("return_msg", map1.get("return_msg"));
+            return map2;
+        }
+    }
+
+
+    /**
+     * 微信转账功能（企业付款到银行卡）
+     * @param desc              备注信息
+     * @param total_fee         转账金额
+     * @param partner_trade_no  订单号
+     * @param enc_bank_no       银行卡号
+     * @param enc_true_name     收款方用户名
+     * @param bankName          银行名称
+     * @return
+     * @throws Exception
+     */
+    public Map<String, String> wxPayBank(String desc, String total_fee, String partner_trade_no, String enc_bank_no, String enc_true_name, String bankName) throws Exception{
+        int amount = new BigDecimal(total_fee).multiply(new BigDecimal("100")).intValue();
+        String nonce_str = UUIDUtil.getRandomCode();
+        Map<String, Object> map = new HashMap<>();
+        map.put("mch_id", mchId);//微信支付分配的商户号
+        map.put("nonce_str", nonce_str);//随机字符串，不长于32位
+        map.put("partner_trade_no", partner_trade_no);//商户订单号，需保持唯一性
+        map.put("enc_bank_no", enc_bank_no);//收款方银行卡号（采用标准RSA算法，公钥由微信侧提供）
+        map.put("enc_true_name", enc_true_name);//收款方用户名（采用标准RSA算法，公钥由微信侧提供）
+        map.put("bank_code", findBankCode(bankName));//
+        map.put("amount", amount);//企业付款金额，单位为分
+        map.put("desc", desc);//企业付款备注，必填。
+        String s = this.weixinSignature(map, key);
+        map.put("sign", s);
+
+        String url = "https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank";
+        //设置请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_XML);
+        StringBuffer xmlString = new StringBuffer();
+        Set<String> strings = map.keySet();
+        String[] keys = {};
+        keys = strings.toArray(keys);
+        Arrays.sort(keys);
+        xmlString.append("<xml>");
+        for(int l = 0; l < keys.length; l++){
+            xmlString.append("<" + keys[l] + ">" + map.get(keys[l]) + "</" + keys[l] + ">");
+        }
+        xmlString.append("</xml>");
+
+        Map<String, String> map1 = null;
+        String body1 = HttpClientUtil.pushHttpsRequsetXml(url, xmlString.toString(), new HashMap<>(), mchId, certPath, "PKCS12");
+        //将结果xml解析成map
+        body1 = body1.replaceAll("<!\\[CDATA\\[","");
+        body1 = body1.replaceAll("]]>", "");
+        try {
+            map1 = this.xmlToMap(body1, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        } catch (DocumentException e) {
+            e.printStackTrace();
+        }
+        String return_code = map1.get("return_code");
+        Map<String, String> map2 = new HashMap<>();
+        if("SUCCESS".equals(return_code)){
+            String result_code = map1.get("result_code");
+            if("SUCCESS".equals(result_code)){
+                map2.put("return_code", result_code);
+                map2.put("payment_no", String.valueOf(map1.get("payment_no")));//付款订单号
+                map2.put("cmms_amt", String.valueOf(map1.get("cmms_amt")));//手续费金额 RMB：分
+                return map2;
+            }else{
+                map2.put("return_code", result_code);
+                map2.put("err_code", map1.get("err_code"));
+                map2.put("err_code_des", map1.get("err_code_des"));
+                return map2;
+            }
+        }else{
+            map2.put("return_code", return_code);
+            map2.put("return_msg", map1.get("return_msg"));
+            return map2;
+        }
+    }
+
+    /**
+     * 微信转账到银行卡不编号
+     * @param bankName
+     * @return
+     */
+    public String findBankCode(String bankName){
+        String json = "{\"工商银行 \":1002,\"农业银行\":1005,\"建设银行\":1003,\"中国银行\":1026,\"交通银行 \":1020,\"招商银行 \":1001,\"邮储银行\":1066,\"民生银行 \":1006,\"平安银行 \":1010,\"中信银行\":1021,\"浦发银行 \":1004,\"兴业银行 \":1009,\"光大银行 \":1022,\"广发银行\":1027,\"华夏银行\":1025,\"宁波银行\":1056,\"北京银行\":4836,\"上海银行\":1024,\"南京银行\":1054,\"长子县融汇村镇银行\":4755,\"长沙银行\":4216,\"浙江泰隆商业银行\":4051,\"中原银行 \":4753,\"企业银行（中国）\":4761,\"顺德农商银行 \":4036,\"衡水银行\":4752,\"长治银行\":4756,\"大同银行\":4767,\"河南省农村信用社\":4115,\"宁夏黄河农村商业银行\":4150,\"山西省农村信用社\":4156,\"安徽省农村信用社\":4166,\"甘肃省农村信用社\":4157,\"天津农村商业银行\":4153,\"广西壮族自治区农村信用社\":4113,\"陕西省农村信用社\":4108,\"深圳农村商业银行\":4076,\"宁波鄞州农村商业银行\":4052,\"浙江省农村信用社联合社\":4764,\"江苏省农村信用社联合社\":4217,\"江苏紫金农村商业银行股份有限公司 \":4072,\"北京中关村银行股份有限公司 \":4769,\"星展银行（ 中国） 有限公司 \":4778,\"枣庄银行股份有限公司 \":4766,\"海口联合农村商业银行股份有限公司 \":4758,\"南洋商业银行（ 中国） 有限公司 \":4763}";
+        JSONObject jsonObject = JSON.parseObject(json);
+        Set<String> strings = jsonObject.keySet();
+        for(String key : strings){
+            if(key.indexOf(bankName) >= 0){
+                return jsonObject.getString(key);
+            }
+        }
+        return "";
+    }
+
+
+
+    /**
+     * 支付宝转账
+     * @param out_biz_no        商家侧唯一订单号，由商家自定义。对于不同转账请求，商家需保证该订单号在自身系统唯一。
+     * @param trans_amount      订单总金额，单位为元，精确到小数点后两位
+     * @param order_title       转账业务的标题，用于在支付宝用户的账单里显示
+     * @param identity          参与方的唯一标识（收款方支付宝账号）
+     * @param name              参与方真实姓名，如果非空，将校验收款支付宝账号姓名一致性。
+     * @param remark            业务备注
+     * @return
+     * @throws Exception
+     */
+    public Map<String, Object> aliTransfer(String out_biz_no, Double trans_amount, String order_title, String identity, String name, String remark) throws Exception{
+        CertAlipayRequest certAlipayRequest = new CertAlipayRequest();
+        certAlipayRequest.setServerUrl("https://openapi.alipay.com/gateway.do");  //gateway:支付宝网关（固定）https://openapi.alipay.com/gateway.do
+        certAlipayRequest.setAppId(aliAppid);  //APPID 即创建应用后生成,详情见创建应用并获取 APPID
+        certAlipayRequest.setPrivateKey(appPrivateKey);  //开发者应用私钥，由开发者自己生成
+        certAlipayRequest.setFormat("json");  //参数返回格式，只支持 json 格式
+        certAlipayRequest.setCharset("UTF-8");  //请求和签名使用的字符编码格式，支持 GBK和 UTF-8
+        certAlipayRequest.setSignType("RSA2");  //商户生成签名字符串所使用的签名算法类型，目前支持 RSA2 和 RSA，推荐商家使用 RSA2。
+        certAlipayRequest.setCertPath(app_cert_path); //应用公钥证书路径（app_cert_path 文件绝对路径）
+        certAlipayRequest.setAlipayPublicCertPath(alipay_cert_path); //支付宝公钥证书文件路径（alipay_cert_path 文件绝对路径）
+        certAlipayRequest.setRootCertPath(alipay_root_cert_path);  //支付宝CA根证书文件路径（alipay_root_cert_path 文件绝对路径）
+        AlipayClient alipayClient = new DefaultAlipayClient(certAlipayRequest);
+        AlipayFundTransUniTransferRequest request = new AlipayFundTransUniTransferRequest();
+        request.setBizContent("{" +
+                "\"out_biz_no\":\"" + out_biz_no + "\"," +
+                "\"trans_amount\":" + trans_amount + "," +
+                "\"product_code\":\"TRANS_ACCOUNT_NO_PWD\"," +
+                "\"biz_scene\":\"DIRECT_TRANSFER\"," +
+                "\"order_title\":\"" + order_title + "\"," +
+                "\"payee_info\":{" +
+                "\"identity\":\"" + identity + "\"," +
+                "\"identity_type\":\"ALIPAY_USER_ID\"," +
+                "\"name\":\"" + name + "\"," +
+                "}," +
+                "\"remark\":\"" + remark + "\"" +
+                "}");
+        AlipayFundTransUniTransferResponse response = alipayClient.certificateExecute(request);
+        Map<String, Object> map = new HashMap<>();
+        if(response.isSuccess()){
+            String status = response.getStatus();
+            if(status.equals("SUCCESS")){//成功
+                map.put("code", response.getCode());
+                map.put("order_id", response.getOrderId());//支付宝订单号
+                map.put("pay_fund_order_id", response.getPayFundOrderId());//支付宝流水号
+            }else{
+                map.put("code", response.getCode());
+                map.put("sub_msg", response.getSubMsg());
+            }
+        } else {
+            map.put("code", response.getSubCode());
+            map.put("sub_msg", response.getSubMsg());
+        }
+        return map;
+    }
+
 
     /**
      * 获取请求内容
@@ -744,6 +1054,41 @@
     }
 
 
+    /**
+     * 微信下单的签名算法
+     * @param map
+     * @return
+     */
+    private String weixinSignature(Map<String, Object> map, String key_){
+        try {
+            Set<Map.Entry<String, Object>> entries = map.entrySet();
+            List<Map.Entry<String, Object>> infoIds = new ArrayList<Map.Entry<String, Object>>(entries);
+            // 对所有传入参数按照字段名的 ASCII 码从小到大排序（字典序）
+            Collections.sort(infoIds, new Comparator<Map.Entry<String, Object>>() {
+                public int compare(Map.Entry<String, Object> o1, Map.Entry<String, Object> o2) {
+                    return (o1.getKey()).toString().compareTo(o2.getKey());
+                }
+            });
+            // 构造签名键值对的格式
+            StringBuilder sb = new StringBuilder();
+            for (Map.Entry<String, Object> item : infoIds) {
+                if (item.getKey() != null || item.getKey() != "") {
+                    String key = item.getKey();
+                    Object val = item.getValue();
+                    if (!(val == "" || val == null)) {
+                        sb.append(key + "=" + val + "&");
+                    }
+                }
+            }
+            sb.append("key=" + key_);
+            String sign = MD5AndKL.MD5Encode(sb.toString(), "UTF-8").toUpperCase(); //注：MD5签名方式
+            return sign;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
 
     /**
      * 微信退款成功后的解密
diff --git a/cloud-server-course/src/main/java/com/dsh/course/util/httpClinet/HttpClientUtil.java b/cloud-server-course/src/main/java/com/dsh/course/util/httpClinet/HttpClientUtil.java
index 4458ff5..9c588b5 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/util/httpClinet/HttpClientUtil.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/util/httpClinet/HttpClientUtil.java
@@ -196,14 +196,14 @@
      * @return
      * @throws Exception
      */
-    public String pushHttpsRequsetXml(String url, String xml, Map<String, String> header, String certPassword, String certPath, String certType) throws Exception{
+    public static String pushHttpsRequsetXml(String url, String xml, Map<String, String> header, String certPassword, String certPath, String certType) throws Exception{
         HttpPost httpPost = new HttpPost(url);
         for(String key : header.keySet()){
             httpPost.setHeader(key, header.get(key));
         }
         httpPost.setHeader("Content-Type", "application/xml");
         httpPost.setEntity(new StringEntity(xml, "UTF-8"));
-        CloseableHttpClient httpCline = this.initCert(certPassword, certPath, certType);
+        CloseableHttpClient httpCline = initCert(certPassword, certPath, certType);
         CloseableHttpResponse httpResponse = httpCline.execute(httpPost);
         String content = null;
         if(httpResponse.getStatusLine().getStatusCode() == 200){
@@ -211,7 +211,7 @@
         }else{
             content = "返回状态码：" + httpResponse.getStatusLine() + "。" + EntityUtils.toString(httpResponse.getEntity());
         }
-        this.close(httpResponse);
+        close(httpResponse);
         httpCline.close();
         return content;
     }
@@ -224,7 +224,7 @@
      * @param certType  证书类型
      * @throws Exception
      */
-    private CloseableHttpClient initCert(String key, String certPath, String certType) throws Exception {
+    private static CloseableHttpClient initCert(String key, String certPath, String certType) throws Exception {
         KeyStore keyStore = KeyStore.getInstance(certType);
         InputStream inputStream = new FileInputStream(new File(certPath));
         try {
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java
index 1510dfa..3d89e03 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/ImgConfigController.java
@@ -4,6 +4,7 @@
 import com.dsh.other.entity.TImgConfig;
 import com.dsh.other.feignclient.model.UserBenefitImage;
 import com.dsh.other.service.TImgConfigService;
+import com.dsh.other.util.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -53,9 +54,9 @@
     @ApiImplicitParams({
             @ApiImplicitParam(value = "位置（1=无学员，2=成为会员，3=我的券包，4=线上商城，5=本周福利，6=今日免费）", name = "position", dataType = "int", required = true),
     })
-    public String querySystemImg(Integer position){
+    public ResultUtil<String> querySystemImg(Integer position){
         TImgConfig imgConfig = imgConfigService.getBaseMapper().selectOne(new QueryWrapper<TImgConfig>().eq("position", position));
-        return imgConfig.getContent();
+        return ResultUtil.success(imgConfig.getContent());
     }
 
 

--
Gitblit v1.7.1