新增押金记录，修改租车核销

ace-common/src/main/resources/properties/systemconfig.properties

@@ -42,10 +42,10 @@ ALIPAY_PID=2088531634846583
 #支付宝公钥
 ALIPAY_PUBLIC_KEY=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAj/EMaAD2iJP3I5M0g6pssDDe3RxF5I3ECM/Kz/btM0RiW2g5oRrHSjtGuos9l1QhQAY0SrVqa2eZdPKUB3ZqJdimQiXr3dbiMvG9UCs8vVUcrtCHCBjDllKQLiYzboxE6JLXyfII5tIXbFKiGyiEyXQnffUhQ9uGyT2EGWGecz6PLIjDdbwpxuzF2gIUzV3bPxb+0axejBxJ/3zKnWrsbyq2nvs8XrzrR2CEggNqgqsKzaacCL1yZjXzQRseSnCMtgSxR5W5afbdY0zqbUlLHUrUZ8ycCRC0ECuI9HyTbuqtdWHEZH7vIH44wEQWZPDRhMfMZvzmPUgpTWZLv5BtaQIDAQAB
 ALIPAY_ACOUNT=xxfc810@163.com
-ALIPAY_PRIVATE_KEY=MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC3bANag6my6pjHWqwnSCffRonvOXE6uQgNNb+V23PV55zfcuC+jIgl9BRrIf4tax5f2itfDmlOdAX6mK8WJ620SHg777Q2KlgNTa25ta3xiEfgkb01SX9VyiaLPpP2TEo5LhhRcT+cUomIufQbVbm/jS8mRQ0qBoofbMfr7n9fBSiVDx/QX07qcJTc/MGCy79H5gUiy2fTOEMhTuNtPkoU3az7jXMQ5U/33ILFAJzPCMNJvQnCYxs/y5loxxHdVqV8FnuCWGEWNViuuBtFRVRNXkrs/x99nF0V5/FHnOZzdM3SWrKCpA/52G5QQrbhZXUhMyCs9stXvH+iVUC1JJ9DAgMBAAECggEAOGRf/5MdOGHCCQCKjyUzBQVV4RPDCS/cFtughH1M9sXXyCc0i8D/FtQc9vcjg2k8lHGqBfaTT8iCEhKhOemHETd6p8rBmCmamrR4JfGCghDJMHT+PATVvlWBViwuJ3o7E6tlVJzB1tjVahDpyQGpMwhAJ77xFiueiZzTNmlEBb02ByCG95vkBV7NQT8yO9/1i3eq/tMoY7FfJP5O4LQ41RmqU9TVaAnTfuE6gs5hJboNGbmSMs2w2M0tldibmWcsQsFFPLwbUz042czSVb9J7lsGJjCtsaBeUiJ15y66W9D3587JJar9p+EyA2LNbolgrrNi2AA9KU5wEW2w8XyoOQKBgQDZamXDQZK3N5E46Hp/79o0Q99jqj9sL/HCYB4+Z8dG/Mgs43HHpgd+gHVeSOgxXS7RxsLyjCsM97ysWk7sbafvqtsnYmPU2MzumykVVpgWO6dpBcwmf2Ygk2i2W77oEqIi2IUmzkvDhw9C8A8/oh+IuoyRouPGRHpykAF+uXKVhwKBgQDX+TfQDDPniSnA9kTlW5I44glRgogA4xJtAYLtEr2fH9Pys+lkOyRqQH5wbJVj27jzJ0lffNyyMxgbZ8KRiH+3qRa8wNazwwXlXmj4DQWZedkULOpgMdU4EbbkTQRU3onEpMAZhAmVvAV1KTozs4RKi+1fFZ9V6ZOtmvapNJuXZQKBgQC7Xb0rQ3SMHwAxGfCQFwVma2O2AX883iisCaemwkrze1+Lh8uDcisdMtlzEsO/3v09XdydqHxlZY6cvgssJ+hFXGoXi+xa/yfFLcR/FixlZK2Gja99MeeyhTcFiRWB7KT8ALrnUXvrmpZlanrJrQ8eBx6jV8ySDmu0FTSkoG8GOwKBgE5toxX7CHJBPhdjlvtPOJdNhiLCaw8fZpaNIPVkg9WgIkCVkuCiFYQ8LW44EDv2E4DBOITje+V+Zne1Q1PEJNUWIzqiMJWQ8bgsg6PoXqswM2N/OBF8pzg4PplDWppTQeZWCah6aVylrbmxIgCaZSUJEUchO/5f1xAJIR+rCgF9AoGBAKJVVbrKPWshQ4cTL6VzanowjpWCRUDR22Oz3nKIdRl1FX+DTXYE4Dwl38iiNHOJptS7VjU553BUZl7HxCmSBWUmtnV78NNnRKrFVUhQhIRYBjMn1W6MD0jlBkky6yXmXkPtlqU6vU19RzGrvv6fDdBf6v4AkD8kWXiH5j4XEiQS
-
+ALIPAY_PRIVATE_KEY=MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC0wXVGAameVSLlLrq7edrMuoabN16/bYJNosLmPlHltEhehKO1ak/oIFvlKGyKwsW+xXd8t27p5hpsHqzNisU/jLbwEi6t0U/RBMbx3ult9zNhsZqSdJxe4QINChudVM6FdE8ssaq19ABwiLisMxxck0IiXDmesGI6vUSNzLEvKyYWTUsVsW1HgYXVjXmi8mOiwuFsJtdALS/psWci3UlX80rYG9KGqSBWT0B0Nr8UcM1L7UEkOHUEf1uq4Ipl5rTzgqoRQN5uHbBu50b7welAL2MFA9D/Ecv+FOfMIiLBtm1/6zNtjo/mvwORtS64mJXCaAbY1Pxa1bqs274fAwWtAgMBAAECggEAOObZ2zL0yZI1jP477H68wUxKyZwRqKN5rKT7Q+4EbBJn4dFRk++mvgVJyIcEPF56T8bsCYfZU6qLUNQLRB1WYN4UTNj8dt14ie0+D7BDvclfFHcLmOU6wKeGtMIk1U94QAzQS9qWSfdJGCQCNrtUR1RYMmbkAK+4DJO+fAEfGiCr1oMQpsz0h6Jhwp/DDBXZEjPdrECOjx2w5ZVULyPxFui2NQ8IS3rTT5SQvOBAgn9dbgZ/FVVbs2x6SpnWyOCUREK0uaLXJgf0JoX1WW4bswZlYmd7qURPscwFVKdYRautimcmO0FOUue62aPSYfvJwx8tTZanQbbwfrr0XrisBQKBgQDyKPYDYZzgGL/G5H8CQZajKnqg7a5AAZXJQLKkF7kiEgOlB3b6OqK6CeKVGawfuNIshECmmKcZmqrsPV42xrZl458kiDyqJNHq2lgFs9kj9BFUDi11EZfDGah4piJo5tgc09Hj6eAmeKdmG7aTS0/954xOK7eBFdG1T6R1Rd9Y4wKBgQC/Fhd5Nw6XYAg4qBmzOnvc9YwEL+wdy0aontFAFzaQlgkYm+efhYyjMcjyj4aloJZzpTd6eKbZI57IzihJI+F8+b1qToQDu8A2BTPkiOyXRcNY3y0LTNx7/gae6a9oGFc+8ILGa41va7WKjuPd08aXpSSBI34u10wWRMP+70m8LwKBgQCLerRYtjyZhyfO84WEUyrkyG7hioU3MLKJvM4oXdGwohefUnFhJ6za4x6zKppNmzLTmUlzq7FzufaBI8fEXShp/3WGoUHv7k1KrIDOqAyF/OqOM6xTJdL3+StkcqyXJ3+K+yaF1AvbnNsuoP/ETzi/0kKqM9v6agrkF/9t3NUMaQKBgCpafS1y1Jscv/W+3KNrLRUWn8g1zwHzkl/Bg+POwVtexflcZQRol3l8iWuqAFApve84CYntwB2U1ZbwiuFbQJlwyVkMuhoRvVK76HqZFseYwOmr3dIJYT1iWplSdnx+GKhsqq/MGvc9SmnBriP20qe+BM9SzJ8ZPVYaO87/vrolAoGARD8/IeEzMCPfYr9zBkE5rBtiT7t6nZXmMc6GH2Vao9meDofN8vj/XEfTGovusUYTWyA2Enac0YKdK6f6f+NYBqGYqn5Ludgxeotzo9UoXd3Hnv1gMCRs4ehloVODkHj2qhkvqL2iuZLsNp/wMq/ZHpRUzT4bO5H2FQhH4SUElKI=
+#
 #ALIPAY_APPID=2016100100641990
 #ALIPAY_PID=2088102178153042
 #ALIPAY_PUBLIC_KEY=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA47AID6hZLPRBUZ9sZT6PYuif6ii+W6OptEMhDCWaDNZsknK8eW2w3I3b57+/vtV8WMulBopvjIpOgIVooDLxZCiiDtymauNvGu7WkqTu1TSJ/brPphMjU0sWl5XyE4NcMpLZoQALCXd3b7AQP3K4vco8wcxBwdjj9Es6LB19iLnUPXK5LPPTvPR+nVihtnP6Bw2gFQZWCAALti6q9HT7c77agsPO6CGyx6dLoO9IFLFME+E2BvVVKbrdzHBl2yhLLTeT7wWFs35tAlFfX9vj7cFH/cozMJUdw0PyxtpDuBJGwu4XhYWD5O5YcuNGxbuPRMTAPwqCjvQ0q474gi9R6QIDAQAB
 #ALIPAY_ACOUNT=xxfc810@163.com
-#ALIPAY_PRIVATE_KEY=MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDZ9eBiJ+VeXuNrp1fxN7GX3qM7ZVFjlvaHu1wtkdXsXk7ICM6XgbnyCQA/QZg5pRiwUeGQyRed2dC8wA3xW1tE8qm7kvoBXaU6Laios9NvKkuVBgEEwEGuIm/yoPTVOsmEe6CPSTxrQLT6dGF45COk07QkyqzISjB4Zye73sfYiUVQxNi5izpjpYszapnM7gQ4cO5HoVWrXehLs+gAIo4q402RhC8BNSOogaUiDHysaqzysBGrdzSuEznisFJhdPyqlIAFcw+2oljtA02vs91Xt/Yb/odcVo+5lBMckDlCI8/ThKfW5J+pcpdehT7V664vwe+rXKsOl2jHbt9agRvtAgMBAAECggEBAKvHZ6+UZ+ZnfG9E9T9sOHBMDHPsVyfZO7Ufyfc0P9hJP2fR4RhxKl6CD4rLJLER2BJmhhL5Gb7Tgvqvlo2JBbaiVXk6zgSzjFv8zjcfetzbBbSOhdD7wQf/piEgD7XZ3iam1JT5EEArQDc/7+46R4lJPGneviwgpHDQQ/WCEBksKa1Y0CQO7IexUlgrIbT4D9SciQtljrCXyoQtSm1GatHNoXHHiZnLdVoIfUUpjpyODl/+ryhPV/r1Wzi0DU/GQNMQde1MQ0eI/ttVA9Xbq/gMs9YSFeLP+BWfGSppa/dbXihNF6nU9tPD10lUsJeUkn/GTcxMcWzH+NsqKVpPNxUCgYEA/DBJ/Quhi9OAqYChW7DsGi3lNndf9hKsEOYImFTueIo4QAo015Q5Xx2tDulXdOKo1J9Jh3BJsPvIsrQ295r12GtoVzwus/ed7/c1s/onYmOinEDkPwJtrK1xEyu1KSLSQyp/IJLYaDmqvM3vMgvH/DU2c1NORbwm8uu9opjojp8CgYEA3UEo26UxvT2d4/nSr2BNU3HCgI46nM++DaO2sB8PB8iQgqopuxxobgqzKij9z3qDDGvwaOZY9xp2O3A9BqMrhSqct8chQTS5WWaM9YBR8RlhqhNMTV9bgf1JX3Eq41Aqpkf9dGW7nP5RGX1Zxrm1VkFCCjEE1hzFIuXzrfJjZfMCgYEA+2RfvSJFDY/u6AlT0IVTNt2damghfrkqUUYeN0wi1IJkhGIoPuaBMnHwu7ab+eagiiOnNp4Wt5imfo3rZXRRskWPo7ZYkAo8pKN4I0swy4Gq7bw6Sx1umv3ihEvDsZgGpfHM/HmlxHAH5WIcGXVpC983wkq+8gEXiny5c0aePN0CgYBNzOzWF4ee+Ly9fop0OtPWBMmVNO4tV+uHlkrWMYWygfc2yykzb3DVSRPpPlLJk1Xjl00JRf6AnaB3lCcRX20dPXewM+hgqm6GnkXwyfeGZRtvl6ucBW0DD5KuafffyL/Gisf4FxHayZ6w7OAVvhWix/214bjGpYU4mU2PnA0RuwKBgQCCwSyfEysQKsAUJvw2d9uXNRvIs5uMeVOWIeRueZ+UqdmUd5jiOU0HhetPywys9ojBYJmR3zXDX/KTH+WNsVLm4esUge7LTVvgGPVDRvC9Xe2Ec7HhJb+xR0+lK+xZZXWmPdXPT1u8YE3V+SsyLl/xUu6jXXbl255ynWUMATuySA==
\ No newline at end of file
+#ALIPAY_PRIVATE_KEY=MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCdbAo5X1ZjE4EcbUAYfv09u1MLOjOxoYcIfmwgpXtwMW7p5rkGPrRo/MZa/UQRN37iKwUXisHcU+Xb84JJgqgy7PFAqZHsnXTEMXgW5+0ji951kDSoFh0gD412CHpUQPBdhQzLet12N93CkpiMAdDzhh7UxzNDeW0EJsYbUWbdVhuQlYmpxu6P6TL18fjYW3h6SoffB9yqLuyHY5bacYCat1Uuy4LRQMBOjMar3OaNKh/lAu6ol9GZgDgRAddCv8O4FmC0F5s9R7r+tSuscG5CDN7GLo6dR+hfOnLq5x5VxPQVG1xd89Fb01QWyVWje/t+cURPJA8Jar87cxvn5KVBAgMBAAECggEAYx/r1DKPH/XhH7g/Wu1jouJ4qSIt+NUART3t8iShdIT8FTaeHSuQyGcas6K0oK60K8/w9eD+rzD5FSXhTU6DgQWn6BKee0Kuivenaa0CqpZhLt/t+EVsc4q3hbJS7QizEgA8jUhBeTY2YlWSzt455431jgAc7IjiN3H+3qbEQewAI1EsbmuOXTZej84l3vBpFFLufIkVAEb+ZtSj3feu5cpgBZft1i4P1qeYvays9tJhK8R6LyvMu+hqPfYvvDFG4UQhXeB14LjPX7HVIt3z6mhOoeaeB+lhT0v8adYhV6pCx9w/RGQ1UNEorIq+ERwQM/LkdJNXuMV4JbOU565xEQKBgQDXOo4zRQL/RkW5cEG9RvGAZFqDK2qYdmN79IfTurAYIcSqXA2PLNyJUSwYB/Da/8DBPB89Bfb2Wx/XRgkK8mc9qtTC9VNJ/7J+Mqg32sdtIEtDpkVvjDvbb6DzcUihPKI0HQXadBhfCmtT8jfxv3GlcRkZTUGvNnGSM71lrDz6NQKBgQC7PisFhvpPTPvh2gbfcgjtdFxs/4xCYFLO8tt/UOPZzSPjFT5uCV9rXIr81XRWni8Jy30R0qGTnRWeZcPnF48QfF4BddO/OkDs0YCP3SFBJlhxo/m47DCDay2CV5oW2nISQf+jq0Rhcb3/JvKO4DMY8Ps8rAqbv889n5kcJH7AXQKBgQC0qe5bkv5lEbPNaTGFlFt8DsD7giJEQHxZvHWXgQn398CB0CuBl4K3sW917JR9AFno2nLOYodfXDZqGdvVWIzY8uENlaiIYR6PWC5kVD06mPUUoCmA7RIBrL5KGzmAPslZPVOAgBtFDBXzrUrQnobi/QC4gGU2kljbBJtjESVOUQKBgAWCJrHa7rI2iZJzX5BjQm/55F4whmfNfaIo8twj/RADQPMFRPjnva7i4hPeE7YYoTmgiuVjVO2KyYAHbmP2BXdusTVJyhjuFcrhvu58iuXnwuJU+JvAFw1GsegLu7TAaGqxFlwyRai4N+axtqENZ3NsY3e9d/JtCiO99jslt7ThAoGAA1cgO8divDd1KgCGyIdZKC45cymj1Iuwt5fU/f1GZfNxcLwXfACw5Du9orwyr5fHTuqRVvYzBciJKh881zsiI8+3IQiKnv1xO5xKWG6A503++NwyvLZM9ojoURtW/e6oWZWFbWcm320TFeihVaizGHGaoaouJpznC9Iqysj1XIo=
\ No newline at end of file

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/entity/IntegralRule.java

@@ -138,6 +138,6 @@ public class IntegralRule{
     private String btnWord;
 
     @Transient
-    private Boolean integralStatus = false;
+    private Boolean integralStatus;
 
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderVehicleCrosstownController.java

 package com.xxfc.platform.order.rest;
 
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.activity.user.UserInfoBiz;
 import com.xxfc.platform.order.biz.BaseOrderBiz;
 import com.xxfc.platform.order.biz.OrderUserLicenseBiz;
 import com.xxfc.platform.order.biz.OrderVehicleCrosstownBiz;
@@ -28,7 +30,8 @@ public class OrderVehicleCrosstownController {
 
     @Autowired
     BaseOrderBiz baseOrderBiz;
-
+    @Autowired
+    UserInfoBiz userInfoBiz;
     @PostMapping(value = "/add")
     @ApiOperation(value = "添加交还车记录")
     public ObjectRestResponse<OrderVehicleCrosstownDto> add(@RequestBody OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
@@ -45,6 +48,10 @@ public class OrderVehicleCrosstownController {
     @GetMapping(value = "/getByOrderId")
     @ApiOperation(value = "根据订单Id获取所有记录信息")
     public ObjectRestResponse<List<OrderVehicleCrosstownDto>> getByOrderId(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
+        UserDTO userDTO = userInfoBiz.getAdminUserInfo();
+        if (userDTO == null) {
+            return ObjectRestResponse.createFailedResult(508, "token is null or invalid");
+        }
         if (orderVehicleCrosstownDto == null) {
             return ObjectRestResponse.createFailedResult(500, "参数orderId为空");
         }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -64,7 +64,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
     @Value("${universal.url}")
     String weixinHost;
 
-
+    String notifyUrl = weixinHost + "/service/payment/notify/alipay";
 
     public JSONObject preparepay(OrderPayVo orderPayVo) {
         if (null == orderPayVo) {
@@ -100,13 +100,13 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
         log.info("报名费回调路径notify_url:" + notify_url);
         Integer payWay = orderPayVo.getPayWay() == null ? 1 : orderPayVo.getPayWay();
         String sellerAccount = null;
-        if (type == 2 && payWay == 1) {//微信网页支付
+        if (type == 2 && payWay == 1) {
             sellerAccount = SystemConfig.APP_PARTNER;
             jsParam = WXPay.webPay(amount + "", orderPayVo.getBody(), notify_url, trade_no, orderPayVo.getBuyerIp(), orderPayVo.getBuyerAccount());
-        } else if (type == 1 && payWay == 1) {//微信APP支付
+        } else if (type == 1 && payWay == 1) {
             sellerAccount = SystemConfig.APP_PARTNER;
             jsParam = WXPay.apppay(amount + "", orderPayVo.getBody(), notify_url, trade_no, orderPayVo.getBuyerIp(), 0);
-        } else if (type == 1 && payWay != 1 && payWay != 3) {//支付宝APP支付,或预授权支付
+        } else if (type == 1 && payWay == 2) {
             sellerAccount = SystemConfig.ALIPAY_PID;
             jsParam = generateAliPayment(orderPayVo);
         }
@@ -275,24 +275,22 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
      *
      * @return
      */
+    @SuppressWarnings("rawtypes")
     private String generateAliPayment(OrderPayVo orderPayVo) {
+
         //实例化客户端
         AlipayClient alipayClient = new DefaultAlipayClient(SystemConfig.ALIPAY_PAY_BASE_URL + "/gateway.do",
                 SystemConfig.ALIPAY_APPID, SystemConfig.ALIPAY_PRIVATE_KEY, AlipayConstants.FORMAT_JSON,
-                "UTF-8", SystemConfig.ALIPAY_PUBLIC_KEY, AlipayConstants.SIGN_TYPE_RSA2);
-        String notifyUrl = weixinHost + "/service/payment/notify/alipay";
-        orderPayVo.setNotifyUrl(notifyUrl);
+                "utf-8", SystemConfig.ALIPAY_PUBLIC_KEY, AlipayConstants.SIGN_TYPE_RSA2);
+
+        //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
+        log.info("秘钥：" + SystemConfig.ALIPAY_PRIVATE_KEY);
         try {
-            if (orderPayVo.getPayWay() == 2) { //支付宝APP支付
-                log.info("=============支付宝APP支付================");
-                return appOrderPay(alipayClient, orderPayVo);
-            } else { //预授权
-                log.info("=============支付宝预授权支付================");
-                return fundAuthOrderAppFreeze(alipayClient, orderPayVo);
-            }
+            return appOrderPay(alipayClient, orderPayVo);
         } catch (Exception e) {
             e.printStackTrace();
         }
+//
         return null;
     }
 
@@ -301,23 +299,17 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
         BigDecimal realAmount = new BigDecimal(orderPayVo.getAmount().toString()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_UP);
         AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
         //SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
-//        request.setBizContent("{" +
-//                "\"total_amount\":\"" + realAmount.toString() + "\"," +
-//                "\"subject\":\"" + orderPayVo.getSubject() + "\"," +
-//                "\"body\":\"" + orderPayVo.getBody() + "\"," +
-//                "\"out_trade_no\":\"" + orderPayVo.getTradeNo() + "\"" +
-//                "  }");
         request.setBizContent("{" +
-                "\"total_amount\":\"0.01\"," +
-                "\"subject\":\"大乐透\"," +
-                "\"out_trade_no\":\"70501111111S001111119\"" +
+                "\"total_amount\":\"" + realAmount + "\"," +
+                "\"subject\":\"" + orderPayVo.getSubject() + "\"," +
+                "\"out_trade_no\":\"" + orderPayVo.getTradeNo() + "\"" +
                 "  }");
         request.setNotifyUrl(orderPayVo.getNotifyUrl());
-        log.info("请求参数：param = {}", request.getBizContent());
         try {
             //这里和普通的接口调用不同，使用的是sdkExecute
             AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request);
             log.info(response.getBody());//就是orderString 可以直接给客户端请求，无需再做处理。
+
             return response.getBody();
         } catch (AlipayApiException e) {
             e.printStackTrace();
@@ -329,6 +321,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
     //预授权冻结
     public String fundAuthOrderAppFreeze(AlipayClient alipayClient, OrderPayVo orderPayVo) throws AlipayApiException {
         AlipayFundAuthOrderAppFreezeRequest request = new AlipayFundAuthOrderAppFreezeRequest();
+        AlipayFundAuthOrderAppFreezeModel model = new AlipayFundAuthOrderAppFreezeModel();
         BigDecimal realAmount = new BigDecimal(orderPayVo.getAmount().toString()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_UP);
         request.setBizContent("{" +
                 "\"auth_code\":\"" + orderPayVo.getTradeNo() + "\"," +
@@ -362,7 +355,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
         //选填字段，信用授权订单，针对信用全免订单，传入该值完结信用订单，形成芝麻履约记录
         // model.setExtraParam("{\"unfreezeBizInfo\":\"{\\\"bizComplete\\\":\\\"true\\\"}\"}");
         request.setBizModel(model);
-        request.setNotifyUrl("");//异步通知地址，必填，该接口只通过该参数进行异步通知
+        request.setNotifyUrl(notifyUrl);//异步通知地址，必填，该接口只通过该参数进行异步通知
         AlipayFundAuthOrderUnfreezeResponse response = alipayClient.execute(request);
         log.info("response: {}" + response.getBody());
     }
@@ -463,4 +456,4 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
         }
 
     }
-}
\ No newline at end of file
+}