Merge remote-tracking branch 'origin/master'

Pu Zhibing

6 天以前 e998c057be6d077dcec169ab4cb34f4755932601

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	MessagePushTravel/src/main/resources/application.yml

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java

@@ -559,7 +559,7 @@
            }
            Driver driver = driverService.selectById(uid);
            String accessToken=null;
            Object img = redisTemplate.opsForValue().get("dache:DRIVER_WX_IMG" + uid);
            Object img = redisTemplate.opsForValue().get("DRIVER_WX_IMG" + uid);
            // 获取调用凭证accessToken
            if(ToolUtil.isEmpty(driver.getShareLink())|| ToolUtil.isEmpty(img)){
                accessToken = getAccessToken();
@@ -568,10 +568,13 @@

            if(ToolUtil.isEmpty(img)) {
                RestTemplate rest = new RestTemplate();
                String url = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=" + accessToken;
//                String url = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=" + accessToken;
                String url = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + accessToken;
                Map<String, Object> param = new HashMap<>();
                param.put("path", "pages/home/home?driverId=" + uid);
                param.put("page", "pages/home/home");
                param.put("width", 430); //二维码尺寸
                param.put("scene", "driverId=" + uid); //二维码尺寸
                param.put("env_version", "trial"); //二维码尺寸
                HttpRequest post = HttpUtil.createPost(url);
                post.body(JSON.toJSONString(param));


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

@@ -379,7 +379,7 @@
        UserInfo userInfo = userInfoMapper.selectById(userId);
        if(userInfo.getBindDriverId()!=null && userInfo.getBindExpireDate().getTime()>System.currentTimeMillis()){
            String registAreaCode = userInfo.getRegistAreaCode();
            TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("state",1).eq("districtCode", registAreaCode).last(" and between now() startTime and endTime AND FIND_IN_SET(" + 1 + ", bizType) limit 1"));
            TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("state",1).eq("districtCode", registAreaCode).last(" and  now() between  startTime and endTime AND FIND_IN_SET(" + 1 + ", bizType) limit 1"));
            if(tDriverPromotionActivity!=null){
                return userInfo.getBindDriverId();
            }

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

@@ -51,6 +51,7 @@

        Integer carId = driver.getCarId();
        map.put("car", "");
        map.put("id", carId);
        if(carId!=null){
            Car car = carMapper.selectById(carId);
            if(car.getCarLicensePlate()!=null){
@@ -68,7 +69,7 @@
            if(stringObjectMap.get("useDriverId")!=null && stringObjectMap.get("useDriverId").toString().equals(uid.toString())){
                map.put("useState", 1);
            }else {
                map.put("useState", 0);
                map.put("useState", 2);
            }
        }
        map.put("list", list);

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

@@ -1640,7 +1640,7 @@

        double sum = orderPrivateCars.stream().mapToDouble(OrderPrivateCar::getOrderMoney).sum();
        double sum1 = orderCrossCities.stream().mapToDouble(OrderCrossCity::getOrderMoney).sum();
        double sum2 = orderTaxis.stream().mapToDouble(OrderTaxi::getOrderMoney).sum();
        double sum2 = orderTaxis.stream().filter(e->e.getOrderMoney()!=null).mapToDouble(OrderTaxi::getOrderMoney).sum();
        driverIndexVo.setTodayOrderMoney(new BigDecimal(sum +sum1+sum2));



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

@@ -144,7 +144,9 @@
        reassign.setOriginalDriverId(uid);
        reassign.setOriginalCarId(driver.getCarId());
        reassign.setInsertTime(new Date());
        this.insert(reassign);
        if(types==1){
            this.insert(reassign);
        }
//        systemNoticeService.addSystemNotice(2, "您的改派申请已成功提交，我们会尽快为你处理！", uid, 1);

        //开始支付

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

@@ -71,7 +71,7 @@
    public QianYunTongConfig getQianYunTongConfig() {
        if("dev".equals(activeProfile)){
            this.appkey = "10001104";
            this.privateKeyPath = "C:\\Users\\39373\\Desktop\\黔云通\\private_key_test.pem";
            this.privateKeyPath = "C:\\Users\\Admin\\Desktop\\private_key_test.pem";
            this.userName = "xiaofei";
            this.status = "1";
            this.setApiUrl("https://test-zhongtai.stqcloud.com:10070");

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

@@ -149,7 +149,7 @@
            return ResultUtil.error("订单已被抢了");
        }
        OrderTaxi orderTaxi = null;
        if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && orderPrivateCar1.getState() == 1&& orderPrivateCar1.getState() == 11){
        if(null != orderPrivateCar1 && orderPrivateCar1.getType() == 3 && (orderPrivateCar1.getState() == 1||  orderPrivateCar1.getState() == 11)){
            orderPrivateCarService.deleteById(orderId);
            OrderTaxi orderTaxi1 = setOrderTaxi(orderPrivateCar1);
            this.insert(orderTaxi1);

 DriverQYTTravel/guns-admin/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
server:
    port: 8007
    port: 8009

guns:
    swagger-open: true              #是否开启swagger (true/false)

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

@@ -63,6 +63,9 @@
    })
    public ResultUtil<BaseWarpper> queryIdleDriver(Integer type, Double lon, Double lat){
        try {
            if(type==2){
                type=null;
            }
            List<Driver> list = driverService.queryIdleDriver(type, lon, lat, 5D, null);
            BaseWarpper baseWarpper = new BaseWarpper();
            baseWarpper.setNumber(list.size());

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

@@ -568,6 +568,9 @@
                    if (null == systemPriceCity) {
                        return ResultUtil.error("请先配置价格规则");
                    }
                    if(orderPrivateCar.getServerCarModelId()==null){
                        orderPrivateCar.setServerCarModelId(0);
                    }
                    Map<String, Object> query1 = systemPriceMapper.query(orderPrivateCar.getCompanyId(), 1, orderPrivateCar.getServerCarModelId(), systemPriceCity.getId());
//                    System.out.println("参数：" + orderPrivateCar.getCompanyId() + "|" + orderPrivateCar.getServerCarModelId());
//                    System.out.println("query1:" + query1);

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

@@ -155,14 +155,17 @@
            </choose>

        </if>
        and id in
        (
          select driverId from t_driver_work where startTime &lt; now() and state = 1 and `type` like CONCAT('%', #{type}, '%')
        )
        <if test="8>type">
        <if test="null != type">
            and id in
            (
            select driverId from t_driver_work where startTime &lt; now() and state = 1 and `type` like CONCAT('%', #{type}, '%')
            )
        </if>

        <if test="null != type and 8>type">
            and id in (select driverId from t_driver_orders where `type` = #{type})
        </if>
        <if test="type>7">
        <if test="null != type and type>7">
            and id in (select driverId from t_driver_orders where `type` = 1)
        </if>
    </select>

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

@@ -160,7 +160,7 @@
    public QianYunTongConfig getQianYunTongConfig() {
        if("dev".equals(activeProfile)){
            this.appkey = "10001104";
            this.privateKeyPath = "C:\\Users\\39373\\Desktop\\黔云通\\private_key_test.pem";
            this.privateKeyPath = "C:\\Users\\Admin\\Desktop\\private_key_test.pem";
            this.userName = "xiaofei";
            this.status = "1";
            this.setApiUrl("https://test-zhongtai.stqcloud.com:10070");

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

@@ -170,9 +170,7 @@
    @Autowired
    private ITaxiCardService taxiCardService;
    
    @Autowired
    private ITaxiCardPaymentService taxiCardPaymentService;
	

    @Autowired
    private IUserUserService userUserService;
    
@@ -2337,7 +2335,7 @@
                            }
                        }
                        Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间
                        OrderTaxi orderTaxi1 = OrderTaxiServiceImpl.this.selectById(orderTaxi.getId());
                        OrderPrivateCar orderTaxi1 = orderPrivateCarService.selectById(orderTaxi.getId());
                        Integer state = orderTaxi1.getState();
                        if (state != 1) {
                            break;