Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

puzhibing

2024-01-30 c4addd15f7adca50420f7ced176c4a7192219273

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai


 Conflicts:

	cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java

	cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java

 cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java

@@ -965,6 +965,8 @@
        String smid1="";
        if (store.getOperatorId() == null ){
            smid1 = smid;
        }else if (store.getOperatorId() == 0){
            smid1 = smid;
        }else{
            smid1 = storeClient.getSMIDByOperatorId(store.getOperatorId());
        }
@@ -1006,32 +1008,23 @@
                                    break;
                                }
                                if ("TRADE_SUCCESS".equals(s)) {
                                    coursePackageOrder1.setPayStatus(2);
                                    coursePackageOrder1.setOrderNumber(tradeNo);
                                    coursePackageOrder1.setAppUserId(null);
                                    coursePackageOrderService.updateById(coursePackageOrder1);
                                    CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getOne(new QueryWrapper<CoursePackagePaymentConfig>()
                                            .eq("coursePackageId", coursePackageOrder1.getId())
                                            .eq("classHours", coursePackageOrder1.getClassHours())
                                    );
                                    coursePackageService.addCoursePackageOrderStudent(coursePackageOrder1.getId(), coursePackagePaymentConfig);
                                    coursePackageService.moneyOut(tradeNo,tradeNo,finalCode);
                                    // 根据课程id 查询这个课程属于哪个门店 属于哪个运营商
                                    TCoursePackage byId = coursePackageService.getById(coursePackageOrder1.getCoursePackageId());
                                    Integer storeId = byId.getStoreId();
                                    Store store = storeClient.queryStoreById(storeId);
                                    Integer operatorId = store.getOperatorId();
                                    if (operatorId==null){
                                        String smid ="2088330203191220";
                                        // 说明是平台的
                                        payMoneyUtil.confirm(smid,finalCode,tradeNo,request.toString());
                                        break;
                                    coursePackagePayment.setPayStatus(2);
                                    coursePackagePayment.setOrderNumber(tradeNo);
                                    baseMapper1.updateById(coursePackagePayment);
                                        // 判断这个课包属于哪个门店 属于哪个运营商 根据运营商 id 获取对应的商户号
                                        Integer coursePackageId = coursePackagePayment.getCoursePackageId();
                                        TCoursePackage byId = coursePackageService.getById(coursePackageId);
                                        Store store = storeClient.queryStoreById(byId.getStoreId());
                                        if (store.getOperatorId() == null ){
                                            // 说明是平台的门店
                                            payMoneyUtil.confirm(smid,code,tradeNo,request.toString());
                                        }else if (store.getOperatorId() == 0){
                                            payMoneyUtil.confirm(smid,code,tradeNo,request.toString());
                                    }else{
                                        // 当前课程不属于门店 查询这个课程属于哪个门店 属于哪个运营商
                                        String smidByOperatorId = storeClient.getSMIDByOperatorId(operatorId);
                                        payMoneyUtil.confirm(smidByOperatorId,finalCode,tradeNo,request.toString());
                                        break;
                                            String smid = storeClient.getSMIDByOperatorId(store.getOperatorId());
                                            payMoneyUtil.confirm(smid,code,tradeNo,request.toString());
                                    }
                                    break;
                                }
                                if ("WAIT_BUYER_PAY".equals(s)) {
                                    num++;

 cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java

@@ -1057,7 +1057,11 @@
        if (store.getOperatorId() == null ){
            smid1 = smid;
        }else{
            if (store.getOperatorId()==0){
                smid1 = smid;
            }else{
            smid1 = storeClient.getSMIDByOperatorId(store.getOperatorId());
            }
        }
        ResultUtil alipay = payMoneyUtil.alipay(smid1,"购买课程", "购买课程",
                coursePackagePaymentConfig.getId().toString(),
@@ -1115,6 +1119,11 @@
                                            // 说明是平台的
                                            payMoneyUtil.confirm(smid,finalCode,tradeNo,paymentPrice.toString());
                                        break;
                                    }else if (operatorId==0){
                                        String smid ="2088330203191220";
                                        // 说明是平台的
                                        payMoneyUtil.confirm(smid,finalCode,tradeNo,paymentPrice.toString());
                                        break;
                                    }else{
                                        // 当前课程不属于门店 查询这个课程属于哪个门店 属于哪个运营商
                                        String smidByOperatorId = storeClient.getSMIDByOperatorId(operatorId);

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/SaticScheduleTask.java

@@ -45,189 +45,189 @@
    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
    // 一个小时执行一次
    @Scheduled(fixedRate=60000)
    private void configureTasks() {
//        payMoneyUtil.getMessage();
//        List<OperatorAuthAlipay> list = operatorAuthService.list(new QueryWrapper<OperatorAuthAlipay>());
//        for (OperatorAuthAlipay operatorAuthAlipay : list) {
//            System.err.println("执行定时任务时间: " + LocalDateTime.now());
//            AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",
//                    aliAppid,
//                    appPrivateKey, "json", "GBK",
//                    alipay_public_key,
//                    "RSA2");
//            AntMerchantExpandIndirectZftorderQueryRequest request = new AntMerchantExpandIndirectZftorderQueryRequest();
//            request.setBizContent("{" +
//                    "  \"order_id\":\"" + operatorAuthAlipay.getOrderNo() + "\"," +
//                    "  \"external_id\":\"" + operatorAuthAlipay.getOutBizNo() + "\"" +
//                    "}");
//            AntMerchantExpandIndirectZftorderQueryResponse response = null;
//            try {
//                response = alipayClient.execute(request);
//            } catch (AlipayApiException e) {
//                e.printStackTrace();
//            }
//            if (response.isSuccess()) {
//                System.out.println("调用成功");
//                JSONObject json = JSONObject.parseObject(response.getBody());
//                System.err.println(json);
//                JSONObject sign = json.getJSONObject("ant_merchant_expand_indirect_zftorder_query_response");
//                JSONArray orders = sign.getJSONArray("orders");
//                    JSONObject order = orders.getJSONObject(0);
//                    // 提取订单信息
//                    String reason = order.getString("reason");
//                    String smid = order.getString("smid");
//                    String merchantName = order.getString("merchant_name");
//                    String applyTime = order.getString("apply_time");
//                    String externalId = order.getString("external_id");
//                    String orderId = order.getString("order_id");
//                    String applyType = order.getString("apply_type");
//                    String status = order.getString("status");
//                    // 打印订单信息
//                    System.out.println("Reason: " + reason);
//                    System.out.println("Merchant Name: " + merchantName);
//                    System.out.println("Apply Time: " + applyTime);
//                    System.out.println("External ID: " + externalId);
//                    System.out.println("Order ID: " + orderId);
//                    System.out.println("Apply Type: " + applyType);
//                    System.out.println("Status: " + status);
//            } else {
//                System.out.println("调用失败");
//            }
//        }



//        // 回查商户认证单审核状态 查询除了审核通过以外的认证单
//        List<OperatorAuthAlipay> list = operatorAuthService.list(new QueryWrapper<OperatorAuthAlipay>().ne("orderStatus", "AUDIT_PASS"));
//        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");
//        for (OperatorAuthAlipay operatorAuth : list) {
//        // 第三步：查询申请单审核结果
//        AlipayMerchantIndirectAuthorderQuerystatusRequest request1 = new AlipayMerchantIndirectAuthorderQuerystatusRequest();
//        request1.setBizContent("{" +
//                "  \"order_no\":\""+"202312011045284847"+"\"," +
//                "  \"out_biz_no\":\""+"83972149e3f84216ad2654a1571963f4"+"\"," +
//                "}");
//        AlipayMerchantIndirectAuthorderQuerystatusResponse response1 = null;
//        try {
//            response1 = alipayClient.execute(request1);
//        } catch (AlipayApiException e) {
//            e.printStackTrace();
//        }
//        if(response1.isSuccess()){
//            System.out.println("调用成功");
//        } else {
//            System.out.println("调用失败");
//        }
//            JSONObject json = JSONObject.parseObject(response1.getBody());
//            JSONObject sign = json.getJSONObject("alipay_merchant_indirect_authorder_querystatus_response");
//            String orderNo = sign.getString("order_no");
//            String order_status = sign.getString("order_status");
////            operatorAuth.setOrderStatus(order_status);
//            operatorAuth.setOrderNo(orderNo);
//            System.err.println("审核状态:"+order_status);
//
//            // 失败原因
//            JSONArray verify_list = sign.getJSONArray("verify_list");
//            StringBuilder reason = new StringBuilder("");
//            // 失败原因
//            if (verify_list!=null){
//                for (int i = 0; i < verify_list.size(); i++) {
//                    JSONObject jsonObject = verify_list.getJSONObject(i);
//                    String fail_reason = jsonObject.getString("fail_reason");
//                    reason.append(fail_reason+",");
//                }
//                String res = reason.toString();
//                String substring = res.substring(0, res.length() - 1);
//                operatorAuth.setRefuseReason(substring);
//                operatorAuthService.updateById(operatorAuth);
///**
// * 状态 1=审核中(AUDITING)、2=待联系人确认（CONTACT_CONFIRM），
// * 3=待法人确认（LEGAL_CONFIRM）、4=审核通过(AUDIT_PASS)、
// * 5=审核失败(AUDIT_REJECT)、6=已冻结(AUDIT_FREEZE)、
// * 7=已撤回(CANCELED)、8=联系人处理中(CONTACT_PROCESSING)
// */
//            }else{
//                operatorAuth.setRefuseReason(null);
//            }
//            Integer operatorId = operatorAuth.getOperatorId();
//            User one = userService.getOne(new QueryWrapper<User>().eq("objectId", operatorId)
//                    .eq("objectType", 2));
//            OperatorUser userId = operatorUserService.getOne(new QueryWrapper<OperatorUser>()
//                    .eq("userId", one.getId()));
////            if (userId!=null){
////                switch (order_status){
////                    case "AUDITING":
//////                        operatorAuth.setOrderStatus("AUDITING");
////                        userId.setAlipayAudit(1);
////                        break;
////                    case "CONTACT_CONFIRM":
////                        operatorAuth.setOrderStatus("CONTACT_CONFIRM");
////                        userId.setAlipayAudit(2);
////                        break;
////                    case "LEGAL_CONFIRM":
////                        operatorAuth.setOrderStatus("LEGAL_CONFIRM");
////                        userId.setAlipayAudit(3);
////                        break;
////                    case "AUDIT_PASS":
////                        operatorAuth.setOrderStatus("AUDIT_PASS");
////                        userId.setAlipayAudit(4);
////                        break;
////                    case "AUDIT_REJECT":
////                        operatorAuth.setOrderStatus("AUDIT_REJECT");
////                        userId.setAlipayAudit(5);
////                        break;
////                    case "AUDIT_FREEZE":
////                        operatorAuth.setOrderStatus("AUDIT_FREEZE");
////                        userId.setAlipayAudit(6);
////                        break;
////                    case "CANCELED":
////                        operatorAuth.setOrderStatus("CANCELED");
////                        userId.setAlipayAudit(7);
////                        break;
////                    case "CONTACT_PROCESSING":
////                        operatorAuth.setOrderStatus("CONTACT_PROCESSING");
////                        userId.setAlipayAudit(8);
////                        break;
////                }
////                operatorUserService.updateById(userId);
////            }
//            // 审核通过
//            String qr_code = sign.getString("qr_code");
////            operatorAuth.setQrCode(qr_code);
//            operatorAuthService.updateById(operatorAuth);
//            System.err.println("二维码"+qr_code);
////            if (operatorAuth.getOrderStatus().equals("AUDIT_REJECT")
////            || operatorAuth.getOrderStatus().equals("AUDIT_FREEZE")
////                    || operatorAuth.getOrderStatus().equals("CANCELED")){
////                // 未通过审核 撤销申请单
////                AlipayClient alipayClient1 = new DefaultAlipayClient
////                        ("https://openapi.alipay.com/gateway.do",
////                                "2021004123692417","MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCq1V7akWZ/V9mr8NGW2CihIbY93M7M33LpVM5y63qEuN7yqyJV197WT6c7uHBcttY6cJLawXLihgC8KF6ZzdXWbm4n4RiigxIaz9LbSVBjYplkNgG2rg7W7dB8wrrqcwBQU0n+pFX3KWJkHRXDugqE21VCGgzySKQBkhiztmTI/z039PdWp2RTGLiL/OuwVrPjQv3He2orYIZgADWid0mtZXCEFosDkaQDTEqCfuDEuMouEiaIk/lw0ZWxiR1Fvfr82nO0r94lM/CC1wNRif2+2ESR+YystsWQPm16eRgS3wAQz2cOTP4L5VNKNzcUAgxTQK3Bj8GvqrYUUlcC7VCTAgMBAAECggEAPKmYDTUkmIOxoATb6BzKEK3P8Re/t7CBNaoPxW8pCog7YyCyCJmnX6LZV7Oe8s1aNVZUT6nyCc5b5HTRYvxcutBr/W1JOiwg+bRiw8u86A3TOmqTITOdwWShbCwaA7binaN12x6wCByB+9r4J5Cgu5zHIbnubvqsgoJGk0ppb5XbyYkikOAXPHli4PUe4GOorSuhRdq3XlGWiMwh4yt48kF4vP+2ByuDOYQU6LjGs0wn/5LpN+ReLdXTab65Cz7WYTDrTndyIrhFg7cyT5m2gtiJuEgIJ45uaaeGNIecV6JSnRsEv4YD4m+I58yhyyvw9zd0Z5qP04QNjy7OK2UeQQKBgQD/EJpaVv0RR83Z6Hp2YVrPoiMz279U5bgkBbcxgr9GR2YYE3rrHqBdqch1Uitu+g6LIC+SDtib7yG9C7EqPHB3fsfEw8NtL54gy3OFbCcH3lqFxgtrCpQ2SIXQjd8932TpzcMdD6jzyUoSraT+lgkf2MgjqFiMbNVg50lGDyWujQKBgQCrdbXTttuazdwU0pdRFCuTz42iIJSZtHFUPvmbrBy7LFQ8NTN76dqLM1RUH7gJukPc4+Ax+DfpDgHZ4nQ2KSk9FweLqKSf10kojibKpc3nkgDRtUtSTar8fZn9VKTuXK1Ho0LUkjDlHjlEwUuf/Ef+IdjzXDJ2UPWHp2YzxvNDnwKBgBWGtjAnpUX/FF1upF83Si251lS7GAO3O3o2zUYtba0lu3UOt9H+DLS67oMQQ0AjdHTDa6BdBmTqoqNMyE/zN96t4Xg2uViOqz7DTOWWwhiE6IjftPj8tJN8PWbjglK7ds3QosXiG3UvqMO4yfL+gJiieAmiXI7FZKDABEwYXSrFAoGASXVe91vKbmJwPgOTjMsleGhd9+4ZfFjQjRWF/2oXzSFK3Zi1fAtO9ICDSp9kS9afqI2AyifcXF8B8AWTYHj2EBRDyVPxZAHqeBOfDwdGVkY5T59qq9JWxWJSjTSsjOrr2ltaEJSpmh/+zTQ7YEnH1ltOBcWkYQiCiSHxKZG9O2UCgYBfBTkjktzv81SnW47d0qRwmiXrcyObmXTe5fIW9e6KaB0SnzcVvoCmm7TTk+Bm4WqNmfb5k8U6J22vdxB1TPlRksnY+VZDM0Grv/xUII9G8oVQ4+NiE5XvQ7+nc5EBJ12of6GxE7/yXZiDld62q2sFZgrFzhvvHV+IADsu/VdIEw==",
////                                "json","GBK",
////                                "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApCzq4BIE4gMdEXxIAAUbiMpSytkzp+LVLVsBtji87rFGfWUcnrr3NKftaw0WtRu+36d1nDVOWW4CmgsOPyj1GOFoTcJOR/BqyIriwyLxpuMS8qgOqGJZXi+W4Nw2AJL6iMVwY2eI8F1G10gACK2I9TNJRzHh3tMTA6ItysbGoekRDtn6Xrkh5V6cyHQjLw0Q6MJK/68XT6/LWzarDEEYrSnIevOydMY32ptAgm5fp/h08M2khCmI6CuMWKmc87dPpd2krGVTALqprAQvB74AIqO+5DE0fN4LoitOYXAtWDCEF4kHN0hQUygIEGCwtMgEVzkf92VLlCX35YtDhWd1yQIDAQAB","RSA2");
////                AlipayMerchantIndirectAuthorderCloseRequest request = new AlipayMerchantIndirectAuthorderCloseRequest();
//    @Scheduled(fixedRate=60000)
//    private void configureTasks() {
////        payMoneyUtil.getMessage();
////        List<OperatorAuthAlipay> list = operatorAuthService.list(new QueryWrapper<OperatorAuthAlipay>());
////        for (OperatorAuthAlipay operatorAuthAlipay : list) {
////            System.err.println("执行定时任务时间: " + LocalDateTime.now());
////            AlipayClient alipayClient = new DefaultAlipayClient("https://openapi.alipay.com/gateway.do",
////                    aliAppid,
////                    appPrivateKey, "json", "GBK",
////                    alipay_public_key,
////                    "RSA2");
////            AntMerchantExpandIndirectZftorderQueryRequest request = new AntMerchantExpandIndirectZftorderQueryRequest();
////                request.setBizContent("{" +
////                        "  \"order_no\":\""+operatorAuth.getOrderNo()+"\"," +
////                        "  \"out_biz_no\":\""+operatorAuth.getOutBizNo()+"\"" +
////                    "  \"order_id\":\"" + operatorAuthAlipay.getOrderNo() + "\"," +
////                    "  \"external_id\":\"" + operatorAuthAlipay.getOutBizNo() + "\"" +
////                        "}");
////                AlipayMerchantIndirectAuthorderCloseResponse response = null;
////            AntMerchantExpandIndirectZftorderQueryResponse response = null;
////                try {
////                    response = alipayClient1.execute(request);
////                response = alipayClient.execute(request);
////                } catch (AlipayApiException e) {
////                    e.printStackTrace();
////                }
////                if(response.isSuccess()){
////                    System.out.println("撤销申请单调用成功");
////                System.out.println("调用成功");
////                JSONObject json = JSONObject.parseObject(response.getBody());
////                System.err.println(json);
////                JSONObject sign = json.getJSONObject("ant_merchant_expand_indirect_zftorder_query_response");
////                JSONArray orders = sign.getJSONArray("orders");
////                    JSONObject order = orders.getJSONObject(0);
////                    // 提取订单信息
////                    String reason = order.getString("reason");
////                    String smid = order.getString("smid");
////                    String merchantName = order.getString("merchant_name");
////                    String applyTime = order.getString("apply_time");
////                    String externalId = order.getString("external_id");
////                    String orderId = order.getString("order_id");
////                    String applyType = order.getString("apply_type");
////                    String status = order.getString("status");
////                    // 打印订单信息
////                    System.out.println("Reason: " + reason);
////                    System.out.println("Merchant Name: " + merchantName);
////                    System.out.println("Apply Time: " + applyTime);
////                    System.out.println("External ID: " + externalId);
////                    System.out.println("Order ID: " + orderId);
////                    System.out.println("Apply Type: " + applyType);
////                    System.out.println("Status: " + status);
////                } else {
////                    System.out.println("撤销申请单调用失败");
////                System.out.println("调用失败");
////                }
////            }

//
//
//
////        // 回查商户认证单审核状态 查询除了审核通过以外的认证单
////        List<OperatorAuthAlipay> list = operatorAuthService.list(new QueryWrapper<OperatorAuthAlipay>().ne("orderStatus", "AUDIT_PASS"));
////        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");
////        for (OperatorAuthAlipay operatorAuth : list) {
////        // 第三步：查询申请单审核结果
////        AlipayMerchantIndirectAuthorderQuerystatusRequest request1 = new AlipayMerchantIndirectAuthorderQuerystatusRequest();
////        request1.setBizContent("{" +
////                "  \"order_no\":\""+"202312011045284847"+"\"," +
////                "  \"out_biz_no\":\""+"83972149e3f84216ad2654a1571963f4"+"\"," +
////                "}");
////        AlipayMerchantIndirectAuthorderQuerystatusResponse response1 = null;
////        try {
////            response1 = alipayClient.execute(request1);
////        } catch (AlipayApiException e) {
////            e.printStackTrace();
////        }
////        if(response1.isSuccess()){
////            System.out.println("调用成功");
////        } else {
////            System.out.println("调用失败");
////        }
////            JSONObject json = JSONObject.parseObject(response1.getBody());
////            JSONObject sign = json.getJSONObject("alipay_merchant_indirect_authorder_querystatus_response");
////            String orderNo = sign.getString("order_no");
////            String order_status = sign.getString("order_status");
//////            operatorAuth.setOrderStatus(order_status);
////            operatorAuth.setOrderNo(orderNo);
////            System.err.println("审核状态:"+order_status);
////
////            // 失败原因
////            JSONArray verify_list = sign.getJSONArray("verify_list");
////            StringBuilder reason = new StringBuilder("");
////            // 失败原因
////            if (verify_list!=null){
////                for (int i = 0; i < verify_list.size(); i++) {
////                    JSONObject jsonObject = verify_list.getJSONObject(i);
////                    String fail_reason = jsonObject.getString("fail_reason");
////                    reason.append(fail_reason+",");
////                }
////                String res = reason.toString();
////                String substring = res.substring(0, res.length() - 1);
////                operatorAuth.setRefuseReason(substring);
////                operatorAuthService.updateById(operatorAuth);
/////**
//// * 状态 1=审核中(AUDITING)、2=待联系人确认（CONTACT_CONFIRM），
//// * 3=待法人确认（LEGAL_CONFIRM）、4=审核通过(AUDIT_PASS)、
//// * 5=审核失败(AUDIT_REJECT)、6=已冻结(AUDIT_FREEZE)、
//// * 7=已撤回(CANCELED)、8=联系人处理中(CONTACT_PROCESSING)
//// */
////            }else{
////                operatorAuth.setRefuseReason(null);
////            }
////            Integer operatorId = operatorAuth.getOperatorId();
////            User one = userService.getOne(new QueryWrapper<User>().eq("objectId", operatorId)
////                    .eq("objectType", 2));
////            OperatorUser userId = operatorUserService.getOne(new QueryWrapper<OperatorUser>()
////                    .eq("userId", one.getId()));
//////            if (userId!=null){
//////                switch (order_status){
//////                    case "AUDITING":
////////                        operatorAuth.setOrderStatus("AUDITING");
//////                        userId.setAlipayAudit(1);
//////                        break;
//////                    case "CONTACT_CONFIRM":
//////                        operatorAuth.setOrderStatus("CONTACT_CONFIRM");
//////                        userId.setAlipayAudit(2);
//////                        break;
//////                    case "LEGAL_CONFIRM":
//////                        operatorAuth.setOrderStatus("LEGAL_CONFIRM");
//////                        userId.setAlipayAudit(3);
//////                        break;
//////                    case "AUDIT_PASS":
//////                        operatorAuth.setOrderStatus("AUDIT_PASS");
//////                        userId.setAlipayAudit(4);
//////                        break;
//////                    case "AUDIT_REJECT":
//////                        operatorAuth.setOrderStatus("AUDIT_REJECT");
//////                        userId.setAlipayAudit(5);
//////                        break;
//////                    case "AUDIT_FREEZE":
//////                        operatorAuth.setOrderStatus("AUDIT_FREEZE");
//////                        userId.setAlipayAudit(6);
//////                        break;
//////                    case "CANCELED":
//////                        operatorAuth.setOrderStatus("CANCELED");
//////                        userId.setAlipayAudit(7);
//////                        break;
//////                    case "CONTACT_PROCESSING":
//////                        operatorAuth.setOrderStatus("CONTACT_PROCESSING");
//////                        userId.setAlipayAudit(8);
//////                        break;
//////                }
//////                operatorUserService.updateById(userId);
//////            }
////            // 审核通过
////            String qr_code = sign.getString("qr_code");
//////            operatorAuth.setQrCode(qr_code);
////            operatorAuthService.updateById(operatorAuth);
////            System.err.println("二维码"+qr_code);
//////            if (operatorAuth.getOrderStatus().equals("AUDIT_REJECT")
//////            || operatorAuth.getOrderStatus().equals("AUDIT_FREEZE")
//////                    || operatorAuth.getOrderStatus().equals("CANCELED")){
//////                // 未通过审核 撤销申请单
//////                AlipayClient alipayClient1 = new DefaultAlipayClient
//////                        ("https://openapi.alipay.com/gateway.do",
//////                                "2021004123692417","MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCq1V7akWZ/V9mr8NGW2CihIbY93M7M33LpVM5y63qEuN7yqyJV197WT6c7uHBcttY6cJLawXLihgC8KF6ZzdXWbm4n4RiigxIaz9LbSVBjYplkNgG2rg7W7dB8wrrqcwBQU0n+pFX3KWJkHRXDugqE21VCGgzySKQBkhiztmTI/z039PdWp2RTGLiL/OuwVrPjQv3He2orYIZgADWid0mtZXCEFosDkaQDTEqCfuDEuMouEiaIk/lw0ZWxiR1Fvfr82nO0r94lM/CC1wNRif2+2ESR+YystsWQPm16eRgS3wAQz2cOTP4L5VNKNzcUAgxTQK3Bj8GvqrYUUlcC7VCTAgMBAAECggEAPKmYDTUkmIOxoATb6BzKEK3P8Re/t7CBNaoPxW8pCog7YyCyCJmnX6LZV7Oe8s1aNVZUT6nyCc5b5HTRYvxcutBr/W1JOiwg+bRiw8u86A3TOmqTITOdwWShbCwaA7binaN12x6wCByB+9r4J5Cgu5zHIbnubvqsgoJGk0ppb5XbyYkikOAXPHli4PUe4GOorSuhRdq3XlGWiMwh4yt48kF4vP+2ByuDOYQU6LjGs0wn/5LpN+ReLdXTab65Cz7WYTDrTndyIrhFg7cyT5m2gtiJuEgIJ45uaaeGNIecV6JSnRsEv4YD4m+I58yhyyvw9zd0Z5qP04QNjy7OK2UeQQKBgQD/EJpaVv0RR83Z6Hp2YVrPoiMz279U5bgkBbcxgr9GR2YYE3rrHqBdqch1Uitu+g6LIC+SDtib7yG9C7EqPHB3fsfEw8NtL54gy3OFbCcH3lqFxgtrCpQ2SIXQjd8932TpzcMdD6jzyUoSraT+lgkf2MgjqFiMbNVg50lGDyWujQKBgQCrdbXTttuazdwU0pdRFCuTz42iIJSZtHFUPvmbrBy7LFQ8NTN76dqLM1RUH7gJukPc4+Ax+DfpDgHZ4nQ2KSk9FweLqKSf10kojibKpc3nkgDRtUtSTar8fZn9VKTuXK1Ho0LUkjDlHjlEwUuf/Ef+IdjzXDJ2UPWHp2YzxvNDnwKBgBWGtjAnpUX/FF1upF83Si251lS7GAO3O3o2zUYtba0lu3UOt9H+DLS67oMQQ0AjdHTDa6BdBmTqoqNMyE/zN96t4Xg2uViOqz7DTOWWwhiE6IjftPj8tJN8PWbjglK7ds3QosXiG3UvqMO4yfL+gJiieAmiXI7FZKDABEwYXSrFAoGASXVe91vKbmJwPgOTjMsleGhd9+4ZfFjQjRWF/2oXzSFK3Zi1fAtO9ICDSp9kS9afqI2AyifcXF8B8AWTYHj2EBRDyVPxZAHqeBOfDwdGVkY5T59qq9JWxWJSjTSsjOrr2ltaEJSpmh/+zTQ7YEnH1ltOBcWkYQiCiSHxKZG9O2UCgYBfBTkjktzv81SnW47d0qRwmiXrcyObmXTe5fIW9e6KaB0SnzcVvoCmm7TTk+Bm4WqNmfb5k8U6J22vdxB1TPlRksnY+VZDM0Grv/xUII9G8oVQ4+NiE5XvQ7+nc5EBJ12of6GxE7/yXZiDld62q2sFZgrFzhvvHV+IADsu/VdIEw==",
//////                                "json","GBK",
//////                                "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApCzq4BIE4gMdEXxIAAUbiMpSytkzp+LVLVsBtji87rFGfWUcnrr3NKftaw0WtRu+36d1nDVOWW4CmgsOPyj1GOFoTcJOR/BqyIriwyLxpuMS8qgOqGJZXi+W4Nw2AJL6iMVwY2eI8F1G10gACK2I9TNJRzHh3tMTA6ItysbGoekRDtn6Xrkh5V6cyHQjLw0Q6MJK/68XT6/LWzarDEEYrSnIevOydMY32ptAgm5fp/h08M2khCmI6CuMWKmc87dPpd2krGVTALqprAQvB74AIqO+5DE0fN4LoitOYXAtWDCEF4kHN0hQUygIEGCwtMgEVzkf92VLlCX35YtDhWd1yQIDAQAB","RSA2");
//////                AlipayMerchantIndirectAuthorderCloseRequest request = new AlipayMerchantIndirectAuthorderCloseRequest();
//////                request.setBizContent("{" +
//////                        "  \"order_no\":\""+operatorAuth.getOrderNo()+"\"," +
//////                        "  \"out_biz_no\":\""+operatorAuth.getOutBizNo()+"\"" +
//////                        "}");
//////                AlipayMerchantIndirectAuthorderCloseResponse response = null;
//////                try {
//////                    response = alipayClient1.execute(request);
//////                } catch (AlipayApiException e) {
//////                    e.printStackTrace();
//////                }
//////                if(response.isSuccess()){
//////                    System.out.println("撤销申请单调用成功");
//////                } else {
//////                    System.out.println("撤销申请单调用失败");
//////                }
//////            }
//
////        }
//        }
    }


}

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java

@@ -390,6 +390,12 @@
        operatorAuth.setShopProvince(shopProvince);
        operatorAuth.setShopProvinceCode(shopProvinceCode);
        operatorAuth.setShopCityCode(shopCityCode);
        if(StringUtils.hasLength(province)&& province.equals("请选择省")){
            operatorAuth.setProvince(null);
        }
        if(StringUtils.hasLength(city)&& province.equals("请选择市")){
            operatorAuth.setCity(null);
        }
        operatorAuth.setProvince(province);
        operatorAuth.setProvinceCode(provinceCode);
        operatorAuth.setShopDistrict(shopDistrict);
@@ -435,7 +441,6 @@
                "      \"mobile\":\""+phone+"\"," +
                "    }" +
                "  ],";

        // todo 拼接
        String biz_cards="  \"biz_cards\":[" +
                "    {" +
@@ -485,6 +490,9 @@
        if (accountType.equals("bankCard")){
            request.setBizContent(param
                    + biz_cards+res);
        }else{
            request.setBizContent(param
                    +res);
        }
        AntMerchantExpandIndirectZftCreateResponse response = null;
        try {

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java

@@ -199,6 +199,9 @@
                String cityName = (String) stringObjectMap.get("city");
                stringObjectMap.put("provinceCity",provinceName+cityName);
                Integer managerId = (Integer) stringObjectMap.get("operatorId");
                if (managerId == null){
                    stringObjectMap.put("accountName","平台");
                }else{
                if (managerId==0){
                    stringObjectMap.put("accountName","平台");
                }else{
@@ -207,9 +210,10 @@
                        stringObjectMap.put("accountName",operator.getName());
                    }else{
                        stringObjectMap.put("accountName","平台");
                        }
                    }
                }

                    }
                }

            }
        }

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/PayMoneyUtil.java

@@ -65,9 +65,6 @@
    @Autowired
    private IOperatorUserService operatorUserService;




    /**
     * 处理直付通审核通过和拒绝消息
     */

 cloud-server-management/src/main/webapp/WEB-INF/view/system/storeValueConfig/StoreValueConfig.html

@@ -28,8 +28,6 @@
                                <div style="height: 200px;width: 1100px; border: 1px solid #e5e6e7;overflow-y: auto;">
                                    <table class="table table-striped table-bordered table-hover table-condensed">
                                        <thead>
                                        <tr>
                                        </tr>
                                        </thead>
                                        <tbody id="rules">
<!--                                        <tr class="rulesClass" style="display: flex; justify-content: space-between;">-->
@@ -114,11 +112,9 @@
    };
    var editor_1 = null;
    $(function () {

        var c = $("#content").val()
        var d= $("#description").val()
        var t = $("#time").val();

        var rulesTable = document.getElementById("rules");
        var rulesTimeTable = document.getElementById("rulesTime");
        // 将json串解析为对象
@@ -127,6 +123,7 @@
        // 普通储值规则
        for (var i = 0; i < data.rules.length; i++) {
            var rule = data.rules[i];

            var row = document.createElement("tr");
            row.className = "rulesClass";
            row.style.display = "flex";
@@ -167,7 +164,6 @@
            td2.style.textAlign = "center";
            td3.style.textAlign = "center";
            td4.style.textAlign = "center";

            td1.innerHTML = "*充值金额：<input placeholder='请输入充值金额' id='rechargeTime' name='rechargeTime' value='" + rule.money + "'>";
            row.appendChild(td1);
            td2.innerHTML = "*用户兑换玩湃币：<input placeholder='请输入兑换玩湃币' id='userTime' name='userTime' value='" + rule.usersCoins + "'>";

 cloud-server-management/src/main/webapp/static/modular/system/operatorUser/operatorUser.js

@@ -278,7 +278,7 @@
            Feng.error("输入的开户银行名称有误!");
            return;
        } else if (data.code==500){
            console.log(data)
            console.log(data);
            Feng.error("认证失败:"+data.msg);
            return;
        }else{

 cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java

@@ -541,8 +541,11 @@
        if (operatorId == null ){
            // 平台的门店
            smid1 = smid;
        }else if (operatorId == 0){
            smid1 = smid;
        }else{
            smid1 = siteService.getSMIDByOperatorId(operatorId);

        }
        ResultUtil alipay = payMoneyUtil.alipay(smid1,"预约场地", "预约场地", id.toString(), code, paymentPrice.toString(), "/base/site/aliPaymentSiteCallback");
        System.out.println("预约场地----" + alipay.getCode());
@@ -590,9 +593,11 @@
                                    String smid1 = "";
                                    if (operatorId == null ){
                                        // 平台的门店
                                    }else if (operatorId == 0){
                                        smid1 = smid;
                                    }else{
                                        smid1 = siteService.getSMIDByOperatorId(operatorId);

                                    }
                                    payMoneyUtil.confirm(smid1,code,tradeNo,paymentPrice.toString());
                                    break;