44323
2023-12-14 e77521b69f44fbdee2160bb43566108b3527cea1
11.27,9
3个文件已修改
39 ■■■■■ 已修改文件
cloud-server-course/src/main/resources/sharding-jdbc.properties 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/SaticScheduleTask.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-course/src/main/resources/sharding-jdbc.properties
@@ -14,9 +14,9 @@
datasource.names=master0
datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_course?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_course?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
datasource.master0.username=root
datasource.master0.password=playpai2023!
datasource.master0.password=123456
datasource.master0.maxActive=20
datasource.master0.maxWait=60000
datasource.master0.minIdle=5
cloud-server-management/src/main/java/com/dsh/guns/modular/system/api/SaticScheduleTask.java
@@ -47,8 +47,8 @@
        // 第三步:查询申请单审核结果
        AlipayMerchantIndirectAuthorderQuerystatusRequest request1 = new AlipayMerchantIndirectAuthorderQuerystatusRequest();
        request1.setBizContent("{" +
                "  \"order_no\":\""+operatorAuth.getOrderNo()+"\"," +
                "  \"out_biz_no\":\""+operatorAuth.getOutBizNo()+"\"," +
                "  \"order_no\":\""+"202312011045284847"+"\"," +
                "  \"out_biz_no\":\""+"83972149e3f84216ad2654a1571963f4"+"\"," +
                "}");
        AlipayMerchantIndirectAuthorderQuerystatusResponse response1 = null;
        try {
@@ -67,6 +67,8 @@
            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("");
@@ -81,14 +83,14 @@
                String substring = res.substring(0, res.length() - 1);
                operatorAuth.setRefuseReason(substring);
                operatorAuthService.updateById(operatorAuth);
                // 获取运营商的管理员id
/**
 * 状态 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)
@@ -98,27 +100,35 @@
            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;
                }
@@ -126,11 +136,9 @@
            }
            // 审核通过
            String qr_code = sign.getString("qr_code");
            if (qr_code!=null&& (!qr_code.equals(""))){
                // 将二维码链接保存起来
                operatorAuth.setQrCode(qr_code);
                operatorAuthService.updateById(operatorAuth);
            }
            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")){
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
@@ -171,9 +171,8 @@
            model.addAttribute("reasons",null);
            // 0不显示二维码
            model.addAttribute("type",0);
        }else{
            if (info.getOrderStatus().equals("AUDIT_PASS")){
            if (info.getOrderStatus().equals("AUDIT_PASS")||info.getOrderStatus().equals("LEGAL_CONFIRM")||info.getOrderStatus().equals("CONTACT_CONFIRM")){
                // 通过才展示二维码
                model.addAttribute("type",1);
            }else{
@@ -300,8 +299,6 @@
        operatorAuth.setBeneficiaryBack(beneficiaryBack);
        operatorAuth.setRefuseReason("");
        operatorAuth.setRemark(remark);
        // 将图片上传至阿里存储
        // 营业执照
        String string = uploadImg(businessPicture).toString();
@@ -397,8 +394,8 @@
//            String orderStatus = r.getString("order_status");
            operatorAuth.setOrderNo(order_no);
            operatorAuth.setOrderStatus(order_status);
            operatorAuth.setQrCode(null);
            operatorAuth.setRefuseReason(null);
            operatorAuthService.saveOrUpdate(operatorAuth);
            // 通过运营商id找到用户id
            TOperator byId = operatorService.getById(operatorId);