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

liujie

昨天 a73f1ac7a2d006b207f06534604100e01f6119a5

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

 DispatchQYTTravel/guns-admin/pom.xml

@@ -9,8 +9,9 @@
        <relativePath>../pom.xml</relativePath>
    </parent>

    <artifactId>guns-admin</artifactId>
    <artifactId>dispatch</artifactId>
    <name>guns-admin</name>
    <version>1.0.0</version>
    <description>guns 的spring boot版本</description>

    <packaging>jar</packaging>
@@ -186,6 +187,14 @@
            <artifactId>jpush-client</artifactId>
            <version>3.3.10</version>
        </dependency>
        <dependency>
            <groupId>cn.hutool</groupId>
            <artifactId>hutool-all</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-data-mongodb</artifactId>
        </dependency>
    </dependencies>



 DispatchQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderPositionServiceImpl.java

@@ -7,6 +7,10 @@
import com.stylefeng.guns.modular.system.model.OrderPosition;
import com.stylefeng.guns.modular.system.service.IOrderPositionService;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -21,8 +25,8 @@
    @Resource
    private OrderPositionMapper orderPositionMapper;

    @Value("${filePath}")
    private String filePath;
    @Resource
    private MongoTemplate mongoTemplate;



@@ -50,22 +54,10 @@
    @Override
    public List<OrderPosition> queryPosition(Integer orderId, Integer orderType) throws Exception{
        //将数据存储到文件中
        File file = new File(filePath + orderId + "_" + orderType + ".txt");
        if(!file.exists()){
            return new ArrayList<>();
        }
        //读取文件(字符流)
        BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8"));
        //循环取出数据
        String str = null;
        StringBuffer sb = new StringBuffer();
        while ((str = in.readLine()) != null) {
            sb.append(str);
        }
        List<OrderPosition> list = new ArrayList<>();
        if(ToolUtil.isNotEmpty(sb.toString())){
            list = JSONArray.parseArray(sb.toString(), OrderPosition.class);
        }
        return list;
        Query query = new Query()
                .addCriteria(Criteria.where("orderId").is(orderId).and("orderType").is(orderType))
                .with(new Sort(Sort.Direction.ASC, "insertTime"));
        List<OrderPosition> positions = mongoTemplate.find(query, OrderPosition.class);
        return positions;
    }
}

 DispatchQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java

@@ -581,7 +581,9 @@
            for(int i = orderCrossCity.getPeopleNumber(); i < split1.length; i++){
                seat2 += split1[i] + ",";
            }
            lineShiftDriver1.setLaveSeatNumber(seat2.substring(0, seat2.length() - 1));
            if(ToolUtil.isNotEmpty(seat2)){
                lineShiftDriver1.setLaveSeatNumber(seat2.substring(0, seat2.length() - 1));
            }
            lineShiftDriverMapper.updateById(lineShiftDriver1);
            Driver driver = driverService.selectById(driverId);
            if(driver.getState() == 1){

 DispatchQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDFalconUtil.java

@@ -21,7 +21,7 @@
@Component
public class GDFalconUtil implements ApplicationRunner {

    private String key = "ba2915f8d8c1428df72e964a5f94f167";
    private String key = "ea7326a77175aba0e9435859b17bca36";

    @Autowired
    private RestTemplate restTemplate;

 DispatchQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java

@@ -34,7 +34,7 @@
    @Autowired
    private IGDInterfaceService gdInterfaceService;

    private String key = "ba2915f8d8c1428df72e964a5f94f167";
    private String key = "ea7326a77175aba0e9435859b17bca36";

    private JSONArray jsonArray = new JSONArray();


 DispatchQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java

@@ -20,7 +20,7 @@
@Component
public class GDMapGeocodingUtil {

    private String key = "ba2915f8d8c1428df72e964a5f94f167";
    private String key = "ea7326a77175aba0e9435859b17bca36";

    @Autowired
    private RestTemplate restTemplate;

 DispatchQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java

@@ -1,5 +1,8 @@
package com.stylefeng.guns.modular.system.util;

import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.stylefeng.guns.core.util.ToolUtil;
@@ -8,6 +11,7 @@
import com.stylefeng.guns.modular.system.service.IOrderCrossCityService;
import com.stylefeng.guns.modular.system.service.IOrderPrivateCarService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
@@ -24,6 +28,9 @@
 */
@Component
public class PushUtil {

    @Value("${qyt.socket_uri}")
    private String socket_uri;

    @Autowired
    private RestTemplate internalRestTemplate;
@@ -66,19 +73,23 @@
        jsonObject.put("data", map);

        //调用推送
        HttpHeaders headers = new HttpHeaders();
        // 以表单的方式提交
        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
        HttpRequest post = HttpUtil.createPost(socket_uri + "/netty/sendMsgToClient");
        post.header("Content-Type", MediaType.APPLICATION_FORM_URLENCODED_VALUE);
        //将请求头部和参数合成一个请求
        MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
        params.add("msg", jsonObject.toJSONString());
        params.add("id", String.valueOf(uid));
        params.add("type", String.valueOf(type));
        HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
        String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
        JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
        if(jsonObject1.getIntValue("code") != 200){
            System.err.println(jsonObject1.getString("msg"));
        Map<String, Object> params = new HashMap<>();
        params.put("msg", jsonObject.toJSONString());
        params.put("id", uid);
        params.put("type", type);
        params.put("bussinessType", "dache");
        post.form(params);
        HttpResponse execute = post.execute();
        if (200 != execute.getStatus()) {
            System.err.println("推送异常");
        } else {
            JSONObject jsonObject1 = JSON.parseObject(execute.body(), JSONObject.class);
            if (jsonObject1.getIntValue("code") != 200) {
                System.err.println(jsonObject1.getString("msg"));
            }
        }
    }

@@ -101,19 +112,23 @@
        jsonObject.put("data", map);

        //调用推送
        HttpHeaders headers = new HttpHeaders();
        // 以表单的方式提交
        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
        HttpRequest post = HttpUtil.createPost(socket_uri + "/netty/sendMsgToClient");
        post.header("Content-Type", MediaType.APPLICATION_FORM_URLENCODED_VALUE);
        //将请求头部和参数合成一个请求
        MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
        params.add("msg", jsonObject.toJSONString());
        params.add("id", String.valueOf(uid));
        params.add("type", String.valueOf(type));
        HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
        String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
        JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
        if(jsonObject1.getIntValue("code") != 200){
            System.err.println(jsonObject1.getString("msg"));
        Map<String, Object> params = new HashMap<>();
        params.put("msg", jsonObject.toJSONString());
        params.put("id", uid);
        params.put("type", type);
        params.put("bussinessType", "dache");
        post.form(params);
        HttpResponse execute = post.execute();
        if (200 != execute.getStatus()) {
            System.err.println("推送异常");
        } else {
            JSONObject jsonObject1 = JSON.parseObject(execute.body(), JSONObject.class);
            if (jsonObject1.getIntValue("code") != 200) {
                System.err.println(jsonObject1.getString("msg"));
            }
        }
    }

@@ -258,10 +273,6 @@

        msg.put("data", map);

        //调用推送
        HttpHeaders headers = new HttpHeaders();
        // 以表单的方式提交
        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
        //将请求头部和参数合成一个请求
        String value1 = redisUtil.getValue(orderId + "_" + orderType);
        if(ToolUtil.isEmpty(value1)){
@@ -269,15 +280,24 @@
            return;
        }
        JSONObject jsonObject = JSON.parseObject(value1);
        MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
        params.add("msg", msg.toJSONString());
        params.add("id", jsonObject.getString("id"));
        params.add("type", jsonObject.getString("type"));
        HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
        String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
        JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
        if(jsonObject1.getIntValue("code") != 200){
            System.err.println(jsonObject1.getString("msg"));
        //调用推送
        HttpRequest post = HttpUtil.createPost(socket_uri + "/netty/sendMsgToClient");
        post.header("Content-Type", MediaType.APPLICATION_FORM_URLENCODED_VALUE);
        //将请求头部和参数合成一个请求
        Map<String, Object> params = new HashMap<>();
        params.put("msg", msg.toJSONString());
        params.put("id", jsonObject.getString("id"));
        params.put("type", jsonObject.getString("type"));
        params.put("bussinessType", "dache");
        post.form(params);
        HttpResponse execute = post.execute();
        if (200 != execute.getStatus()) {
            System.err.println("推送异常");
        } else {
            JSONObject jsonObject1 = JSON.parseObject(execute.body(), JSONObject.class);
            if (jsonObject1.getIntValue("code") != 200) {
                System.err.println(jsonObject1.getString("msg"));
            }
        }
    }

@@ -295,19 +315,23 @@
        msg.put("data", new Object());

        //调用推送
        HttpHeaders headers = new HttpHeaders();
        // 以表单的方式提交
        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
        HttpRequest post = HttpUtil.createPost(socket_uri + "/netty/sendMsgToClient");
        post.header("Content-Type", MediaType.APPLICATION_FORM_URLENCODED_VALUE);
        //将请求头部和参数合成一个请求
        MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
        params.add("msg", msg.toJSONString());
        params.add("id", id.toString());
        params.add("type", type.toString());
        HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
        String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
        JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
        if(jsonObject1.getIntValue("code") != 200){
            System.err.println(jsonObject1.getString("msg"));
        Map<String, Object> params = new HashMap<>();
        params.put("msg", msg.toJSONString());
        params.put("id", id);
        params.put("type", type);
        params.put("bussinessType", "dache");
        post.form(params);
        HttpResponse execute = post.execute();
        if (200 != execute.getStatus()) {
            System.err.println("推送异常");
        } else {
            JSONObject jsonObject1 = JSON.parseObject(execute.body(), JSONObject.class);
            if (jsonObject1.getIntValue("code") != 200) {
                System.err.println(jsonObject1.getString("msg"));
            }
        }
    }


 DispatchQYTTravel/guns-admin/src/main/resources/application.yml

@@ -1,107 +1,3 @@
server:
  port: 7008

guns:
  swagger-open: true              #是否开启swagger (true/false)
  kaptcha-open: false             #是否开启登录时验证码 (true/false)
#  file-upload-path: d:/tmp       #文件上传目录(不配置的话为java.io.tmpdir目录)
  spring-session-open: false      #是否开启spring session,如果是多机环境需要开启(true/false)
  session-invalidate-time: 1800     #session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒
  session-validation-interval: 900  #多久检测一次失效的session(只在单机环境下生效) 单位：秒

spring:
  application:
    name: dispatch-server
  profiles:
    active: dev
#    active: produce
  mvc:
    static-path-pattern: /static/**
    view:
      prefix: /WEB-INF/view
  devtools:
    restart:
      enabled: false
      additional-paths: src/main/java
      exclude: static/**,WEB-INF/view/**
  servlet:
    multipart:
      max-request-size: 100MB
      max-file-size: 100MB

mybatis-plus:
  typeAliasesPackage: com.stylefeng.guns.modular.system.model

log:
  path: guns-logs

eureka:
  client:
    service-url: #注册中心地址
      defaultZone: http://sinata:sinata@192.168.110.106:8000/eureka #启用身份验证的方式连接
    register-with-eureka: true #在注册中心进行注册
    fetch-registry: true #从Eureka中获取注册信息。

---

#配置Swagger接口扫描范围
swagger:
  base-package: com.stylefeng.guns.modular




spring:
  datasource:
    url: jdbc:mysql://192.168.110.80:3306/qyttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: 123456
    db-name: jyxtravel #用来搜集数据库的所有表
    filters: wall,mergeStat

---


wx:
  grantType: authorization_code #填authorization_code
  appid: 111 #应用唯一标识，在微信开放平台提交应用审核通过后获得
  appSecret: 111 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
  appletsAppid: wxcc3c9058e2b294db #小程序APPid
  appletsAppSecret: 5610fc6126255ca5f7bd9fa4330338b6 #
  mchId: 111 #微信支付分配的商户号
  key: 111 #key为商户平台设置的密钥key：

---

alipay:
  appid: 111  #应用程序唯一标识
  appPrivateKey: 111 #开发者应用私钥
  alipayPublicKey: ; #应用公钥
  alipay_public_key: 111 #支付宝公钥

---

juhe: #聚合数据
  appKey: 111 #


---

filePath: C:/orderPostionFile/  #存储订单轨迹文件路径



#支付回调地址
#正式环境
callbackPath: https://zhentonggongsi.com:443/user


---

#交通部推送数据功能开关
pushMinistryOfTransport: false

---
jiguang:
  masterSecret: 111
  appKey: 111
    active: "@spring.active@"

 DispatchQYTTravel/guns-parent.iml

File was deleted

 DispatchQYTTravel/pom.xml

@@ -222,19 +222,13 @@

    <profiles>
        <profile>
            <id>local</id>
            <properties>
                <spring.active>local</spring.active>
            </properties>
            <activation>
                <activeByDefault>true</activeByDefault>
            </activation>
        </profile>
        <profile>
            <id>dev</id>
            <properties>
                <spring.active>dev</spring.active>
            </properties>
            <activation>
                <activeByDefault>true</activeByDefault>
            </activation>
        </profile>
        <profile>
            <id>test</id>
@@ -243,9 +237,9 @@
            </properties>
        </profile>
        <profile>
            <id>produce</id>
            <id>prod</id>
            <properties>
                <spring.active>produce</spring.active>
                <spring.active>prod</spring.active>
            </properties>
        </profile>
    </profiles>

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java

@@ -20,12 +20,10 @@
import com.stylefeng.guns.modular.crossCity.warpper.OrderCrossCityWarpper;
import com.stylefeng.guns.modular.specialTrain.dao.OrderPrivateCarMapper;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import com.stylefeng.guns.modular.system.dao.PhoneMapper;
import com.stylefeng.guns.modular.system.dao.RegionMapper;
import com.stylefeng.guns.modular.system.dao.SysIntegralMapper;
import com.stylefeng.guns.modular.system.dao.UserInfoMapper;
import com.stylefeng.guns.modular.system.dao.*;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.service.impl.CarServiceImpl;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import com.stylefeng.guns.modular.system.warpper.MerchantCouponListWarpper;
@@ -160,6 +158,10 @@

    @Value("${callbackPath}")
    private String callbackPath;
    @Autowired
    private CarModelMapper carModelMapper;
    @Autowired
    private CarServiceImpl carServiceImpl;


    /**
@@ -296,7 +298,13 @@

                //还原座位数
                LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(orderCrossCity.getLineShiftDriverId());
                lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber());
                if(1 == orderCrossCity.getTravelMode()){
                    lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber());
                }else{
                    Car car = carServiceImpl.selectById(driver.getCarId());
                    CarModel carModel = carModelMapper.selectById(car.getCarModelId());
                    lineShiftDriver.setLaveSeat(carModel.getSeat() - 1);
                }
                lineShiftDriver.setLaveSeatNumber(
                        (ToolUtil.isNotEmpty(lineShiftDriver.getLaveSeatNumber()) ? lineShiftDriver.getLaveSeatNumber() + ","  : "") +
                                orderCrossCity.getSeatNumber()
@@ -305,7 +313,7 @@

                //修改司机空闲状态
                List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.queryWithin30Minutes(orderCrossCity.getDriverId(), 2, 3, 4, 5, 11);
                if(orderCrossCities.size() == 0){
                if(orderCrossCities.size() <= 1){
                    driver = driverService.selectById(orderCrossCity.getDriverId());
                    driver.setState(2);
                    driverService.updateById(driver);

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

@@ -586,7 +586,7 @@
     * @return
     */
    public static GetPaymentInfo paymentInfo(GetPaymentInfoDataRequest getPaymentInfoDataRequest) {
        getPaymentInfoDataRequest.setPartnerId("5400004");
        getPaymentInfoDataRequest.setPartnerId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "5401007" : "5400004");
        
        GetPaymentInfoRequest request = new GetPaymentInfoRequest();
        request.setRequstType("POST");

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java

@@ -144,23 +144,27 @@
     */
    @Override
    public ResultUtil grabOrder(Integer orderId, Integer uid) throws Exception {
        OrderPrivateCar orderPrivateCar1 = orderPrivateCarService.selectById(orderId);
        if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && orderPrivateCar1.getState() != 1&& orderPrivateCar1.getState() != 11){
            return ResultUtil.error("订单已被抢了");
        }
        OrderTaxi orderTaxi = null;
        if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && (orderPrivateCar1.getState() == 1||  orderPrivateCar1.getState() == 11)){
            orderPrivateCarService.deleteById(orderId);
            OrderTaxi orderTaxi1 = setOrderTaxi(orderPrivateCar1);
            this.insert(orderTaxi1);
            orderTaxi = orderTaxi1;
        OrderTaxi orderTaxi = this.selectById(orderId);
        if(null != orderTaxi && orderTaxi.getType() == 2){
            if(orderTaxi.getState() != 1){
                return ResultUtil.error("订单已被抢了");
            }
        }else{
            orderTaxi = this.selectById(orderId);
            OrderPrivateCar orderPrivateCar1 = orderPrivateCarService.selectById(orderId);
            if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && orderPrivateCar1.getState() != 1&& orderPrivateCar1.getState() != 11){
                return ResultUtil.error("订单已被抢了");
            }
            orderTaxi = null;
            if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && (orderPrivateCar1.getState() == 1||  orderPrivateCar1.getState() == 11)){
                orderPrivateCarService.deleteById(orderId);
                OrderTaxi orderTaxi1 = setOrderTaxi(orderPrivateCar1);
                this.insert(orderTaxi1);
                orderTaxi = orderTaxi1;
            }
        }
        if(null == orderTaxi){
            return ResultUtil.error("订单已被抢了");
        }


        //处理摆渡车的情况
        if(orderTaxi.getType() == 2){

 DriverQYTTravel/guns-admin/src/main/resources/logback.xml

@@ -7,7 +7,7 @@
    <contextName>logback</contextName>
    
    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
    <property name="log.path" value="/etraffic/server/logs/driver"/>
    <property name="log.path" value="/etraffic/server/chuxing/logs/driver"/>
    
    <!--0. 日志格式和颜色渲染 -->
    <!-- 彩色日志依赖的渲染类 -->

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

@@ -1,24 +1,25 @@
//package com.stylefeng.guns;
//
//import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
//import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
//import org.junit.Test;
//import org.junit.runner.RunWith;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.boot.test.context.SpringBootTest;
//import org.springframework.test.context.junit4.SpringRunner;
//
//import javax.annotation.Resource;
//
//@RunWith(SpringRunner.class)
//@SpringBootTest
//public class GunsApplicationTest {
//
//    @Autowired
//    private IOrderPrivateCarService orderPrivateCarService;
//    @Resource
//    private IOrderTaxiService orderTaxiService;
//
//
//    @Test
//    public void test() {
//        try {
//            orderPrivateCarService.queryMoneyInfo(369);
//            orderTaxiService.grabOrder(819, 14);
//        } catch (Exception e) {
//            throw new RuntimeException(e);
//        }

 EurekaQYTTravel/src/main/resources/application-dev.yml

@@ -15,7 +15,7 @@

eureka:
  instance:
    hostname: 127.0.0.1 #注册中心地址
    hostname: 192.168.110.106 #注册中心地址
  client:
    service-url: #客户端调用地址
      defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java

@@ -206,7 +206,7 @@
            registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.loginUrl", "https://testsso1.teamshub.com/login");
            registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.validateUrl", "https://testsso1.teamshub.com/serviceValidate");
            registrationBean.addInitParameter("com.oncon.md.loginUrl", "https://testsso1.teamshub.com/sso-session/login");
            registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.serverName", "http://127.0.0.1:8010");
            registrationBean.addInitParameter("edu.yale.its.tp.cas.client.filter.serverName", "http://192.168.110.85:8010");
        }
        if("test".equals(activeProfile)){
            registrationBean.setFilter(onconMDCasFilter);

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/AppComplaintsController.java

@@ -98,7 +98,7 @@
        if(SinataUtil.isNotEmpty(endTime)){
            appComplaintsEntityWrapper.le("addTime",endTime +" 23:59:59");
        }
//        appComplaintsEntityWrapper.eq("type",1);
//        appComplaintsEntityWrapper.eq("type",3);
        Page<AppComplaints> page = new PageFactory<AppComplaints>().defaultPage();
        appComplaintsEntityWrapper.orderBy("addTime",false);//
        page.setRecords(appComplaintsService.selectMapsPage(page, appComplaintsEntityWrapper).getRecords());

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java

@@ -320,7 +320,7 @@
                        Integer dck1, Integer dck2,Integer driverDays) {
        //改派设置
        if("reassigningSet".equals(type)){
            TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
            TSysReformist reformist = tSysReformistService.selectOne(new EntityWrapper<TSysReformist>().eq("openCityId", openCityId));
            if (SinataUtil.isNotEmpty(reformist)){
                reformist.setOpenCityId(openCityId);
                reformist.setMoney(one);
@@ -337,7 +337,7 @@
            }
        }
        if("driverPayDays".equals(type)){
            TDriverPayDays tDriverPayDays = driverPayDaysService.selectOne(new EntityWrapper<TDriverPayDays>().eq("company_id", shiroExtUtil.getUser().getObjectId()));
            TDriverPayDays tDriverPayDays = driverPayDaysService.selectOne(new EntityWrapper<TDriverPayDays>().eq("openCityId", openCityId));
            if (SinataUtil.isNotEmpty(tDriverPayDays)){
                tDriverPayDays.setDay(driverDays);
                tDriverPayDays.setUpdateTime(new Date());
@@ -352,7 +352,7 @@

        //积分设置
        if("integralSet".equals(type)){
            TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
            TSysIntegral integral = tSysIntegralService.selectOne(new EntityWrapper<TSysIntegral>().eq("openCityId", openCityId));
            if (SinataUtil.isNotEmpty(integral)){
                integral.setOpenCityId(openCityId);
                integral.setIntegral(two);
@@ -367,7 +367,7 @@

        //人脸识别
        if("faceRecognitionSettings".equals(type)){
            TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
            TSysFaceDistinguish faceDistinguish = tSysFaceDistinguishService.selectOne(new EntityWrapper<TSysFaceDistinguish>().eq("openCityId", openCityId));
            if (SinataUtil.isNotEmpty(faceDistinguish)){
                faceDistinguish.setOpenCityId(openCityId);
                faceDistinguish.setIsOpen(three);
@@ -385,7 +385,7 @@
        //推单设置
        if("pushOrderSettings".equals(type)){
            //快车推单(第一轮)
            TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 1));
            TSysPushOrder zcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", openCityId).eq("pushType", 1).eq("type", 1));
            if (SinataUtil.isNotEmpty(zcOne)){
                zcOne.setOpenCityId(openCityId);
                zcOne.setPushDistance(zc1);
@@ -403,7 +403,7 @@
                tSysPushOrderService.insert(zcOne);
            }
            //快车推单(第二轮)
            TSysPushOrder zcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 2));
            TSysPushOrder zcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", openCityId).eq("pushType", 1).eq("type", 2));
            if (SinataUtil.isNotEmpty(zcTwo)){
                zcTwo.setOpenCityId(openCityId);
                zcTwo.setPushDistance(zc4);
@@ -421,7 +421,7 @@
                tSysPushOrderService.insert(zcTwo);
            }
            //快车推单(第三轮)
            TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 1).eq("type", 3));
            TSysPushOrder zcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", openCityId).eq("pushType", 1).eq("type", 3));
            if (SinataUtil.isNotEmpty(zcThree)){
                zcThree.setOpenCityId(openCityId);
                zcThree.setPushDistance(zc7);
@@ -440,7 +440,7 @@
            }

            //出租车推单(第一轮)
            TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
            TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", openCityId).eq("pushType", 2).eq("type", 1));
            if (SinataUtil.isNotEmpty(czcOne)){
                czcOne.setOpenCityId(openCityId);
                czcOne.setPushDistance(czc1);
@@ -458,7 +458,7 @@
                tSysPushOrderService.insert(czcOne);
            }
            //出租车推单(第二轮)
            TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
            TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", openCityId).eq("pushType", 2).eq("type", 2));
            if (SinataUtil.isNotEmpty(czcTwo)){
                czcTwo.setOpenCityId(openCityId);
                czcTwo.setPushDistance(czc4);
@@ -476,7 +476,7 @@
                tSysPushOrderService.insert(czcTwo);
            }
            //出租车推单(第三轮)
            TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
            TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("openCityId", openCityId).eq("pushType", 2).eq("type", 3));
            if (SinataUtil.isNotEmpty(czcThree)){
                czcThree.setOpenCityId(openCityId);
                czcThree.setPushDistance(czc7);
@@ -498,7 +498,7 @@
        //取消设置
        if("cancelOrderSettings".equals(type)){
            //普通取消设置(快车)
            TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 1));
            TSysCancleOrder ptCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", openCityId).eq("type", 1).eq("orderType", 1));
            if (SinataUtil.isNotEmpty(ptCancelOne)){
                ptCancelOne.setOpenCityId(openCityId);
                ptCancelOne.setMinuteNum(ptCancel1);
@@ -515,7 +515,7 @@
            }

            //普通取消设置(出租车)
            TSysCancleOrder ptCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 2));
            TSysCancleOrder ptCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", openCityId).eq("type", 1).eq("orderType", 2));
            if (SinataUtil.isNotEmpty(ptCancelTwo)){
                ptCancelTwo.setOpenCityId(openCityId);
                ptCancelTwo.setMinuteNum(ptCancel3);
@@ -532,7 +532,7 @@
            }

            //普通取消设置(跨城出行)
            TSysCancleOrder ptCancelThree = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1).eq("orderType", 3));
            TSysCancleOrder ptCancelThree = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", openCityId).eq("type", 1).eq("orderType", 3));
            if (SinataUtil.isNotEmpty(ptCancelThree)){
                ptCancelThree.setOpenCityId(openCityId);
                ptCancelThree.setMinuteNum(ptCancel5);
@@ -552,7 +552,7 @@
        //预约取消设置
        if("cancelTheReservationOrderSetting".equals(type)){
            //预约取消设置(快车)
            TSysCancleOrder yyCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2).eq("orderType", 1));
            TSysCancleOrder yyCancelOne = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", openCityId).eq("type", 2).eq("orderType", 1));
            if (SinataUtil.isNotEmpty(yyCancelOne)){
                yyCancelOne.setOpenCityId(openCityId);
                yyCancelOne.setMinuteNum(yyCancel1);
@@ -568,7 +568,7 @@
                tSysCancleOrderService.insert(yyCancelOne);
            }
            //预约取消设置(出租车)
            TSysCancleOrder yyCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2).eq("orderType", 2));
            TSysCancleOrder yyCancelTwo = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("openCityId", openCityId).eq("type", 2).eq("orderType", 2));
            if (SinataUtil.isNotEmpty(yyCancelTwo)){
                yyCancelTwo.setOpenCityId(openCityId);
                yyCancelTwo.setMinuteNum(yyCancel3);
@@ -587,7 +587,7 @@

        //拼单派单
        if("spellOrderSetting".equals(type)) {
            SpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<SpellOrderRule>().eq("companyId", shiroExtUtil.getUser().getObjectId()));
            SpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<SpellOrderRule>().eq("openCityId", openCityId));
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("num1", pdpd1);
            jsonObject.put("num2", pdpd2);
@@ -610,7 +610,7 @@
        //电话设置
        if("phoneSettings".equals(type)){
            //报警电话
            TPhone phoneOne = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 1));
            TPhone phoneOne = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("openCityId", openCityId).eq("type", 1));
            if (SinataUtil.isNotEmpty(phoneOne)){
                phoneOne.setOpenCityId(openCityId);
                phoneOne.setPhone(phone1);
@@ -628,7 +628,7 @@
                tPhoneService.insert(phoneOne);
            }
            //客服电话
            TPhone phoneTwo = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 2));
            TPhone phoneTwo = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("openCityId", openCityId).eq("type", 2));
            if (SinataUtil.isNotEmpty(phoneTwo)){
                phoneTwo.setOpenCityId(openCityId);
                phoneTwo.setPhone(phone2);
@@ -647,7 +647,7 @@
            }

            //客服电话
            TPhone phone = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 3));
            TPhone phone = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("openCityId", openCityId).eq("type", 3));
            if (SinataUtil.isNotEmpty(phone)){
                phone.setOpenCityId(openCityId);
                phone.setPhone(phone3);
@@ -666,7 +666,7 @@
            }

            //招聘电话
            TPhone phoneFive = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 5));
            TPhone phoneFive = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("openCityId", openCityId).eq("type", 5));
            if (SinataUtil.isNotEmpty(phoneFive)){
                phoneFive.setOpenCityId(openCityId);
                phoneFive.setPhone(phone5);
@@ -688,7 +688,7 @@
        //95128
        if("95128TheOnCall".equals(type)){
            //95128电召电话
            TPhone phoneFour = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("companyId", shiroExtUtil.getUser().getObjectId()).eq("type", 4));
            TPhone phoneFour = tPhoneService.selectOne(new EntityWrapper<TPhone>().eq("openCityId", openCityId).eq("type", 4));
            if (SinataUtil.isNotEmpty(phoneFour)){
                phoneFour.setOpenCityId(openCityId);
                phoneFour.setPhone(phone4);

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/RoleMapper.xml

@@ -66,14 +66,14 @@
        ID
        FROM
        sys_role
        WHERE r.objectId = #{objectId} and
        WHERE objectId = #{objectId} and
        ID IN

        <foreach collection="array" index="index" item="i" open="(" separator="," close=")">
            #{i}
        </foreach>

        ) r1 ON r.ID = r1.ID where objectId = #{objectId}
        ) r1 ON r.ID = r1.ID where r.objectId = #{objectId}
        ORDER BY
        pId,
        num ASC

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java

@@ -586,7 +586,7 @@
     * @return
     */
    public static GetPaymentInfo paymentInfo(GetPaymentInfoDataRequest getPaymentInfoDataRequest) {
        getPaymentInfoDataRequest.setPartnerId("5400004");
        getPaymentInfoDataRequest.setPartnerId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "5401007" : "5400004");
        
        GetPaymentInfoRequest request = new GetPaymentInfoRequest();
        request.setRequstType("POST");

 ManagementQYTTravel/guns-admin/src/main/resources/logback.xml

@@ -7,7 +7,7 @@
    <contextName>logback</contextName>
    
    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
    <property name="log.path" value="/etraffic/server/logs/management"/>
    <property name="log.path" value="/etraffic/server/chuxing/logs/management"/>
    
    <!--0. 日志格式和颜色渲染 -->
    <!-- 彩色日志依赖的渲染类 -->

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/shunfeng/appDriverRide/appDriverRide_detail.html

@@ -6,8 +6,8 @@
                <div class="col-sm-6">
                    <input type="hidden" id="id" name="id" value="${item.id}">
                    <#label id="userId" name="用户id"  value="${item.userId}"/>
                    <#label id="phone" name="用户手机号"  value="${user.phone}"/>
                    <#label id="realName" name="真实姓名"  value="${user.name}"/>
                    <#label id="phone" name="用户手机号"  value="${null != user ? user.phone : ''}"/>
                    <#label id="realName" name="真实姓名"  value="${null != user ? user.name : ''}"/>
                    <#label id="identity" name="驾驶证号"  value="${item.license}"/>
                    <div class="form-group">
                        <label class="col-sm-3 control-label">驾驶证照片</label>
@@ -18,7 +18,7 @@
                    <div class="form-group">
                        <label class="col-sm-3 control-label">认证照片</label>
                        <div class="col-sm-9">
                            <img src="${user.certificationImg}" width="150px" height="150px" onclick="showBigPic(this)">
                            <img src="${null != user ? user.certificationImg : ''}" width="150px" height="150px" onclick="showBigPic(this)">
                        </div>
                    </div>
                    <#label id="identity" name="车辆品牌"  value="${item.carType}"/>

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/shunfeng/appParamRide/appParamRide.html

@@ -82,8 +82,8 @@
    <div class="titleDiv">
        <div id="titleDivU1" class="titleItem titleItemCk" onclick="AppParamRide.titleClick('titleDivU1',1)">价格设置</div>
        <div id="titleDivU2" class="titleItem " onclick="AppParamRide.titleClick('titleDivU2',2)">平台抽成</div>
        <div id="titleDivU3" class="titleItem" onclick="AppParamRide.titleClick('titleDivU3',3)">乘客退单</div>
        <div id="titleDivU4" class="titleItem" onclick="AppParamRide.titleClick('titleDivU4',4)">司机退单</div>
<!--        <div id="titleDivU3" class="titleItem" onclick="AppParamRide.titleClick('titleDivU3',3)">乘客退单</div>-->
<!--        <div id="titleDivU4" class="titleItem" onclick="AppParamRide.titleClick('titleDivU4',4)">司机退单</div>-->
    </div>
    <!--价格设置-->
    <div class="ibox float-e-margins" id="titleDivU1Form">

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/franchisee_info.js

@@ -23,6 +23,10 @@
            validators: {
                notEmpty: {
                    message: '登录账号不能为空'
                },
                regexp: {
                    regexp: /^1[3-9]\d{9}$/,
                    message: '登录账号格式不正确'
                }
            }
        },
@@ -47,6 +51,17 @@
                    message: '两次密码不一致'
                },
            }
        },
        identifier: {
            validators: {
                notEmpty: {
                    message: '统一社会信用代码不能为空'
                },
                regexp: {
                    regexp: /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/i,
                    message: '统一社会信用代码格式不正确'
                }
            }
        }
    }
};

 ManagementQYTTravel/guns-admin/src/main/webapp/static/modular/system/tCompany/tCompany_info.js

@@ -16,6 +16,10 @@
            validators: {
                notEmpty: {
                    message: '登录账号不能为空'
                },
                regexp: {
                    regexp: /^1[3-9]\d{9}$/,
                    message: '登录账号格式不正确'
                }
            }
        },
@@ -51,6 +55,17 @@
                    message: '分账账期格式不正确'
                }
            }
        },
        identifier: {
            validators: {
                notEmpty: {
                    message: '统一社会信用代码不能为空'
                },
                regexp: {
                    regexp: /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/i,
                    message: '统一社会信用代码格式不正确'
                }
            }
        }
    }
};

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java

@@ -419,7 +419,7 @@
            }
            UserInfo userInfo = userInfoService.selectById(uid);
            if(ToolUtil.isEmpty(userInfo.getOnconUUID())){
                String onconUUIDByMobile = UserUtil.getOnconUUIDByMobile("15828353127");
                String onconUUIDByMobile = UserUtil.getOnconUUIDByMobile(userInfo.getPhone());
                userInfo.setOnconUUID(onconUUIDByMobile);
                userInfoService.updateById(userInfo);
            }

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java

@@ -1263,7 +1263,6 @@
        orderCrossCity.setPassengers(userInfo.getNickName());
        orderCrossCity.setPassengersPhone(userInfo.getPhone());
        orderCrossCity.setPeopleNumber(orderCrossCityWarpper.getPeopleNumber());
        orderCrossCity.setSeatNumber(orderCrossCityWarpper.getSeatNumber());
        List<OrderCrossCity> orderCrossCities = this.selectList(new EntityWrapper<OrderCrossCity>().eq("orderNum", orderCrossCity.getOrderNum()).eq("isDelete", 1));
        orderCrossCity.setSort(orderCrossCities.size() + 1);
        orderCrossCity.setState(7);//待支付
@@ -1275,6 +1274,11 @@
        orderCrossCity.setIsDelete(1);
        orderCrossCity.setRemark(orderCrossCityWarpper.getRemark());
        orderCrossCity.setIsReassign(1);
        if(1 == orderCrossCity.getTravelMode()){
            orderCrossCity.setSeatNumber(orderCrossCityWarpper.getSeatNumber());
        }else{
            orderCrossCity.setSeatNumber(lineShiftDriver.getLaveSeatNumber());
        }
//        //调用高德创建轨迹
//        String s = gdFalconUtil.selectTerminal(driver.getPhone());
//        String track = gdFalconUtil.createTrack(s);
@@ -2468,7 +2472,7 @@
                                    for (Map<String, Integer> map : datas) {
                                        Integer orderType = map.get("orderType");
                                        Integer orderId = map.get("orderId");
                                        if (orderType == 1 && orderId != orderPrivateCar.getId()) {
                                        if (orderType == 1 && !orderId.equals(orderPrivateCar.getId())) {
                                            orderPrivateCarMapper.deleteById(orderId);
                                        }
                                        if (orderType == 2) {
@@ -2541,7 +2545,7 @@
                                        if (orderType == 1) {
                                            orderPrivateCarMapper.deleteById(orderId);
                                        }
                                        if (orderType == 2 && orderId != orderTaxi.getId()) {
                                        if (orderType == 2 && !orderId.equals(orderTaxi.getId())) {
                                            orderTaxiMapper.deleteById(orderId);
                                        }
                                    }
@@ -2568,8 +2572,6 @@
                                        if (bo) {
                                            continue;
                                        }
										
										
                                        pushUtil.pushOrderState(2, driver.getId(), orderTaxi.getId(), 2, orderTaxi.getState(), pushOrder.getPushTime());
                                    }
                                }

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java

@@ -845,12 +845,15 @@
        }
        return ResultUtil.error("异常");
    }



    //用户取消退款
    public void userCancelTuik(OrderRide orderRide){
        if(orderRide.getState()==2){//用户已经支付了订单但司机没有接单
            orderRide.setTuiMoney(orderRide.getMoney());
        }
        if(orderRide.getTuiMoney()>0){
        if(null != orderRide.getTuiMoney() && orderRide.getTuiMoney()>0){
            Financial financial= financialService.selectOne(new EntityWrapper<Financial>().eq("orderNum",orderRide.getOrderNum()));
            String finNum=OrdersUtil.getOrderNoForPrefix("fin");
            //todo 退款金额大于0需要退款
@@ -903,57 +906,58 @@
                return ResultUtil.paranErr("orderId不能为空");
            }
            OrderTravel orderTravel=orderTravelService.selectById(orderId);
            if(orderTravel!=null){
                if(orderTravel.getState()==6){
                    return ResultUtil.error("该订单已取消");
            if(null == orderTravel){
                return ResultUtil.error("无效的订单ID");
            }
            if(orderTravel.getState()==6){
                return ResultUtil.error("该订单已取消");
            }
            DriverRide driverRide=driverRideService.selectById(orderTravel.getDriverId());
            if(orderTravel.getServiceMoney()!=null && orderTravel.getServiceMoney()>0){
                /*todo 更新司机余额*/
                driverRide.setBalance(driverRide.getBalance()-orderTravel.getServiceMoney());
                driverRideService.updateById(driverRide);
                /* 更新司机用户余额（用户和司机用户一个账号余额）*/
                UserInfo userInfo=userInfoService.selectOne(new EntityWrapper<UserInfo>().eq("driverId",orderTravel.getDriverId()));
                if(userInfo!=null){
                    //用户余额可以为负数
                    userInfo.setBalance(userInfo.getBalance()-orderTravel.getServiceMoney());
                    userInfoService.updateById(userInfo);
                }
                DriverRide driverRide=driverRideService.selectById(orderTravel.getDriverId());
                if(orderTravel.getServiceMoney()!=null && orderTravel.getServiceMoney()>0){
                    /*todo 更新司机余额*/
                    driverRide.setBalance(driverRide.getBalance()-orderTravel.getServiceMoney());
                    driverRideService.updateById(driverRide);
                    /* 更新司机用户余额（用户和司机用户一个账号余额）*/
                    UserInfo userInfo=userInfoService.selectOne(new EntityWrapper<UserInfo>().eq("driverId",orderTravel.getDriverId()));
                    if(userInfo!=null){
                        //用户余额可以为负数
                        userInfo.setBalance(userInfo.getBalance()-orderTravel.getServiceMoney());
                        userInfoService.updateById(userInfo);
                    }
                    /*财务明细*/
                    Financial f=new Financial();
                    f.setAddTime(new Date());
                    f.setType(1);//类型 1=收入 2=支出
                    f.setMoney(orderTravel.getServiceMoney());
                    f.setPwType(9);//9=顺风车取消服务费
                    f.setOrderNum(orderTravel.getOrderNum());
                    String finNum=OrdersUtil.getOrderNoForPrefix("fin");
                    f.setLsType(finNum);
                    f.setUserId(driverRide.getUserId());
                    f.setOrderType(4);
                    f.setLx(1);
                    financialService.insert(f);
                    //司机取消给用户推送
                }
                /*添加系统消息*/
                try {
                    systemNoticeService.addSystemNotice(1, "您从"+orderTravel.getStartName()+"到"+orderTravel.getEndName()+"的顺风车行程已取消", driverRide.getUserId(), 1);
                } catch (Exception e) {
                    throw new RuntimeException(e);
                }
                orderTravel.setState(6);//取消状态
                orderTravelService.updateById(orderTravel);
                //todo 推送
                /*司机接单给用户发送消息*/
                OrderRide orderRide=orderRideService.selectOne(new EntityWrapper<OrderRide>().eq("travelId",orderId));
                if(orderRide!=null) {
                    pushUtil.pushOrderState(1, orderRide.getUserId(), orderRide.getId(), 8, 6, null);
                }
                //取消乘客订单
                if(orderRide!=null && orderRide.getState()!=6){
                    orderRide.setTuiMoney(orderRide.getMoney());
                    orderRideService.updateById(orderRide);
                    userCancelTuik(orderRide);
                }
                /*财务明细*/
                Financial f=new Financial();
                f.setAddTime(new Date());
                f.setType(1);//类型 1=收入 2=支出
                f.setMoney(orderTravel.getServiceMoney());
                f.setPwType(9);//9=顺风车取消服务费
                f.setOrderNum(orderTravel.getOrderNum());
                String finNum=OrdersUtil.getOrderNoForPrefix("fin");
                f.setLsType(finNum);
                f.setUserId(driverRide.getUserId());
                f.setOrderType(4);
                f.setLx(1);
                financialService.insert(f);
                //司机取消给用户推送
            }
            /*添加系统消息*/
            try {
                systemNoticeService.addSystemNotice(1, "您从"+orderTravel.getStartName()+"到"+orderTravel.getEndName()+"的顺风车行程已取消", driverRide.getUserId(), 1);
            } catch (Exception e) {
                throw new RuntimeException(e);
            }
            orderTravel.setState(6);//取消状态
            orderTravelService.updateById(orderTravel);
            //todo 推送
            /*司机接单给用户发送消息*/
            OrderRide orderRide=orderRideService.selectOne(new EntityWrapper<OrderRide>().eq("travelId",orderId));
            if(orderRide!=null) {
                pushUtil.pushOrderState(1, orderRide.getUserId(), orderRide.getId(), 8, 6, null);
            }
            //取消乘客订单
            if(orderRide!=null && orderRide.getState()!=6){
                orderRide.setTuiMoney(orderRide.getMoney());
                orderRideService.updateById(orderRide);
                userCancelTuik(orderRide);
            }

            return ResultUtil.success("");
@@ -1024,6 +1028,7 @@
                    /*修改用户接单数和司机提成*/
                    UserInfo userInfo=userInfoService.selectById(driverRide.getUserId());
                    userInfo.setBalance(userInfo.getBalance()+(orderRide.getMoney()-orderRide.getPlatformMoney()));
                    userInfo.setTotalOrders(userInfo.getTotalOrders() + 1);
                    userInfoService.updateById(userInfo);
                    Financial f=new Financial();
                    f.setAddTime(new Date());
@@ -1139,8 +1144,8 @@
            DriverRide driverRide=driverRideService.selectById(driverId);
            if(driverRide!=null){
                /*计算司机的评分*/
                driverRide.setEvaluateNum(driverRide.getEvaluateNum()+1);
                driverRide.setEvaluateScore(driverRide.getEvaluateScore()+score);
                driverRide.setEvaluateNum((null != driverRide.getEvaluateNum() ? driverRide.getEvaluateNum() : 0 )+1);
                driverRide.setEvaluateScore((null == driverRide.getEvaluateScore() ? 0 : driverRide.getEvaluateScore())+score);
                driverRideService.updateById(driverRide);
            }
            /*标记订单已评价*/

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/dao/mapping/OrderRideMapper.xml

@@ -58,9 +58,6 @@
            order by r.startTime asc
        </if>
        <if test="type==4">
            order by calculate_distance(#{lat},#{lon},r.startLat, r.startLon) asc
        </if>
        <if test="type==5">
            order by r.money desc
        </if>
        LIMIT #{current},#{size}

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

@@ -638,14 +638,13 @@
                    } else {
                        OrderPrivateCar orderPrivateCar1 = null;
                        OpenCity openCity = openCityService.openCity1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
                        TbSpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<TbSpellOrderRule>().eq("openCityId", openCity.getId()));
                        //判断是否有相同线路的拼车-有直接拼成功，或者推送拼车订单
                        List<OrderPrivateCar> orderList = orderPrivateCarMapper.selectList(new EntityWrapper<OrderPrivateCar>().eq("rideType", 3).in("state", "2,3,4").le("totalPeopleNum", 4 - peopleNum));
                        for (OrderPrivateCar order : orderList) {
                            TbSpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<TbSpellOrderRule>().eq("openCityId", openCity.getId()));
                            if (spellOrderRule != null) {
                                JSONObject jsonObject = JSONObject.parseObject(spellOrderRule.getContent());
                                //判断时间
								
                                if (travelTime.getTime() >= order.getTravelTime().getTime() - jsonObject.getInteger("num5") * 60000L && travelTime.getTime() <= order.getTravelTime().getTime() + jsonObject.getInteger("num6") * 60000L) {
                                    //                        Double dis1 = Double.valueOf(gdMapElectricFenceUtil.getDistance(orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat(), order.getStartLon() + "," + order.getStartLat(), 1).get("distance").toString());
                                    //                        Double dis2 = Double.valueOf(gdMapElectricFenceUtil.getDistance(orderPrivateCar.getEndLon() + "," + orderPrivateCar.getEndLat(), order.getEndLon() + "," + order.getEndLat(), 1).get("distance").toString());
@@ -663,7 +662,6 @@
                        if (orderPrivateCar1 == null) {
                            orderList = orderPrivateCarMapper.selectList(new EntityWrapper<OrderPrivateCar>().eq("rideType", 3).eq("state", 5).le("totalPeopleNum", 4 - peopleNum));
                            for (OrderPrivateCar order : orderList) {
                                TbSpellOrderRule spellOrderRule = spellOrderRuleService.selectOne(new EntityWrapper<TbSpellOrderRule>().eq("openCityId", openCity.getId()));
                                if (spellOrderRule != null) {
                                    JSONObject jsonObject = JSONObject.parseObject(spellOrderRule.getContent());
                                    //判断时间
@@ -1000,73 +998,17 @@
                    orderCancelService.saveData(orderPrivateCar1.getId(), 1, "无司机接单", "无司机接单", null, null, 2, 1, uid);
                    orderPrivateCar1.setState(10);
                    this.updateById(orderPrivateCar1);
					
                    Driver driver1 = null;
                    Company company = null;
                    //中台修改订单状态
                    ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
                    request.setOrderId(orderPrivateCar1.getTravelId());
                    request.setStatus(orderPrivateCar1.getState());
                    if (null != orderPrivateCar1.getDriverId()) {
                        driver1 = driverService.selectById(orderPrivateCar1.getDriverId());
                        company = companyService.selectById(driver1.getCompanyId());
                        request.setDriverId(driver1.getEmpId().toString());
                        request.setSupplierShopId(company.getEnterCode());
                    }
                    if (2 == orderPrivateCar1.getPromotion()) {
                        Driver driver2 = driverService.selectById(orderPrivateCar1.getPromotionDriverId());
                        request.setPromoterId(driver2.getEmpId().toString());
                    }
                    OrderUtil.modifyTravelItinerary(request);
                }
                List<OrderTaxi> list1 = orderTaxiService.selectList(new EntityWrapper<OrderTaxi>().eq("type", 2).eq("crossCityOrderId", orderPrivateCar.getCrossCityOrderId()).eq("place", orderPrivateCar.getPlace()));
                for (OrderTaxi orderTaxi : list1) {
                    orderCancelService.saveData(orderTaxi.getId(), 2, "无司机接单", "无司机接单", null, null, 2, 1, uid);
                    orderTaxi.setState(10);
                    orderTaxiService.updateById(orderTaxi);
					
                    Driver driver1 = null;
                    Company company = null;
                    //中台修改订单状态
                    ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
                    request.setOrderId(orderTaxi.getTravelId());
                    request.setStatus(orderTaxi.getState());
                    if (null != orderTaxi.getDriverId()) {
                        driver1 = driverService.selectById(orderTaxi.getDriverId());
                        company = companyService.selectById(driver1.getCompanyId());
                        request.setDriverId(driver1.getEmpId().toString());
                        request.setSupplierShopId(company.getEnterCode());
                    }
                    if (2 == orderTaxi.getPromotion()) {
                        Driver driver2 = driverService.selectById(orderTaxi.getPromotionDriverId());
                        request.setPromoterId(driver2.getEmpId().toString());
                    }
                    OrderUtil.modifyTravelItinerary(request);
                }
            } else {
                integer = orderCancelService.saveData(id, 1, "无司机接单", "无司机接单", null, null, 2, 1, uid);
                orderPrivateCar.setState(10);
                this.updateById(orderPrivateCar);
				
                Driver driver1 = null;
                Company company = null;
                //中台修改订单状态
                ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
                request.setOrderId(orderPrivateCar.getTravelId());
                request.setStatus(orderPrivateCar.getState());
                if (null != orderPrivateCar.getDriverId()) {
                    driver1 = driverService.selectById(orderPrivateCar.getDriverId());
                    company = companyService.selectById(driver1.getCompanyId());
                    request.setDriverId(driver1.getEmpId().toString());
                    request.setSupplierShopId(company.getEnterCode());
                }
                if (2 == orderPrivateCar.getPromotion()) {
                    Driver driver2 = driverService.selectById(orderPrivateCar.getPromotionDriverId());
                    request.setPromoterId(driver2.getEmpId().toString());
                }
                if(orderPrivateCar.getTravelId()!=null){
                    OrderUtil.modifyTravelItinerary(request);
                }
            }
        } else {
            OpenCity openCity = openCityService.openCity1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml

@@ -164,7 +164,8 @@
        if((select count(1) from t_user_taxi_card where userId = #{uid}) = 0, 0, 1) as payTaxiCar,
        if((select id from t_merchant where auditStatus = 2 and userType = 1 and userId = a.id and state = 1) is null, 0, 1) as merchant,
        a.isDriverRide,
        a.driverId
        a.driverId,
        (select `state` from app_driver_ride where userId = a.id and isDelete = 0 order by addTime desc limit 0,1) as driverAuthState
        from t_user a where 1 = 1
        <if test="null != uid">
            and a.id = #{uid}

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserInfo.java

@@ -167,6 +167,8 @@

    private Date bindDate;

    private Integer totalOrders;

    public Date getBindDate() {
        return bindDate;
    }
@@ -414,7 +416,15 @@
    public void setOnconUUID(String onconUUID) {
        this.onconUUID = onconUUID;
    }
    

    public Integer getTotalOrders() {
        return totalOrders;
    }

    public void setTotalOrders(Integer totalOrders) {
        this.totalOrders = totalOrders;
    }

    @Override
    public String toString() {
        return "UserInfo{" +

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java

@@ -587,7 +587,7 @@
     * @return
     */
    public static GetPaymentInfo paymentInfo(GetPaymentInfoDataRequest getPaymentInfoDataRequest) {
        getPaymentInfoDataRequest.setPartnerId("5400004");
        getPaymentInfoDataRequest.setPartnerId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "5401007" : "5400004");
        
        GetPaymentInfoRequest request = new GetPaymentInfoRequest();
        request.setRequstType("POST");

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.java

@@ -53,6 +53,8 @@
    private Integer isDriverRide;
    @ApiModelProperty("顺风车司机id")
    private Integer driverId;
    @ApiModelProperty("顺风车司机认证状态（1=待审核，2=审核通过，3=审核拒绝）")
    private Integer driverAuthState;

    public Integer getIsCould() {
        return isCould;
@@ -197,7 +199,15 @@
    public void setDriverId(Integer driverId) {
        this.driverId = driverId;
    }
    

    public Integer getDriverAuthState() {
        return driverAuthState;
    }

    public void setDriverAuthState(Integer driverAuthState) {
        this.driverAuthState = driverAuthState;
    }

    @Override
    public String toString() {
        return "UserInfoWarpper{" +
@@ -240,6 +250,7 @@
            userInfoWarpper.setIsCould(Integer.valueOf(String.valueOf(map.get("isCloud"))));
            userInfoWarpper.setIsDriverRide(null != map.get("isDriverRide") ? Integer.valueOf(String.valueOf(map.get("isDriverRide"))) : 0);
            userInfoWarpper.setDriverId(null != map.get("driverId") ? Integer.valueOf(String.valueOf(map.get("driverId"))) : 0);
            userInfoWarpper.setDriverAuthState(null != map.get("driverAuthState") ? Integer.valueOf(String.valueOf(map.get("driverAuthState"))) : 1);

        }
        return userInfoWarpper;

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml

@@ -265,7 +265,7 @@
        a.abnormalIntro,
        a.abnormalImg,
        a.companyId,
        IF(a.abnormalIntro is null and a.recoveryOrder = 1, 0, 1)) as appealButton
        IF(a.abnormalIntro is null and a.recoveryOrder = 1, 0, 1) as appealButton
        from t_order_taxi a
        left join t_driver b on (a.driverId = b.id)
        left join t_car c on (a.carId = c.id)

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java

@@ -497,71 +497,17 @@
                    orderCancelService.saveData(orderPrivateCar1.getId(), 1, "无司机接单", "无司机接单", null, null, 2, 1, uid);
                    orderPrivateCar1.setState(10);
                    orderPrivateCarService.updateById(orderPrivateCar1);
					
                    Driver driver1 = null;
                    Company company = null;
                    //中台修改订单状态
                    ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
                    request.setOrderId(orderPrivateCar1.getTravelId());
                    request.setStatus(orderPrivateCar1.getState());
                    if (null != orderPrivateCar1.getDriverId()) {
                        driver1 = driverService.selectById(orderPrivateCar1.getDriverId());
                        company = companyService.selectById(driver1.getCompanyId());
                        request.setDriverId(driver1.getEmpId().toString());
                        request.setSupplierShopId(company.getEnterCode());
                    }
                    if (2 == orderPrivateCar1.getPromotion()) {
                        Driver driver2 = driverService.selectById(orderPrivateCar1.getPromotionDriverId());
                        request.setPromoterId(driver2.getEmpId().toString());
                    }
                    OrderUtil.modifyTravelItinerary(request);
                }
                List<OrderTaxi> list1 = this.selectList(new EntityWrapper<OrderTaxi>().eq("type", 2).eq("crossCityOrderId", orderTaxi.getCrossCityOrderId()).eq("place", orderTaxi.getPlace()));
                for (OrderTaxi orderTaxi1 : list1) {
                    orderCancelService.saveData(orderTaxi1.getId(), 2, "无司机接单", "无司机接单", null, null, 2, 1, uid);
                    orderTaxi1.setState(10);
                    this.updateById(orderTaxi1);
					
                    Driver driver1 = null;
                    Company company = null;
                    //中台修改订单状态
                    ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
                    request.setOrderId(orderTaxi1.getTravelId());
                    request.setStatus(orderTaxi1.getState());
                    if (null != orderTaxi1.getDriverId()) {
                        driver1 = driverService.selectById(orderTaxi1.getDriverId());
                        company = companyService.selectById(driver1.getCompanyId());
                        request.setDriverId(driver1.getEmpId().toString());
                        request.setSupplierShopId(company.getEnterCode());
                    }
                    if (2 == orderTaxi1.getPromotion()) {
                        Driver driver2 = driverService.selectById(orderTaxi1.getPromotionDriverId());
                        request.setPromoterId(driver2.getEmpId().toString());
                    }
                    OrderUtil.modifyTravelItinerary(request);
                }
            } else {
                integer = orderCancelService.saveData(id, 2, "无司机接单", "无司机接单", null, null, 2, 1, uid);
                orderTaxi.setState(10);
                this.updateById(orderTaxi);
				
                Driver driver1 = null;
                Company company = null;
                //中台修改订单状态
                ModifyTravelItineraryRequest request = new ModifyTravelItineraryRequest();
                request.setOrderId(orderTaxi.getTravelId());
                request.setStatus(orderTaxi.getState());
                if (null != orderTaxi.getDriverId()) {
                    driver1 = driverService.selectById(orderTaxi.getDriverId());
                    company = companyService.selectById(driver1.getCompanyId());
                    request.setDriverId(driver1.getEmpId().toString());
                    request.setSupplierShopId(company.getEnterCode());
                }
                if (2 == orderTaxi.getPromotion()) {
                    Driver driver2 = driverService.selectById(orderTaxi.getPromotionDriverId());
                    request.setPromoterId(driver2.getEmpId().toString());
                }
                OrderUtil.modifyTravelItinerary(request);
            }
        } else {
            OpenCity openCity = openCityService.openCity1(orderTaxi.getStartLon().toString(), orderTaxi.getStartLat().toString());

 UserQYTTravel/guns-admin/src/main/resources/application.yml

@@ -1,3 +1,3 @@
spring:
  profiles:
    active: '@spring.active@'
    active: "@spring.active@"

 UserQYTTravel/guns-admin/src/main/resources/logback.xml

@@ -7,7 +7,7 @@
    <contextName>logback</contextName>
    
    <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义后，可以使“${}”来使用变量。 -->
    <property name="log.path" value="/etraffic/server/logs/user"/>
    <property name="log.path" value="/etraffic/server/chuxing/logs/user"/>
    
    <!--0. 日志格式和颜色渲染 -->
    <!-- 彩色日志依赖的渲染类 -->

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

@@ -1,15 +1,26 @@
//package com.stylefeng.guns;
//
//import com.alibaba.fastjson.JSON;
//import com.stylefeng.guns.core.util.ToolUtil;
//import com.stylefeng.guns.modular.shunfeng.model.DriverRide;
//import com.stylefeng.guns.modular.shunfeng.model.Evaluate;
//import com.stylefeng.guns.modular.shunfeng.model.OrderRide;
//import com.stylefeng.guns.modular.shunfeng.service.IDriverRideService;
//import com.stylefeng.guns.modular.shunfeng.service.IEvaluateService;
//import com.stylefeng.guns.modular.shunfeng.service.IOrderRideService;
//import com.stylefeng.guns.modular.shunfeng.util.SensitiveWordUtil;
//import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
//import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
//import com.stylefeng.guns.modular.system.dao.SensitiveWordsMapper;
//import com.stylefeng.guns.modular.system.model.Company;
//import com.stylefeng.guns.modular.system.model.Driver;
//import com.stylefeng.guns.modular.system.model.SensitiveWords;
//import com.stylefeng.guns.modular.system.model.UserInfo;
//import com.stylefeng.guns.modular.system.service.ICompanyService;
//import com.stylefeng.guns.modular.system.service.IDriverService;
//import com.stylefeng.guns.modular.system.service.IUserInfoService;
//import com.stylefeng.guns.modular.system.util.EmailUtil;
//import com.stylefeng.guns.modular.system.util.ResultUtil;
//import com.stylefeng.guns.modular.system.util.qianyuntong.OrderUtil;
//import com.stylefeng.guns.modular.system.util.qianyuntong.UserUtil;
//import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
@@ -22,10 +33,14 @@
//import org.springframework.boot.test.context.SpringBootTest;
//import org.springframework.test.context.junit4.SpringRunner;
//
//import javax.annotation.Resource;
//import javax.mail.MessagingException;
//import java.io.UnsupportedEncodingException;
//import java.math.BigDecimal;
//import java.util.Date;
//import java.util.HashSet;
//import java.util.List;
//import java.util.Set;
//
///**
// * SpringBoot方式启动类
@@ -52,18 +67,72 @@
//    private IPaymentRecordService paymentRecordService;
//    @Autowired
//    private EmailUtil emailUtil;
//    /*顺风车司机*/
//    @Autowired
//    private IDriverRideService driverRideService;
//
//    @Resource
//    private SensitiveWordsMapper sensitiveWordsMapper;
//    /*评价*/
//    @Autowired
//    private IEvaluateService evaluateService;
//    /*顺风车订单*/
//    @Autowired
//    private IOrderRideService orderRideService;
//
//
//
//
//    @Test
//    public void test(){
//        Integer orderId = 163;
//        Integer score = 5;
//        Integer userId = 17;
//        String content = "";
//        Integer driverId = 37;
//        try {
//            emailUtil.sendEmailWithAttachment("393733352@qq.com", "贵人家园出行-行程单", "请查收您的行程单", null, "贵人家园出行-行程单");
//        } catch (MessagingException e) {
//            throw new RuntimeException(e);
//        } catch (UnsupportedEncodingException e) {
//            throw new RuntimeException(e);
//            Evaluate evaluate=new Evaluate();
//            evaluate.setAddTime(new Date());
//            evaluate.setType(8);
//            evaluate.setOrderId(orderId);
//            evaluate.setScore(score);
//            evaluate.setUserId(userId);
//            if(ToolUtil.isNotEmpty(content)){
//                /*判断评价内容是否包含敏感词*/
//                List<SensitiveWords> list = sensitiveWordsMapper.selectList(null);
//                Set<String> sensitiveWordSet = new HashSet<>();
//                for(SensitiveWords gs:list){
//                    sensitiveWordSet.add(gs.getContent());
//                }
//                SensitiveWordUtil.init(sensitiveWordSet);
//                boolean result = SensitiveWordUtil.contains(content);
//
//            }
//            evaluate.setContent(content);
//            evaluate.setDriverId(driverId);
//            /*查询用户手机号*/
//            UserInfo userInfo=userInfoService.selectById(userId);
//            if(userInfo!=null){
//                evaluate.setUserPhone(userInfo.getPhone());
//            }
//            /*查询司机电话*/
//            DriverRide driverRide=driverRideService.selectById(driverId);
//            if(driverRide!=null){
//                /*计算司机的评分*/
//                driverRide.setEvaluateNum((null != driverRide.getEvaluateNum() ? driverRide.getEvaluateNum() : 0 )+1);
//                driverRide.setEvaluateScore((null == driverRide.getEvaluateScore() ? 0 : driverRide.getEvaluateScore())+score);
//                driverRideService.updateById(driverRide);
//            }
//            /*标记订单已评价*/
//            OrderRide orderTaxi=new OrderRide();
//            orderTaxi.setId(orderId);
//            orderTaxi.setIsEvaluate(2);
//            orderTaxi.setEvaluateScoreUser(score);
//            orderTaxi.setContent(content);
//            orderRideService.updateById(orderTaxi);
//            evaluateService.insert(evaluate);
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
//    }
//}

 ZuulQYTTravel/src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@
eureka:
    client:
        service-url: #注册中心地址
            defaultZone: http://sinata:sinata@127.0.0.1:8000/eureka #启用身份验证的方式连接
            defaultZone: http://sinata:sinata@192.168.110.106:8000/eureka #启用身份验证的方式连接
        register-with-eureka: true #在注册中心进行注册
        fetch-registry: true #从Eureka中获取注册信息。

@@ -20,15 +20,15 @@
    routes:
        user-server: #接口调用路由服务，名字任意取。（用户端服务）
            path: /user/** #配置请求URL的请求规则
            url: http://127.0.0.1:8006 #真正的微服务地址，path匹配的请求都转发到这里
            url: http://192.168.110.80:7006 #真正的微服务地址，path匹配的请求都转发到这里
            serviceid: user-server #指定Eureka注册中心的服务id
        driver-server: #路由司机相关请求
            path: /driver/** #配置请求URL的请求规则
            url: http://127.0.0.1:8007 #真正的微服务地址，path匹配的请求都转发到这里
            url: http://192.168.110.80:7007 #真正的微服务地址，path匹配的请求都转发到这里
            serviceid: driver-server #指定Eureka注册中心的服务id
        dispatch-server: #路由调度相关请求
            path: /dispatch/** #配置请求URL的请求规则
            url: http://127.0.0.1:8008 #真正的微服务地址，path匹配的请求都转发到这里
            url: http://192.168.110.80:7008 #真正的微服务地址，path匹配的请求都转发到这里
            serviceid: dispatch-server #指定Eureka注册中心的服务id
    #  配置zuul超时时间
    host: