From aa2c6d722ed799290285b6365f011aaa74373d73 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期六, 23 十二月 2023 17:30:07 +0800
Subject: [PATCH] 11.27,9

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java |  537 +++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 351 insertions(+), 186 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
index c54b43b..6596af1 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
@@ -9,9 +9,11 @@
 import com.alipay.api.request.AlipayMerchantIndirectAuthorderCreateRequest;
 import com.alipay.api.request.AlipayMerchantIndirectAuthorderQuerystatusRequest;
 import com.alipay.api.request.AntMerchantExpandIndirectImageUploadRequest;
+import com.alipay.api.request.AntMerchantExpandIndirectZftCreateRequest;
 import com.alipay.api.response.AlipayMerchantIndirectAuthorderCreateResponse;
 import com.alipay.api.response.AlipayMerchantIndirectAuthorderQuerystatusResponse;
 import com.alipay.api.response.AntMerchantExpandIndirectImageUploadResponse;
+import com.alipay.api.response.AntMerchantExpandIndirectZftCreateResponse;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -26,15 +28,19 @@
 
 import com.dsh.guns.modular.system.util.ResultUtil;
 
+import com.github.binarywang.wxpay.service.BankService;
 import com.mysql.cj.x.protobuf.MysqlxExpr;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 
@@ -60,8 +66,9 @@
     private IOperatorAuthService operatorAuthService;
     @Autowired
     private IStoreService storeService;
-
-
+    private String appPrivateKey = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCi5i9nW/hGLJ3A06cZxTQdviFC7THpdSihoTYGLr9q006hu0V26ecBMY/o4w5bvIX0Ok/yofmZsVcCJpAPvbXL/uqVrIjnRRxXiaeBFThlxoBUTdunvbUSDYfzlEhJr5NvUKI6H6lz2niXlQGx4qy8Hau4ccWit9kM8jwUvsBVQoFgJA+xrjMvooA7YLopQtpOD+UJr5thApTSf1xrnr1W12yolTLEH15JmNV372cqXrYUuqnY0QsaPtxeqJUGAOcGdVLllQ7easEznP8DFBvDdHATcmp2SHNQDUEWN6MCVPbMgY06NQVqAXxqjTAYSVh+6TRu6bofPmpYC3TZB003AgMBAAECggEBAJAcR2+PA3NBYUYHeFrqBRMS8uX8ZR19kjZ7IgoSLTFaQsP9opRylPSPXhrPVBKAE5leRQAHn4MCSlESwHvMfxo7KFjFTFAc6dffZZpipYQUOc9bGampwJh58/3e/pyBgVMG6J23CPf/HJQtNFSkjd/V9+ayb/9l2dUEL3bC0fAZ/dbx8HsxdLw8wn3fLlWLj68hOMqa2deCZe3JdSVsPbeWqkh56FFsMLug0Nd+Ar4TgRl9/jnhXF0JWiD0LmPUYLhboY7EfUBzN4w1iYbDi1P+3zvoOYsiVKAXox9GMhQ2VzOO2UcSTuizSza2e98mGpabl/GpKmCz+RDFjtkX6eECgYEA2MyCij65eO3aGIm3FUe93DULRBYTfX8qJQSJq2WOWA3mmQlEW6L3O2B5/lG2h+8WmN6iLEs9eHpgycGYp7vAqgrANEn16ACVcuyx0scFtrZfZ+kmHMzFfiUWxJjVYk/6YngsGVBLdw6ueM42C8TTP67X9tU5TdVGoGWuqEj4W98CgYEAwFqwprXOch5Pqk/RPbb49r0Ou03K/UbciWnWWKzUhFFNS8MdlQPoDvQZbMwHLeWsa2VhaKITK3x5biLQb3U+0GLOn6lTvEyrEUH+ucREyLgVYTRAvwBPtnvlrzpyxPk2HnslQjju8WrvvLLBMKWUjlTrTOzhaHT21gz3pHMiOakCgYEAhLmfaXdBITGshb054sNLDtdCkGpbgEcrzAHdLps769iGxkYQHXHFngpQZUwtTUcoNGqIKknd1jZFrv7gsD+XkgKG7PwimehRlkwmCX5ilxtLiVgJRzRt6+5U5AMVD90a0tHzXYP0z2yjj73fBJF5KtGl0a10KZxaYrQdm1UhB00CgYBZZgzx/k9rtHC8LAqIj1CYhHejT92G53c6Gkl3vyOqN4sgKhfGmSEySfrDGPRBPZxr8ZtbIPCd5mUdberH0osWGMYFaJI1UsCy7aQwvGpniz7MhZeN7dweaOjwDs8mgtjHQ96mL4XGCDhR0BZ/wIURvZ/6iaGdhbbu9unlsWj3uQKBgQCmZYdsbbZkd3ev6f8rwyvMz+DrCQyYpY44cegBYuJgrZiQnL2fJioeN7ixX0UM48SfwsZEIrzshP/LGAwnc2MdjxKUl4jLN8SEe0NAjXOnz9Zaw740+aOmLpXcLWdP4uM2gIhWsvW1tEkQZCXmm7c9s/RsU8Pmzv+YL3+fSijOzA==";//支付宝开发者应用私钥
+    private String alipay_public_key = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmu8n/4yTHWbn7VOrNc9OsLtDL1bEQ8gC1dHkj8Wy5z0mkaOsjJRIG/28ze12M0V8jdCKuuDr5Z1OPKiqf+XO3ypguEh+mYUVMBM/cZodDFQfTY1TKLWjvQCuaqlA+QUTCK6f7T7stsgyQ1o9Jj0rXZDz6PM4QHSTzjrLIBaeqM5WIBvH+fy/X+QG5Utd+/UT0kc0JyvuKhZ65yVUd/C9VcwJJAPliRsAQNrqYterwAJ9zvw9tF11wj9W0XgJ8Ccu4x3gR1vrlLRJJo/OA97RmxPQ+5hSacWQZCUd1dwiBq+YCrKVHGTj14izRHXrLc0yBlRXo7tBOIqcy3IsvKVthQIDAQAB";//支付宝支付公钥
+    private String aliAppid = "2021004105665036";//支付宝appid
     /**
      * 根据运营商id查询所有门店
      */
@@ -149,6 +156,7 @@
         page.setRecords(list);
         return super.packForBT(page);
     }
+
     /**
      * 跳转运营商商户去认证页面
      */
@@ -159,12 +167,13 @@
         User byId = userService.getById(data.getUserId());
         model.addAttribute("user",byId);
         List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
-        model.addAttribute("provinceList",list);
+        model.addAttribute("list",list);
         model.addAttribute("data",data);
-        OperatorAuth info = operatorAuthService.getOne(new QueryWrapper<OperatorAuth>().eq("operatorId", id));
+        OperatorAuthAlipay info = operatorAuthService.getOne(new QueryWrapper<OperatorAuthAlipay>().eq("operatorId", id));
         model.addAttribute("item",info);
+
         if (info==null){
-            OperatorAuth operatorAuth = new OperatorAuth();
+            OperatorAuthAlipay operatorAuth = new OperatorAuthAlipay();
             model.addAttribute("item",operatorAuth);
             model.addAttribute("bodyType",0);
             model.addAttribute("code",null);
@@ -172,49 +181,156 @@
             // 0不显示二维码
             model.addAttribute("type",0);
         }else{
-            if (info.getOrderStatus().equals("AUDIT_PASS")||info.getOrderStatus().equals("LEGAL_CONFIRM")||info.getOrderStatus().equals("CONTACT_CONFIRM")){
-                // 通过才展示二维码
-                model.addAttribute("type",1);
-            }else{
-                model.addAttribute("type",0);
-            }
-            model.addAttribute("code",info.getQrCode());
-            model.addAttribute("item",info);
             model.addAttribute("bodyType",info.getBodyType());
-            if (info.getRefuseReason()!=null && (!info.getRefuseReason().equals(""))){
-                model.addAttribute("reasons",info.getRefuseReason());
-            }else{
-                model.addAttribute("reasons",null);
-            }
+            model.addAttribute("accountType",info.getAccountType());
+            model.addAttribute("useType",info.getUseType());
+            model.addAttribute("cardType",info.getCardType());
+            model.addAttribute("reasons",info.getRefuseReason());
+//            TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, info.getCityCode()));
+//            List<TCity> district = cityService.list(new QueryWrapper<TCity>().eq("parent_id", one.getId()));
+//            model.addAttribute("district",district);
+//            if (info.getOrderStatus().equals("AUDIT_PASS")||info.getOrderStatus().equals("LEGAL_CONFIRM")||info.getOrderStatus().equals("CONTACT_CONFIRM")){
+//                // 通过才展示二维码
+//                model.addAttribute("type",1);
+//            }else{
+//                model.addAttribute("type",0);
+//            }
+//            model.addAttribute("code",info.getQrCode());
+//            model.addAttribute("item",info);
+//            model.addAttribute("bodyType",info.getBodyType());
+//            if (info.getRefuseReason()!=null && (!info.getRefuseReason().equals(""))){
+//                model.addAttribute("reasons",info.getRefuseReason());
+//            }else{
+//                model.addAttribute("reasons",null);
+//            }
 
 
         }
         return PREFIX + "OperatorUser_proportionAuth.html";
     }
+    /**
+     * 跳转运营商商户去认证页面 详情页面
+     */
+    @RequestMapping("/proportionAuth1/{id}")
+    public String proportionAuth1(Model model,@PathVariable("id") Integer id) {
+        model.addAttribute("id",id);
+        TOperator data = operatorService.getById(id);
+        User byId = userService.getById(data.getUserId());
+        model.addAttribute("user",byId);
 
+        model.addAttribute("data",data);
+        OperatorAuthAlipay info = operatorAuthService.getOne(new QueryWrapper<OperatorAuthAlipay>()
+                .eq("operatorId", id));
+        model.addAttribute("item",info);
+        List<TCity> list1 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+        model.addAttribute("list1",list1);
+        if (StringUtils.hasLength(info.getProvince())){
+            // 获取银行开户省
+            List<TCity> list4 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+            // 获取银行开户市
+            TCity city = cityService.getOne(new QueryWrapper<TCity>().eq("code", info.getProvinceCode()));
+            List<TCity> list5 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, city.getId()));
+            model.addAttribute("list4",list4);
+            model.addAttribute("list5",list5);
+        }else{
+            List<TCity> list6 = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+            model.addAttribute("list4",list6);
+        }
+
+
+
+        model.addAttribute("bodyType",info.getBodyType());
+        model.addAttribute("accountType",info.getAccountType());
+        model.addAttribute("useType",info.getUseType());
+        model.addAttribute("cardType",info.getCardType());
+        model.addAttribute("reasons",info.getRefuseReason());
+
+
+
+//            TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, info.getCityCode()));
+//            List<TCity> district = cityService.list(new QueryWrapper<TCity>().eq("parent_id", one.getId()));
+//            model.addAttribute("district",district);
+//            if (info.getOrderStatus().equals("AUDIT_PASS")||info.getOrderStatus().equals("LEGAL_CONFIRM")||info.getOrderStatus().equals("CONTACT_CONFIRM")){
+//                // 通过才展示二维码
+//                model.addAttribute("type",1);
+//            }else{
+//                model.addAttribute("type",0);
+//            }
+//            model.addAttribute("code",info.getQrCode());
+//            model.addAttribute("item",info);
+//            model.addAttribute("bodyType",info.getBodyType());
+//            if (info.getRefuseReason()!=null && (!info.getRefuseReason().equals(""))){
+//                model.addAttribute("reasons",info.getRefuseReason());
+//            }else{
+//                model.addAttribute("reasons",null);
+//            }
+
+        return PREFIX + "OperatorUser_proportionAuth_info.html";
+    }
+    /**
+     * 根据所选市 获取区
+     */
+    @RequestMapping(value = "/getDistrict")
+    @ResponseBody
+    public Object onChange(String cityCode) {
+        try {
+            TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, cityCode));
+            List<TCity> parent_id = cityService.list(new QueryWrapper<TCity>().eq("parent_id", one.getId()));
+            return parent_id;
+        }catch (Exception e){
+            e.printStackTrace();
+            return ERROR;
+        }
+    }
+    public static void main(String[] args) {
+        String bankName = "中国工商银行"; // 要转换为简写的银行名称
+
+        Pattern pattern = Pattern.compile("([\\u4e00-\\u9fa5]+)(?=\\s+[A-Za-z]+$)");
+        Matcher matcher = pattern.matcher(bankName);
+        if (matcher.find()) {
+            System.out.println(matcher.group()); // 输出结果:"工商银行" -> "ICBC"
+        } else {
+            System.out.println("无法识别该银行名称!");
+        }
+    }
     /**
      * 支付宝商户认证提交
      */
     @RequestMapping(value = "/auth")
     @ResponseBody
-    public Object auth(String beneficiaryEnd,String businessEnd,String legalEnd, String name,String phone,String number
-            ,Integer operatorId,String bodyType,Integer type,String businessName,String businessNumber,
-                       String legalRepresentative,String registerAddress,String businessTerm,String businessPicture,
-                       String legalPerson,String legalNumber,String legalPhone,String legalEmail,String legalTerm,
-                       String legalAddress,String legalFront,String legalBack,Integer accountType,String bank,
-                       String accountName,String province,String provinceCode,String city,String cityCode,
-                       String bankName,String bankNumber,String isBeneficiary,String beneficiary,String beneficiaryPhone,
-                       String beneficiaryNumber,String beneficiaryAddress,String beneficiaryTerm,String beneficiaryFront,String beneficiaryBack,
-                       String remark) {
+    public Object auth(Integer operatorId,String bodyType,String businessName,String aliasName,String businessNumber,
+                       String license,String name,String phone,String shopProvinceCode,String shopProvince,String shopCityCode,
+                       String shopCity, String shopDistrictCode,String shopDistrict,String registerAddress,String legalPerson,
+                       String leagleNumber,String legalFront,String legalBack,String accountType,String alipayAccount,
+                       String bankCard,String useType,String cardType,String bankName,String bankNameTwo,
+                       String accountName,String provinceCode,String province,String cityCode,String city,String zfbAccount,
+                       String iqImage) {
         UUID uuid = UUID.randomUUID();
-        OperatorAuth data = operatorAuthService.getOne(new QueryWrapper<OperatorAuth>().eq("operatorId", operatorId));
-        OperatorAuth operatorAuth = new OperatorAuth();
+        // 通过运营商id查询
+        TOperator byId = operatorService.getById(operatorId);
+        Integer userId1 = byId.getUserId();
+        OperatorUser userId2 = operatorUserService.getOne(new QueryWrapper<OperatorUser>()
+                .eq("userId", userId1));
+        // 0未认证 1待审核 2通过 3驳回
+        userId2.setAlipayAudit(1);
+        operatorUserService.updateById(userId2);
+        OperatorAuthAlipay data = operatorAuthService.getOne(new QueryWrapper<OperatorAuthAlipay>().eq("operatorId", operatorId));
+        String group="ABC";
+//        if(StringUtils.hasLength(bankName)){
+//            Pattern pattern = Pattern.compile(".*[\\u4e00-\\u9fa5]+"); // 只保留汉字部分
+//            Matcher matcher = pattern.matcher(bankName);
+//            group = matcher.group();
+//            if (matcher.find()) {
+//                System.out.println("银行名称简写为:" + matcher.group());
+//            } else {
+//                System.out.println("无法获取到银行名称简写!");
+//                return 5007;
+//            }
+//        }
+
+        OperatorAuthAlipay operatorAuth = new OperatorAuthAlipay();
         if (data!=null){
             operatorAuth.setId(data.getId());
-            if(businessPicture==null || businessPicture.equals("")){
-                operatorAuth.setBusinessPicture(data.getBusinessPicture());
-                businessPicture = data.getBusinessPicture();
-            }
             if(legalFront==null || legalFront.equals("")){
                 legalFront = data.getLegalFront();
                 operatorAuth.setLegalFront(data.getLegalFront());
@@ -223,16 +339,21 @@
                 legalBack = data.getLegalBack();
                 operatorAuth.setLegalBack(data.getLegalBack());
             }
-            if(beneficiaryFront==null || beneficiaryFront.equals("")){
-                beneficiaryFront = data.getBeneficiaryFront();
-                operatorAuth.setBeneficiaryFront(data.getBeneficiaryFront());
+            if(iqImage==null || iqImage.equals("")){
+                iqImage = data.getIqImage();
+                operatorAuth.setIqImage(data.getIqImage());
             }
-            if(beneficiaryBack==null || beneficiaryBack.equals("")){
-                beneficiaryBack = data.getBeneficiaryBack();
-                operatorAuth.setBeneficiaryBack(data.getBeneficiaryBack());
+
+            if(license==null || license.equals("")){
+                license = data.getCertImage();
+                operatorAuth.setCertImage(data.getCertImage());
             }
         }else{
-            if(businessPicture==null || businessPicture.equals("")){
+            operatorAuth.setLegalFront(legalFront);
+            operatorAuth.setLegalBack(legalBack);
+            operatorAuth.setIqImage(iqImage);
+            operatorAuth.setCertImage(license);
+            if(license==null || license.equals("")){
                 // 未上传营业执照
                 return 5001;
             }
@@ -244,194 +365,238 @@
                 // 未上传法人身份证背面照
                 return 5003;
             }
-            if (businessPicture!=null && businessPicture.equals("ENTERPRISE")){
-                if(beneficiaryFront==null || beneficiaryFront.equals("")){
-                    // 未上传受益人身份证正面照
-                    return 5004;
-                }
-                if(beneficiaryBack==null || beneficiaryBack.equals("")){
-                    // 未上传受益人身份证背面照
-                    return 5005;
-                }
-            }
         }
         String numericUUID = uuid.toString().replaceAll("-", "");
+        operatorAuth.setOutBizNo(numericUUID);
+        operatorAuth.setOperatorId(operatorId);
+        operatorAuth.setRegisterAddress(registerAddress);
+        operatorAuth.setAliasName(aliasName);
+        operatorAuth.setBodyType(bodyType);
         operatorAuth.setName(name);
         operatorAuth.setPhone(phone);
-        operatorAuth.setNumber(number);
-        operatorAuth.setBusinessEnd(businessEnd);
-        operatorAuth.setLegalEnd(legalEnd);
-        operatorAuth.setBeneficiaryEnd(beneficiaryEnd);
-        operatorAuth.setOperatorId(operatorId);
-        operatorAuth.setBodyType(bodyType);
-        operatorAuth.setType(type);
         operatorAuth.setBusinessName(businessName);
         operatorAuth.setBusinessNumber(businessNumber);
-        operatorAuth.setLegalRepresentative(legalRepresentative);
-        operatorAuth.setRegisterAddress(registerAddress);
-        operatorAuth.setBusinessTerm(businessTerm);
-        operatorAuth.setOutBizNo(numericUUID);
-        operatorAuth.setBusinessPicture(businessPicture);
+        operatorAuth.setCertImage(license);
         operatorAuth.setLegalPerson(legalPerson);
-        operatorAuth.setLeagleNumber(legalNumber);
-        operatorAuth.setLegalPhone(legalPhone);
-        operatorAuth.setLegalEmail(legalEmail);
-        operatorAuth.setLegalTerm(legalTerm);
-        operatorAuth.setLegalAddress(legalAddress);
         operatorAuth.setLegalFront(legalFront);
         operatorAuth.setLegalBack(legalBack);
+        operatorAuth.setLeagleNumber(leagleNumber);
         operatorAuth.setAccountType(accountType);
-        operatorAuth.setBank(bank);
+        operatorAuth.setBankName(bankName);
         operatorAuth.setAccountName(accountName);
+        operatorAuth.setBankCard(bankCard);
         operatorAuth.setProvince(province);
         operatorAuth.setProvinceCode(provinceCode);
         operatorAuth.setCity(city);
         operatorAuth.setCityCode(cityCode);
-        operatorAuth.setBankName(bankName);
-        operatorAuth.setBankNumber(bankNumber);
+        operatorAuth.setShopCity(shopCity);
+        operatorAuth.setShopProvince(shopProvince);
+        operatorAuth.setShopProvinceCode(shopProvinceCode);
+        operatorAuth.setShopCityCode(shopCityCode);
+        operatorAuth.setProvince(province);
+        operatorAuth.setProvinceCode(provinceCode);
+        operatorAuth.setShopDistrict(shopDistrict);
+        operatorAuth.setShopDistrictCode(shopDistrictCode);
+        operatorAuth.setAlipayAccount(alipayAccount);
+        operatorAuth.setUseType(useType);
+        operatorAuth.setCardType(cardType);
+        operatorAuth.setBankNameTwo(bankNameTwo);
         operatorAuth.setAuditState(0);
-        operatorAuth.setIsBeneficiary(isBeneficiary);
-        operatorAuth.setBeneficiary(beneficiary);
-        operatorAuth.setBeneficiaryNumber(beneficiaryNumber);
-        operatorAuth.setBeneficiaryAddress(beneficiaryAddress);
-        operatorAuth.setBeneficiaryTerm(beneficiaryTerm);
-        operatorAuth.setBeneficiaryFront(beneficiaryFront);
-        operatorAuth.setBeneficiaryBack(beneficiaryBack);
         operatorAuth.setRefuseReason("");
-        operatorAuth.setRemark(remark);
+        operatorAuth.setZfbAccount(zfbAccount);
         // 将图片上传至阿里存储
         // 营业执照
-        String string = uploadImg(businessPicture).toString();
+        String string = uploadImg(license).toString();
         // 法人身份证正面照
         legalFront = uploadImg(legalFront).toString();
         // 法人身份证背面照
         legalBack = uploadImg(legalBack).toString();
-
-        if (bodyType.equals("ENTERPRISE")){
-            // 受益人身份证正面照
-            beneficiaryFront=uploadImg(beneficiaryFront).toString();
-            // 受益人身份证背面照
-            beneficiaryBack=uploadImg(beneficiaryBack).toString();
-        }
-
-
+        // 商户行业资质图片
+        iqImage = uploadImg(iqImage).toString();
+        operatorAuthService.saveOrUpdate(operatorAuth);
+        // todo 填写申请单
         //第二步:提交申请单
-        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do","2021003199648333",
-                "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCXnbOiY2VkKb5ubpcwKqzmqbKotpKGA79yn2aQeZiTWhqmLdCKjVp64naGpnOQEC7hDZluOO1crWHVhIEp7XGIEVawA7mb/dBbzo4wQQYVtLX6iEZViYk/mA7G59S/lvsLVi+jkVGlx2Co8JhvkTRtCEFgUnVA9o2jKy5BIEwrusNuDjrn5X+3ZvfZJN/iV0yzhzXynzioZt/DIcdODOVPUrem8T/5ifJ6ydSKIumgquBKyQnFOj+LRt5qMioBVzLnod0S/6kKMoNVN3/qx/PHRaeHbrF7I67IpGNROg0D9C4d9xXbGhSqQciXitLVnNzWuCov4Ie5nT5VCg9RjXyVAgMBAAECggEAf5rU81lgnnqbseoWCQ4B02kD2wc+Lti8qsYJ1pLgnTP6td5dZB8wBbjQNOem35sfOX7uoVv8OkIa00/gPd9/7BtbsGySLP3j/UDNX0N60Y30k1VajOdiwklCNpor7swtog75rVrDMxmo+sb0JQI684E9NMpxsSlRcAEJvvpl4W7LkhfJZyCUNXPAAh9SOkFOeaXATueEQ57V5vpeKM2JRJy//1P1LS2c/quLRIPqaTYgVAvxfdAYQvvP0vPijxHtxJlDxPa8xBCv7D46d+HeIA6X5ZkoTKLYbe2D36utP8rqGsXw1EyrYyuq6HdEAi/I4YXvWyLsXuQTSACSp+piAQKBgQD6am94xyQ4CRiMA/T1kvPPkXD+y/1Sbr3+T1S6X4naAGdkZS+TbPaWEddd2Huml6q+C2UcGhQpupBkbk88Nbs94jOulsfF6b24nOo1xH5z/BtS0kYuYaNLhebJtzrR9gupT1Uv0q+QybWZ3hQswOK0vwpkDk9DOysFynfMyXXlwQKBgQCa/z3oZ4iYZpTLNdRhMS0u593Jq8MDemimBJGEXPvDBByyE5Ohf22UqP5MjS1euosAQSva+/HmKeEigLgjoQTo29mA1nzPe0AKN3huWbqPIOdeIOA694Nj6ooOPS8iDMjKu61wPz/rZ57bv41LsPXr0y4UsU30JWg2rzgRnGgT1QKBgH30c0VIxUr6KEKk6t1qoP/SpAdFC5Ie6am0tWVZELl6Yob47kk1EYLCTpWBghB1UQhuKtlLtMCYenBJm8kpLZke4ef7J1jBDRCCvLt2rjQgpo2t/mbt7XjbTQ5A/3EEVTFAGhUH4A7vpkxSi8tG6cEIJm3VVMD4TdeH02JKIucBAoGAA0v+kxzwqN01uQTSGackIOVJsGp44XAPHcjnF3uq10EVIyyLbVn6iLj3f8VY+7TYFA9O0X+ea5jkcwlt4UQhiJp0i+sECJ3EhPMdGqvJ7hVzFmt4mYh+QPfSK+9dO0ouUzGexM5zm5w+osn2RW/kKzn4tvP2hoTtLIyZkrZS+GkCgYAQGKe84pXggSIPwztg0aBJUC9b4fXe3PR4DFTM85lBUKYJnQGRzf6NDCD83hwJoNdnyZkztyK72LDOn2NOzPfYcfUl6MQFPovXeMWaVidRfo4ZgyFA/C1egduebaIkXE+DpGhiy7alQ4k+LxUfy6oJBT9Sq8oq7EVBEkeff3p66g==","json","GBK",
-                "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmu8n/4yTHWbn7VOrNc9OsLtDL1bEQ8gC1dHkj8Wy5z0mkaOsjJRIG/28ze12M0V8jdCKuuDr5Z1OPKiqf+XO3ypguEh+mYUVMBM/cZodDFQfTY1TKLWjvQCuaqlA+QUTCK6f7T7stsgyQ1o9Jj0rXZDz6PM4QHSTzjrLIBaeqM5WIBvH+fy/X+QG5Utd+/UT0kc0JyvuKhZ65yVUd/C9VcwJJAPliRsAQNrqYterwAJ9zvw9tF11wj9W0XgJ8Ccu4x3gR1vrlLRJJo/OA97RmxPQ+5hSacWQZCUd1dwiBq+YCrKVHGTj14izRHXrLc0yBlRXo7tBOIqcy3IsvKVthQIDAQAB","RSA2");
-        AlipayMerchantIndirectAuthorderCreateRequest request = new AlipayMerchantIndirectAuthorderCreateRequest();
-        String param = "{" +
-                "  \"out_biz_no\":\""+uuid+"\"," +
-                "  \"contact_person_info\":{" +
-                "    \"contact_name\":\""+name+"\"," +
-                "    \"contact_phone_no\":\""+phone+"\"," +
-                "    \"contact_card_no\":\""+number+"\"," +
-                "    \"contact_cert_type\":\"RESIDENT\"" +
-                "  }," +
-                "  \"auth_identity_info\":{" +
-                "    \"identity_type\":\""+bodyType+"\"," +
-                "    \"is_financial_org\":false," +
-                "    \"certificate_type\":\"BUSINESS_CERT\"," +
-                "    \"certificate_info\":{" +
-                "      \"cert_no\":\""+businessNumber+"\"," +
-                "      \"cert_image\":\""+string+"\"," +
-                "      \"merchant_name\":\""+businessName+"\"," +
-                "      \"legal_person_name\":\""+legalRepresentative+"\"," +
-                "      \"register_address\":\""+registerAddress+"\"," +
-                "      \"effect_time\":\""+businessTerm+"\"," +
-                "      \"expire_time\":\""+businessEnd+"\"" +
-                "    }," +
-                "    }," +
-                "  \"legal_person_info\":{" +
-                "    \"card_type\":\"RESIDENT\"," +
-                "    \"person_name\":\""+legalRepresentative+"\"," +
-                "    \"card_no\":\""+legalNumber+"\"," +
-                "    \"effect_time\":\""+legalTerm+"\"," +
-                "    \"expire_time\":\""+legalEnd+"\"," +
-                "    \"card_front_img\":\""+legalFront+"\"," +
-                "    \"card_back_img\":\""+legalBack+"\"," +
-                "    \"is_benefit_person\":"+isBeneficiary+"" +
-                "  },";
-        String bene = "  \"benefit_person_info\":{" +
-                "    \"person_name\":\""+beneficiary+"\"," +
-                "    \"card_no\":\""+beneficiaryNumber+"\"," +
-                "    \"card_type\":\"RESIDENT\"," +
-                "    \"effect_time\":\""+beneficiaryTerm+"\"," +
-                "    \"expire_time\":\""+beneficiaryEnd+"\"," +
-                "    \"card_front_img\":\""+beneficiaryFront+"\"," +
-                "    \"card_back_img\":\""+beneficiaryBack+"\"" +
-                "  },";
-        if (bodyType.equals("ENTERPRISE")){
-            request.setBizContent(param
-                    + bene+
-                    "}");
-        }else{
-            request.setBizContent(param
-                    +
-                    "}");
-        }
+//        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do","2021003199648333",
+//                "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCXnbOiY2VkKb5ubpcwKqzmqbKotpKGA79yn2aQeZiTWhqmLdCKjVp64naGpnOQEC7hDZluOO1crWHVhIEp7XGIEVawA7mb/dBbzo4wQQYVtLX6iEZViYk/mA7G59S/lvsLVi+jkVGlx2Co8JhvkTRtCEFgUnVA9o2jKy5BIEwrusNuDjrn5X+3ZvfZJN/iV0yzhzXynzioZt/DIcdODOVPUrem8T/5ifJ6ydSKIumgquBKyQnFOj+LRt5qMioBVzLnod0S/6kKMoNVN3/qx/PHRaeHbrF7I67IpGNROg0D9C4d9xXbGhSqQciXitLVnNzWuCov4Ie5nT5VCg9RjXyVAgMBAAECggEAf5rU81lgnnqbseoWCQ4B02kD2wc+Lti8qsYJ1pLgnTP6td5dZB8wBbjQNOem35sfOX7uoVv8OkIa00/gPd9/7BtbsGySLP3j/UDNX0N60Y30k1VajOdiwklCNpor7swtog75rVrDMxmo+sb0JQI684E9NMpxsSlRcAEJvvpl4W7LkhfJZyCUNXPAAh9SOkFOeaXATueEQ57V5vpeKM2JRJy//1P1LS2c/quLRIPqaTYgVAvxfdAYQvvP0vPijxHtxJlDxPa8xBCv7D46d+HeIA6X5ZkoTKLYbe2D36utP8rqGsXw1EyrYyuq6HdEAi/I4YXvWyLsXuQTSACSp+piAQKBgQD6am94xyQ4CRiMA/T1kvPPkXD+y/1Sbr3+T1S6X4naAGdkZS+TbPaWEddd2Huml6q+C2UcGhQpupBkbk88Nbs94jOulsfF6b24nOo1xH5z/BtS0kYuYaNLhebJtzrR9gupT1Uv0q+QybWZ3hQswOK0vwpkDk9DOysFynfMyXXlwQKBgQCa/z3oZ4iYZpTLNdRhMS0u593Jq8MDemimBJGEXPvDBByyE5Ohf22UqP5MjS1euosAQSva+/HmKeEigLgjoQTo29mA1nzPe0AKN3huWbqPIOdeIOA694Nj6ooOPS8iDMjKu61wPz/rZ57bv41LsPXr0y4UsU30JWg2rzgRnGgT1QKBgH30c0VIxUr6KEKk6t1qoP/SpAdFC5Ie6am0tWVZELl6Yob47kk1EYLCTpWBghB1UQhuKtlLtMCYenBJm8kpLZke4ef7J1jBDRCCvLt2rjQgpo2t/mbt7XjbTQ5A/3EEVTFAGhUH4A7vpkxSi8tG6cEIJm3VVMD4TdeH02JKIucBAoGAA0v+kxzwqN01uQTSGackIOVJsGp44XAPHcjnF3uq10EVIyyLbVn6iLj3f8VY+7TYFA9O0X+ea5jkcwlt4UQhiJp0i+sECJ3EhPMdGqvJ7hVzFmt4mYh+QPfSK+9dO0ouUzGexM5zm5w+osn2RW/kKzn4tvP2hoTtLIyZkrZS+GkCgYAQGKe84pXggSIPwztg0aBJUC9b4fXe3PR4DFTM85lBUKYJnQGRzf6NDCD83hwJoNdnyZkztyK72LDOn2NOzPfYcfUl6MQFPovXeMWaVidRfo4ZgyFA/C1egduebaIkXE+DpGhiy7alQ4k+LxUfy6oJBT9Sq8oq7EVBEkeff3p66g==","json","GBK",
+//                "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmu8n/4yTHWbn7VOrNc9OsLtDL1bEQ8gC1dHkj8Wy5z0mkaOsjJRIG/28ze12M0V8jdCKuuDr5Z1OPKiqf+XO3ypguEh+mYUVMBM/cZodDFQfTY1TKLWjvQCuaqlA+QUTCK6f7T7stsgyQ1o9Jj0rXZDz6PM4QHSTzjrLIBaeqM5WIBvH+fy/X+QG5Utd+/UT0kc0JyvuKhZ65yVUd/C9VcwJJAPliRsAQNrqYterwAJ9zvw9tF11wj9W0XgJ8Ccu4x3gR1vrlLRJJo/OA97RmxPQ+5hSacWQZCUd1dwiBq+YCrKVHGTj14izRHXrLc0yBlRXo7tBOIqcy3IsvKVthQIDAQAB","RSA2");
+//        AlipayMerchantIndirectAuthorderCreateRequest request = new AlipayMerchantIndirectAuthorderCreateRequest();
+//        String param = "{" +
+//                "  \"out_biz_no\":\""+uuid+"\"," +
+//                "  \"contact_person_info\":{" +
+//                "    \"contact_name\":\""+name+"\"," +
+//                "    \"contact_phone_no\":\""+phone+"\"," +
+//                "    \"contact_card_no\":\""+number+"\"," +
+//                "    \"contact_cert_type\":\"RESIDENT\"" +
+//                "  }," +
+//                "  \"auth_identity_info\":{" +
+//                "    \"identity_type\":\""+bodyType+"\"," +
+//                "    \"is_financial_org\":false," +
+//                "    \"certificate_type\":\"BUSINESS_CERT\"," +
+//                "    \"certificate_info\":{" +
+//                "      \"cert_no\":\""+businessNumber+"\"," +
+//                "      \"cert_image\":\""+string+"\"," +
+//                "      \"merchant_name\":\""+businessName+"\"," +
+//                "      \"legal_person_name\":\""+legalRepresentative+"\"," +
+//                "      \"register_address\":\""+registerAddress+"\"," +
+//                "      \"effect_time\":\""+businessTerm+"\"," +
+//                "      \"expire_time\":\""+businessEnd+"\"" +
+//                "    }," +
+//                "    }," +
+//                "  \"legal_person_info\":{" +
+//                "    \"card_type\":\"RESIDENT\"," +
+//                "    \"person_name\":\""+legalRepresentative+"\"," +
+//                "    \"card_no\":\""+legalNumber+"\"," +
+//                "    \"effect_time\":\""+legalTerm+"\"," +
+//                "    \"expire_time\":\""+legalEnd+"\"," +
+//                "    \"card_front_img\":\""+legalFront+"\"," +
+//                "    \"card_back_img\":\""+legalBack+"\"," +
+//                "    \"is_benefit_person\":"+isBeneficiary+"" +
+//                "  },";
+//        String bene = "  \"benefit_person_info\":{" +
+//                "    \"person_name\":\""+beneficiary+"\"," +
+//                "    \"card_no\":\""+beneficiaryNumber+"\"," +
+//                "    \"card_type\":\"RESIDENT\"," +
+//                "    \"effect_time\":\""+beneficiaryTerm+"\"," +
+//                "    \"expire_time\":\""+beneficiaryEnd+"\"," +
+//                "    \"card_front_img\":\""+beneficiaryFront+"\"," +
+//                "    \"card_back_img\":\""+beneficiaryBack+"\"" +
+//                "  },";
+//        if (bodyType.equals("ENTERPRISE")){
+//            request.setBizContent(param
+//                    + bene+
+//                    "}");
+//        }else{
+//            request.setBizContent(param
+//                    +
+//                    "}");
+//        }
+//
+//        AlipayMerchantIndirectAuthorderCreateResponse response = null;
+//        try {
+//            response = alipayClient.execute(request);
+//        } catch (AlipayApiException e) {
+//            e.printStackTrace();
+//        }
 
-        AlipayMerchantIndirectAuthorderCreateResponse response = null;
+        AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",
+                aliAppid,
+                appPrivateKey,
+                "json","GBK",
+                alipay_public_key,
+                "RSA2");
+        AntMerchantExpandIndirectZftCreateRequest request = new AntMerchantExpandIndirectZftCreateRequest();
+        String param = "{" +
+                "  \"external_id\":\""+numericUUID+"\"," +
+                "  \"merchant_type\":\""+bodyType+"\"," +
+                "  \"name\":\""+businessName+"\"," +
+                "  \"alias_name\":\""+aliasName+"\"," +
+                "  \"mcc\":\"B0068\"," +
+                "  \"cert_no\":\""+businessNumber+"\"," +
+                "  \"cert_type\":\"201\"," +
+                "  \"cert_image\":\""+string+"\"," +
+                "  \"legal_name\":\""+legalPerson+"\"," +
+                "  \"legal_cert_no\":\""+leagleNumber+"\"," +
+                "  \"legal_cert_front_image\":\""+legalFront+"\"," +
+                "  \"legal_cert_back_image\":\""+legalBack+"\"," +
+                "  \"contact_infos\":[" +
+                "    {" +
+                "      \"name\":\""+name+"\"," +
+                "      \"mobile\":\""+phone+"\"," +
+                "    }" +
+                "  ],";
+
+        // todo 拼接
+        String biz_cards="  \"biz_cards\":[" +
+                "    {" +
+                "      \"account_holder_name\":\""+accountName+"\"," +
+                "      \"account_no\":\""+bankCard+"\"," +
+                "      \"account_inst_province\":\""+province+"\"," +
+                "      \"account_inst_city\":\""+city+"\"," +
+                "      \"account_branch_name\":\""+bankNameTwo+"\"," +
+                "      \"usage_type\":\""+useType+"\"," +
+                "      \"account_type\":\""+cardType+"\"," +
+                "      \"account_inst_name\":\""+bankName+"\"," +
+                "      \"account_inst_id\":\""+group+"\"," +
+                "    }" +
+                "  ]," ;
+        // 结算类型 支付宝账户 / 银行卡
+        String type ;
+        // 结算类型为支付宝 填写支付宝账号 结算类型为银行卡填写银行卡号
+        String account;
+        if (StringUtils.hasLength(alipayAccount)){
+            type =  accountType;
+            account = alipayAccount;
+        }else{
+            type = accountType;
+            account = bankCard;
+        }
+        String res=
+                "  \"service\":[" +
+                "    \"app支付\"" +
+                "  ]," +
+                "  \"alipay_logon_id\":" +
+                "    \""+zfbAccount+"\"" +
+                "  ," +
+                "  \"sites\":[" +
+                "    {" +
+                "      \"site_type\":\"02\"," +
+                "      \"site_name\":\"玩湃生活\"," +
+                "      \"tiny_app_id\":\"wx82f853a410b0c7c0\"" +
+                "    }" +
+                "  ]," +
+                "  \"cert_name\":\""+businessName+"\","+
+        "  \"binding_alipay_logon_id\":\""+zfbAccount+"\","+
+         "  \"default_settle_rule\":{" +
+                "    \"default_settle_type\":\""+type+"\"," +
+                "    \"default_settle_target\":\""+account+"\"" +
+                "  }" +
+                "}";
+        if (accountType.equals("bankCard")){
+            request.setBizContent(param
+                    + biz_cards+res);
+        }
+        AntMerchantExpandIndirectZftCreateResponse response = null;
         try {
             response = alipayClient.execute(request);
         } catch (AlipayApiException e) {
+            System.err.println("???????????");
             e.printStackTrace();
         }
         if(response.isSuccess()){
-            System.out.println("上传认证单");
+            System.out.println("调用成功");
             JSONObject json = JSONObject.parseObject(response.getBody());
-            JSONObject json1 = json.getJSONObject("alipay_merchant_indirect_authorder_create_response");
-            String order_no = json1.getString("order_no");
-            String order_status = json1.getString("order_status");
-//            // 申请单号
-//            String orderNo = r.getString("order_no");
-            /**
-             * 状态 审核中(AUDITING)、待联系人确认(CONTACT_CONFIRM),
-             * 待法人确认(LEGAL_CONFIRM)、审核通过(AUDIT_PASS)、
-             * 审核失败(AUDIT_REJECT)、已冻结(AUDIT_FREEZE)、
-             * 已撤回(CANCELED)、联系人处理中(CONTACT_PROCESSING)
-             */
-//            String orderStatus = r.getString("order_status");
+            JSONObject json1 = json.getJSONObject("ant_merchant_expand_indirect_zft_create_response");
+            String order_no = json1.getString("order_id");
+            System.err.println("订单号"+order_no);
             operatorAuth.setOrderNo(order_no);
-            operatorAuth.setOrderStatus(order_status);
-            operatorAuth.setQrCode(null);
-            operatorAuth.setRefuseReason(null);
             operatorAuthService.saveOrUpdate(operatorAuth);
-            // 通过运营商id找到用户id
-            TOperator byId = operatorService.getById(operatorId);
-            if (byId!=null){
-                Integer userId = byId.getUserId();
-                OperatorUser userId1 = operatorUserService.getOne(new QueryWrapper<OperatorUser>().eq("userId", userId));
-                if (userId1!=null){
-                    // 设置为审核中状态
-                    userId1.setAlipayAudit(1);
-                    if (bodyType.equals("ENTERPRISE")){
-                        userId1.setAlipayType(2);
-                    }else{
-                        userId1.setAlipayType(1);
-                    }
-//                    userId1.setWechatAudit(1);
-                    operatorUserService.updateById(userId1);
-                    operatorAuth.setQrCode(null);
-                    operatorAuthService.saveOrUpdate(operatorAuth);
-                    // 根据选择类型修改认证类型
-
-                }
+            Integer userId = operatorService.getById(operatorId).getUserId();
+            OperatorUser user = operatorUserService.getOne(new QueryWrapper<OperatorUser>().eq("userId", userId));
+            user.setAlipayAudit(1);
+            // 01是企业
+            if (bodyType.equals("01")){
+                user.setAlipayType(2);
+            }else{
+                user.setAlipayType(1);
             }
         } else {
-            System.out.println("调用失败");
+            if (response.getCode().equals("40004")){
+                String subMsg = response.getSubMsg();
+                return ResultUtil.error(subMsg);
+            }
         }
-        return SUCCESS_TIP;
+        return ResultUtil.success();
     }
     public static Object uploadImg(String img){
-        String privateKey = "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCXnbOiY2VkKb5ubpcwKqzmqbKotpKGA79yn2aQeZiTWhqmLdCKjVp64naGpnOQEC7hDZluOO1crWHVhIEp7XGIEVawA7mb/dBbzo4wQQYVtLX6iEZViYk/mA7G59S/lvsLVi+jkVGlx2Co8JhvkTRtCEFgUnVA9o2jKy5BIEwrusNuDjrn5X+3ZvfZJN/iV0yzhzXynzioZt/DIcdODOVPUrem8T/5ifJ6ydSKIumgquBKyQnFOj+LRt5qMioBVzLnod0S/6kKMoNVN3/qx/PHRaeHbrF7I67IpGNROg0D9C4d9xXbGhSqQciXitLVnNzWuCov4Ie5nT5VCg9RjXyVAgMBAAECggEAf5rU81lgnnqbseoWCQ4B02kD2wc+Lti8qsYJ1pLgnTP6td5dZB8wBbjQNOem35sfOX7uoVv8OkIa00/gPd9/7BtbsGySLP3j/UDNX0N60Y30k1VajOdiwklCNpor7swtog75rVrDMxmo+sb0JQI684E9NMpxsSlRcAEJvvpl4W7LkhfJZyCUNXPAAh9SOkFOeaXATueEQ57V5vpeKM2JRJy//1P1LS2c/quLRIPqaTYgVAvxfdAYQvvP0vPijxHtxJlDxPa8xBCv7D46d+HeIA6X5ZkoTKLYbe2D36utP8rqGsXw1EyrYyuq6HdEAi/I4YXvWyLsXuQTSACSp+piAQKBgQD6am94xyQ4CRiMA/T1kvPPkXD+y/1Sbr3+T1S6X4naAGdkZS+TbPaWEddd2Huml6q+C2UcGhQpupBkbk88Nbs94jOulsfF6b24nOo1xH5z/BtS0kYuYaNLhebJtzrR9gupT1Uv0q+QybWZ3hQswOK0vwpkDk9DOysFynfMyXXlwQKBgQCa/z3oZ4iYZpTLNdRhMS0u593Jq8MDemimBJGEXPvDBByyE5Ohf22UqP5MjS1euosAQSva+/HmKeEigLgjoQTo29mA1nzPe0AKN3huWbqPIOdeIOA694Nj6ooOPS8iDMjKu61wPz/rZ57bv41LsPXr0y4UsU30JWg2rzgRnGgT1QKBgH30c0VIxUr6KEKk6t1qoP/SpAdFC5Ie6am0tWVZELl6Yob47kk1EYLCTpWBghB1UQhuKtlLtMCYenBJm8kpLZke4ef7J1jBDRCCvLt2rjQgpo2t/mbt7XjbTQ5A/3EEVTFAGhUH4A7vpkxSi8tG6cEIJm3VVMD4TdeH02JKIucBAoGAA0v+kxzwqN01uQTSGackIOVJsGp44XAPHcjnF3uq10EVIyyLbVn6iLj3f8VY+7TYFA9O0X+ea5jkcwlt4UQhiJp0i+sECJ3EhPMdGqvJ7hVzFmt4mYh+QPfSK+9dO0ouUzGexM5zm5w+osn2RW/kKzn4tvP2hoTtLIyZkrZS+GkCgYAQGKe84pXggSIPwztg0aBJUC9b4fXe3PR4DFTM85lBUKYJnQGRzf6NDCD83hwJoNdnyZkztyK72LDOn2NOzPfYcfUl6MQFPovXeMWaVidRfo4ZgyFA/C1egduebaIkXE+DpGhiy7alQ4k+LxUfy6oJBT9Sq8oq7EVBEkeff3p66g==";
-        String alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmu8n/4yTHWbn7VOrNc9OsLtDL1bEQ8gC1dHkj8Wy5z0mkaOsjJRIG/28ze12M0V8jdCKuuDr5Z1OPKiqf+XO3ypguEh+mYUVMBM/cZodDFQfTY1TKLWjvQCuaqlA+QUTCK6f7T7stsgyQ1o9Jj0rXZDz6PM4QHSTzjrLIBaeqM5WIBvH+fy/X+QG5Utd+/UT0kc0JyvuKhZ65yVUd/C9VcwJJAPliRsAQNrqYterwAJ9zvw9tF11wj9W0XgJ8Ccu4x3gR1vrlLRJJo/OA97RmxPQ+5hSacWQZCUd1dwiBq+YCrKVHGTj14izRHXrLc0yBlRXo7tBOIqcy3IsvKVthQIDAQAB";
+        String appPrivateKey = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCi5i9nW/hGLJ3A06cZxTQdviFC7THpdSihoTYGLr9q006hu0V26ecBMY/o4w5bvIX0Ok/yofmZsVcCJpAPvbXL/uqVrIjnRRxXiaeBFThlxoBUTdunvbUSDYfzlEhJr5NvUKI6H6lz2niXlQGx4qy8Hau4ccWit9kM8jwUvsBVQoFgJA+xrjMvooA7YLopQtpOD+UJr5thApTSf1xrnr1W12yolTLEH15JmNV372cqXrYUuqnY0QsaPtxeqJUGAOcGdVLllQ7easEznP8DFBvDdHATcmp2SHNQDUEWN6MCVPbMgY06NQVqAXxqjTAYSVh+6TRu6bofPmpYC3TZB003AgMBAAECggEBAJAcR2+PA3NBYUYHeFrqBRMS8uX8ZR19kjZ7IgoSLTFaQsP9opRylPSPXhrPVBKAE5leRQAHn4MCSlESwHvMfxo7KFjFTFAc6dffZZpipYQUOc9bGampwJh58/3e/pyBgVMG6J23CPf/HJQtNFSkjd/V9+ayb/9l2dUEL3bC0fAZ/dbx8HsxdLw8wn3fLlWLj68hOMqa2deCZe3JdSVsPbeWqkh56FFsMLug0Nd+Ar4TgRl9/jnhXF0JWiD0LmPUYLhboY7EfUBzN4w1iYbDi1P+3zvoOYsiVKAXox9GMhQ2VzOO2UcSTuizSza2e98mGpabl/GpKmCz+RDFjtkX6eECgYEA2MyCij65eO3aGIm3FUe93DULRBYTfX8qJQSJq2WOWA3mmQlEW6L3O2B5/lG2h+8WmN6iLEs9eHpgycGYp7vAqgrANEn16ACVcuyx0scFtrZfZ+kmHMzFfiUWxJjVYk/6YngsGVBLdw6ueM42C8TTP67X9tU5TdVGoGWuqEj4W98CgYEAwFqwprXOch5Pqk/RPbb49r0Ou03K/UbciWnWWKzUhFFNS8MdlQPoDvQZbMwHLeWsa2VhaKITK3x5biLQb3U+0GLOn6lTvEyrEUH+ucREyLgVYTRAvwBPtnvlrzpyxPk2HnslQjju8WrvvLLBMKWUjlTrTOzhaHT21gz3pHMiOakCgYEAhLmfaXdBITGshb054sNLDtdCkGpbgEcrzAHdLps769iGxkYQHXHFngpQZUwtTUcoNGqIKknd1jZFrv7gsD+XkgKG7PwimehRlkwmCX5ilxtLiVgJRzRt6+5U5AMVD90a0tHzXYP0z2yjj73fBJF5KtGl0a10KZxaYrQdm1UhB00CgYBZZgzx/k9rtHC8LAqIj1CYhHejT92G53c6Gkl3vyOqN4sgKhfGmSEySfrDGPRBPZxr8ZtbIPCd5mUdberH0osWGMYFaJI1UsCy7aQwvGpniz7MhZeN7dweaOjwDs8mgtjHQ96mL4XGCDhR0BZ/wIURvZ/6iaGdhbbu9unlsWj3uQKBgQCmZYdsbbZkd3ev6f8rwyvMz+DrCQyYpY44cegBYuJgrZiQnL2fJioeN7ixX0UM48SfwsZEIrzshP/LGAwnc2MdjxKUl4jLN8SEe0NAjXOnz9Zaw740+aOmLpXcLWdP4uM2gIhWsvW1tEkQZCXmm7c9s/RsU8Pmzv+YL3+fSijOzA==";//支付宝开发者应用私钥
+        String alipay_public_key = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmu8n/4yTHWbn7VOrNc9OsLtDL1bEQ8gC1dHkj8Wy5z0mkaOsjJRIG/28ze12M0V8jdCKuuDr5Z1OPKiqf+XO3ypguEh+mYUVMBM/cZodDFQfTY1TKLWjvQCuaqlA+QUTCK6f7T7stsgyQ1o9Jj0rXZDz6PM4QHSTzjrLIBaeqM5WIBvH+fy/X+QG5Utd+/UT0kc0JyvuKhZ65yVUd/C9VcwJJAPliRsAQNrqYterwAJ9zvw9tF11wj9W0XgJ8Ccu4x3gR1vrlLRJJo/OA97RmxPQ+5hSacWQZCUd1dwiBq+YCrKVHGTj14izRHXrLc0yBlRXo7tBOIqcy3IsvKVthQIDAQAB";//支付宝支付公钥
+        String aliAppid = "2021004105665036";//支付宝appid
         AlipayConfig alipayConfig = new AlipayConfig();
         alipayConfig.setServerUrl("https://openapi.alipay.com/gateway.do");
-        alipayConfig.setAppId("2021003199648333");
-        alipayConfig.setPrivateKey(privateKey);
+        alipayConfig.setAppId(aliAppid);
+        alipayConfig.setPrivateKey(appPrivateKey);
         alipayConfig.setFormat("json");
-        alipayConfig.setAlipayPublicKey(alipayPublicKey);
+        alipayConfig.setAlipayPublicKey(alipay_public_key);
         alipayConfig.setCharset("UTF8");
         alipayConfig.setSignType("RSA2");
         AlipayClient alipayClient = null;

--
Gitblit v1.7.1