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

liujie

2025-08-05 c78417df3dc09978a82dd6f1e122a9bfb5f5cd06

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

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java

@@ -38,6 +38,8 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.util.*;

/**
@@ -128,9 +130,18 @@
        //获取证联数据
        if(null == driver.getCustId() || 0 == driver.getAccOpenFlag()){
            TradeTerminalInfo tradeTerminalInfo = new TradeTerminalInfo();
            tradeTerminalInfo.setIp("127.0.0.1");
            tradeTerminalInfo.setTerminal("1");
            tradeTerminalInfo.setMac("");
            InetAddress inetAddress = InetAddress.getLocalHost();
            String ip = inetAddress.getHostAddress();
            tradeTerminalInfo.setIp(ip);
            NetworkInterface networkInterface = NetworkInterface.getByInetAddress(inetAddress);
            byte[] mac = networkInterface.getHardwareAddress();
            StringBuilder macAddress = new StringBuilder();
            for (int i = 0; i < mac.length; i++) {
                macAddress.append(String.format("%02X%s", mac[i], (i < mac.length - 1) ? "-" : ""));
            }
            
            tradeTerminalInfo.setMac(macAddress.toString());
            ZLUserInfo userInfo = ZhengLianUtil.getUserInfo(driver.getEmpId().toString(), tradeTerminalInfo);
            if(null != userInfo){
                driver.setCustId(userInfo.getCustId());

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EnterpriseUtil.java

@@ -250,94 +250,8 @@
    }
    
    public static void main(String[] args) {
//        CreateEnterpriseRequest request = new CreateEnterpriseRequest();
//        request.setName("成都喜望科技有限公司");
//        request.setNickName("成都喜望");
//        request.setIndustry_code("123456789");
//        request.setMobile("18200000000");
//        request.setMobileFlag("1");
//        EnterpriseUtil.createEnterprise(request);

//        EnterpriseUtil.delEnterprise("981100006005878", "15828353127");
		
		
        //短信
//        SMSUtil.sendVerifyCode("15828353127");

//        CheckEnterExist checkEnterNameExist = EnterpriseUtil.checkEnterNameExist("成都喜望科技有限公司");

//        EnterpriseInfo enterpriseDetail = EnterpriseUtil.getEnterpriseDetail(checkEnterNameExist.getEnterCode());
//        System.out.println(enterpriseDetail);

//        List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone("15828353127", "981100006005878");

//        RegisterViaMobileRequest request = new RegisterViaMobileRequest();
//        request.setMobile("15828353126");
//        request.setPassword("123456");
//        request.setNickname("测试");
//        request.setVerify_code("1111");
//        request.setVerify_code_type("1");
//        RegisterViaMobile registerViaMobile = UserUtil.registerViaMobile(request);

//        ModifyPwdRequest request = new ModifyPwdRequest();
//        request.setMobile("15828353126");
//        request.setOldPwd("111111");
//        request.setNewPwd("654321");
//        request.setCode("1111");
//        UserUtil.modifyPwd(request);

//        ResetPwdRequest request = new ResetPwdRequest();
//        request.setMobile("15828353126");
//        request.setPassword("654321");
//        request.setCode("1111");
//        UserUtil.resetPwd(request);

//        SaveStaffNodeRequest request = new SaveStaffNodeRequest();
//        request.setMobile("15828353127");
//        request.setEntercode("981100006005878");
//        request.setEmpName("超级管理员");
//        request.setEmpNickname("超级管理员");
//        request.setLoginNo("18200000000");
//        request.setEmpSex("男");
//        request.setMphone("18200000000");
//        request.setEmail("sn93@qq.com");
//        request.setDeptId(0);
//        request.setPositionId(1);
//        request.setSuperLevel(0);
//        request.setHideMobile(0);
//        EmployeeUtil.saveStaffNode(request);
		
        //接口参数有问题
//        EditStaffNodeRequest request = new EditStaffNodeRequest();
//        request.setEmpId(11448071);
//        request.setMobile("15828353127");
//        request.setEntercode("981100006005901");
//        request.setEnterId(981100006005901L);
//        request.setEmpName("蒲师傅");
//        request.setEmpNickname("蒲师傅");
//        request.setLoginNo("15828353127");
//        request.setMphone("15828353127");
//        request.setEmail("393733352@qq.com");
//        request.setEmpSex("男");
//        request.setDeptId(0);
//        request.setPositionId(1);
//        request.setSuperLevel(0);
//        request.setHideMobile(0);
//        EmployeeUtil.editStaffNode(request);


//        GetStaffNodeRequest request = new GetStaffNodeRequest();
//        request.setEmpId(11448036L);
//        request.setMobile("15828353127");
//        request.setEntercode("981100006005878");
//        EmployeeUtil.getStaffNode(request);


//        DeleteStafNodeRequest request = new DeleteStafNodeRequest();
//        request.setEmpId(11448036);
//        request.setMobile("15828353127");
//        request.setEntercode("981100006005878");
//        EmployeeUtil.ecrmDeleteStafNode(request);
        CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist("成都喜望科技有限公司");
        System.out.println(checkEnterExist);
    }
    
    /**

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongProperties.java

@@ -16,8 +16,8 @@
    /**
     * 私钥地址
     */
    String privateKeyPath = "C:\\Users\\Admin\\Desktop\\qyt\\private_key_test.pem";
//    String privateKeyPath = "C:\\Users\\39373\\Desktop\\黔云通\\private_key_test.pem";
//    String privateKeyPath = "C:\\Users\\Admin\\Desktop\\qyt\\private_key_test.pem";
    String privateKeyPath = "C:\\Users\\39373\\Desktop\\黔云通\\private_key_test.pem";
    /**
     * 私钥地址
     */

 DriverQYTTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java

@@ -38,7 +38,7 @@
        tradeTerminalInfo.setMac("");
        ZLUserInfo userInfo = null;
        try {
            userInfo = ZhengLianUtil.getUserInfo("11448158", tradeTerminalInfo);
            userInfo = ZhengLianUtil.getUserInfo("14", tradeTerminalInfo);
        } catch (Exception e) {
            throw new RuntimeException(e);
        }