修改bug

Pu Zhibing

8 天以前 e9d0eb5d4f43c3cd5a37283151d69683b3ddd6bf

修改bug

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

@@ -261,6 +261,9 @@
    @Override
    public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address) throws Exception {
        OrderCrossCity orderCrossCity = this.selectById(orderId);
        if(10 == orderCrossCity.getState()){
            return ResultUtil.error("订单已被取消，不能继续操作");
        }
        UserInfo userInfo = userInfoMapper.selectById(orderCrossCity.getUserId());
        switch (state){
            case 3://出发前往预约点

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java

@@ -233,6 +233,9 @@
    @Override
    public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address, String driverImg) throws Exception {
        OrderLogistics orderLogistics = this.selectById(orderId);
        if(10 == orderLogistics.getState()){
            return ResultUtil.error("订单已被取消，不能继续操作");
        }
        UserInfo userInfo = userInfoMapper.selectById(orderLogistics.getUserId());
        switch (state){
            case 3://出发前往预约点

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

@@ -518,6 +518,9 @@
    @Override
    public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address) throws Exception {
        OrderPrivateCar orderPrivateCar = this.selectById(orderId);
        if(10 == orderPrivateCar.getState()){
            return ResultUtil.error("订单已被取消，不能继续操作");
        }
        Integer canOperation=1;
        if(state<5){
            if(orderPrivateCar.getPid()==null) {

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

@@ -833,6 +833,9 @@
                                pushUtil.pushOrderState(2, orderTaxi.getDriverId(), orderTaxi.getId(), 2, 10);
                                orderTaxi1.setState(10);
                                orderTaxiService.updateById(orderTaxi1);
                                Driver driver = driverService.selectById(orderTaxi1.getDriverId());
                                driver.setState(2);
                                driverService.updateById(driver);
                                orderIds.remove(orderTaxi.getId());
                            }
                        }
@@ -922,6 +925,9 @@
                                pushUtil.pushReassignEndCancel(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, 10);
                                orderPrivateCar.setState(10);
                                orderPrivateCarService.updateById(orderPrivateCar);
                                Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
                                driver.setState(2);
                                driverService.updateById(driver);
                                orderIds.remove(orderPrivateCar.getId());
                            }
                        }

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

@@ -644,7 +644,6 @@
        request.setMhltiCenterAppId("52270015");
        request.setPayType(4);
        request.setPayChannel(6);
        request.setIsCompensate(1);
        //请求路径
        String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/paymentOrder";
        //私钥文件

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

@@ -50,8 +50,4 @@
     * 付款方式，6:微信  7:支付宝  8:银行卡 9:银联二维码 10银联购物车收银台
     */
    private Integer payChannel;
    /**
     * 是否补偿单。1、是，0、否
     */
    private Integer isCompensate;
}

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

@@ -499,6 +499,9 @@
    @Override
    public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address) throws Exception {
        OrderTaxi orderTaxi = this.selectById(orderId);
        if(10 == orderTaxi.getState()){
            return ResultUtil.error("订单已被取消，不能继续操作");
        }
        switch (state){
            case 3://出发前往预约点
                orderTaxi.setState(3);

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

@@ -637,8 +637,8 @@
        }
        //企业已注册
        if (null != checkEnterExist && "1".equals(checkEnterExist.getIsReg())) {
            enterCode = checkEnterExist.getEnterCode();
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(account, enterCode);
            enterCode = checkEnterExist.getEnterCode();
            enterNew = 0;
            if(null == userInfoByPhone || userInfoByPhone.size() == 0){
                SaveStaffNodeRequest request = new SaveStaffNodeRequest();

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

@@ -45,6 +45,7 @@
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

/**
 * 司机审核列表控制器
@@ -1257,6 +1258,7 @@
        User user2 = userService.selectById(user.getId());
        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
        MultipartFile file = (MultipartFile) multipartRequest.getFile("myfile");
        List<String> drivers = new ArrayList<>();
        try {
            if (shiroExtUtil.getUser().getRoleType() == 1) {
                Workbook book = WoUtil.ImportFile(file);
@@ -1509,13 +1511,14 @@
                        return new ErrorTip(500, "单元格不能为空");
                    }else{
                        //判断账号是否存在
                        int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", seventeen).in("authState", "1,2,3").ne("flag", 3));
                        int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", seventeen).in("authState", Arrays.asList(1,2,3)).ne("flag", 3));
                        if (count > 0){
                            continue;
                        }
                        Boolean b = UserUtil.idCardAuth(zero, seven);
                        if(!b){
                            return new ErrorTip(500, "司机姓名和身份证号不匹配");
                            drivers.add(zero);
                            continue;
                        }
                        //判断所属机构
                        if (!one.equals("平台司机") && !one.equals("加盟司机")){
@@ -1895,14 +1898,15 @@
                        return new ErrorTip(500, "单元格不能为空");
                    }else{
                        //判断账号是否存在
                        int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", fifteen).in("authState", "1,2,3").ne("flag", 3));
                        int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", fifteen).in("authState", Arrays.asList(1,2,3)).ne("flag", 3));
                        if (count > 0){
                            continue;
                        }

                        Boolean b = UserUtil.idCardAuth(zero, five);
                        if(!b){
                            return new ErrorTip(500, "司机姓名和身份证号不匹配");
                            drivers.add(zero);
                            continue;
                        }
                        //判断性别
                        if (!two.equals("男") && !two.equals("女")){
@@ -2213,13 +2217,14 @@
                        return new ErrorTip(500, "单元格不能为空");
                    }else{
                        //判断账号是否存在
                        int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", fourteen).in("authState", "1,2,3").ne("flag", 3));
                        int count = tDriverService.selectCount(new EntityWrapper<TDriver>().eq("phone", fourteen).in("authState", Arrays.asList(1,2,3)).ne("flag", 3));
                        if (count > 0){
                            continue;
                        }
                        Boolean b = UserUtil.idCardAuth(zero, four);
                        if(!b){
                            return new ErrorTip(500, "司机姓名和身份证号不匹配");
                            drivers.add(zero);
                            continue;
                        }
                        //判断性别
                        if (!one.equals("男") && !one.equals("女")){
@@ -2316,6 +2321,9 @@
                    }
                }
            }
            if(drivers.size() > 0){
                return new ErrorTip(500, "司机姓名和身份证号不匹配【" + drivers.stream().collect(Collectors.joining(",")).toString() + "】");
            }
        } catch (Exception e) {
            e.printStackTrace();
        }

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.base.tips.ErrorTip;
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.util.DateUtil;
@@ -687,6 +688,10 @@
        Integer userId =null;
        if(type==1){
            TOrderPrivateCar tOrderPrivateCar = tOrderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>().eq("id",orderNum));
            if(1 != tOrderPrivateCar.getAbnormalStatus()){
                return new ErrorTip(500, "订单已被审核，不能重复操作");
            }

            userId = tOrderPrivateCar.getUserId();

            //平台全责需要调起备付金支付
@@ -717,13 +722,13 @@
                String retCode = payInfo.getRetCode();
                if (!"000000".equals(retCode)) {
                    log.error("备付金支付失败：{}", payInfo.getRetMsg());
                    return "备付金支付失败：" + payInfo.getRetMsg();
                    return new ErrorTip(500, "备付金支付失败：" + payInfo.getRetMsg());
                }
                PayInfoData data = payInfo.getData();
                String status = data.getStatus();
                if ("3".equals(status)) {
                    log.error("备付金支付失败：{}", payInfo.getRetMsg());
                    return "备付金支付失败：" + payInfo.getRetMsg();
                    return new ErrorTip(500, "备付金支付失败：" + payInfo.getRetMsg());
                }
                if("0".equals(status)){
                    //查询支付信息
@@ -789,6 +794,9 @@
        }
        if(type==2){
            TOrderCrossCity tOrderCrossCity = tOrderCrossCityService.selectOne(new EntityWrapper<TOrderCrossCity>().eq("id", orderNum));
            if(1 != tOrderCrossCity.getAbnormalStatus()){
                return new ErrorTip(500, "订单已被审核，不能重复操作");
            }
            userId = tOrderCrossCity.getUserId();
            tOrderCrossCity.setResponsibilityType(responsibilityTypeVal);
            tOrderCrossCity.setAbnormalStatus(2);
@@ -819,6 +827,9 @@
        }
        if(type==3){
            TOrderTaxi tOrderTaxi = tOrderTaxiService.selectOne(new EntityWrapper<TOrderTaxi>().eq("id", orderNum));
            if(1 != tOrderTaxi.getAbnormalStatus()){
                return new ErrorTip(500, "订单已被审核，不能重复操作");
            }
            userId = tOrderTaxi.getUserId();
            tOrderTaxi.setResponsibilityType(responsibilityTypeVal);
            tOrderTaxi.setAbnormalStatus(2);

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java

@@ -263,15 +263,15 @@
                    values[i][12]=d.get("orderState").toString().equals("1")?"待接单":
                            d.get("orderState").toString().equals("2")?"待出发":
                                    d.get("orderState").toString().equals("3")?"待到达预约地点":
                                            d.get("orderState").toString().equals("4")?"待取货":
                                            d.get("orderState").toString().equals("4")?"待乘客上车":
                                                    d.get("orderState").toString().equals("5")?"服务中":
                                                            d.get("orderState").toString().equals("6")?"已送达":
                                                                    d.get("orderState").toString().equals("7")?"待支付":
                                                                            d.get("orderState").toString().equals("8")?"需补差价":
                                                                                    d.get("orderState").toString().equals("9")?"已取货":
                                                                            d.get("orderState").toString().equals("8")?"待评价":
                                                                                    d.get("orderState").toString().equals("9")?"已完成":
                                                                                            d.get("orderState").toString().equals("10")?"已取消":
                                                                                                    d.get("orderState").toString().equals("11")?"改派中":
                                                                                                            d.get("orderState").toString().equals("12")?"已支付差价":"";
                                                                                                            d.get("orderState").toString().equals("12")?"取消待支付":"";
                }
                if(null == d.get("state")){
                    values[i][13]="";
@@ -344,7 +344,7 @@
            Date date = new Date();
            DateFormat format = new SimpleDateFormat("yyyyMMdd");
            String time = format.format(date);
            String fileName = "快车改派"+time+".xls";
            String fileName = "跨城改派"+time+".xls";
            String[] title = new String[] {"申请改派时间","申请司机","申请原因","订单编号","下单用户","出发时间","出发地","目的地"
                    ,"原服务车辆","改派处罚金","改派服务司机","改派服务车辆","订单当前状态","改派状态"};

@@ -380,15 +380,15 @@
                    values[i][12]=d.get("orderState").toString().equals("1")?"待接单":
                            d.get("orderState").toString().equals("2")?"待出发":
                                    d.get("orderState").toString().equals("3")?"待到达预约地点":
                                            d.get("orderState").toString().equals("4")?"待取货":
                                            d.get("orderState").toString().equals("4")?"待乘客上车":
                                                    d.get("orderState").toString().equals("5")?"服务中":
                                                            d.get("orderState").toString().equals("6")?"已送达":
                                                                    d.get("orderState").toString().equals("7")?"待支付":
                                                                            d.get("orderState").toString().equals("8")?"需补差价":
                                                                                    d.get("orderState").toString().equals("9")?"已取货":
                                                                            d.get("orderState").toString().equals("8")?"待评价":
                                                                                    d.get("orderState").toString().equals("9")?"已完成":
                                                                                            d.get("orderState").toString().equals("10")?"已取消":
                                                                                                    d.get("orderState").toString().equals("11")?"改派中":
                                                                                                            d.get("orderState").toString().equals("12")?"已支付差价":"";
                                                                                                            d.get("orderState").toString().equals("12")?"取消待支付":"";
                }
                if(null == d.get("state")){
                    values[i][13]="";
@@ -401,7 +401,7 @@
                }

            }
            String fileNameTitle="快车改派";
            String fileNameTitle="跨城改派";
            HSSFWorkbook wb = ExcelUtil.getHSSFWorkbookTime(fileNameTitle+time, title, values, null,insertTime);
            this.setResponseHeader(response, fileName);
            OutputStream os = response.getOutputStream();
@@ -462,7 +462,7 @@
            Date date = new Date();
            DateFormat format = new SimpleDateFormat("yyyyMMdd");
            String time = format.format(date);
            String fileName = "快车改派"+time+".xls";
            String fileName = "小件物流改派"+time+".xls";
            String[] title = new String[] {"申请改派时间","申请司机","申请原因","订单编号","下单用户","出发时间","出发地","目的地"
                    ,"原服务车辆","改派处罚金","改派服务司机","改派服务车辆","订单当前状态","改派状态"};

@@ -519,7 +519,7 @@
                }

            }
            String fileNameTitle="快车改派";
            String fileNameTitle="小件物流改派";
            HSSFWorkbook wb = ExcelUtil.getHSSFWorkbookTime(fileNameTitle+time, title, values, null,insertTime);
            this.setResponseHeader(response, fileName);
            OutputStream os = response.getOutputStream();
@@ -579,7 +579,7 @@
            Date date = new Date();
            DateFormat format = new SimpleDateFormat("yyyyMMdd");
            String time = format.format(date);
            String fileName = "快车改派"+time+".xls";
            String fileName = "出租车改派"+time+".xls";
            String[] title = new String[] {"申请改派时间","申请司机","申请原因","订单编号","下单用户","出发时间","出发地","目的地"
                    ,"原服务车辆","改派处罚金","改派服务司机","改派服务车辆","订单当前状态","改派状态"};

@@ -615,15 +615,15 @@
                    values[i][12]=d.get("orderState").toString().equals("1")?"待接单":
                            d.get("orderState").toString().equals("2")?"待出发":
                                    d.get("orderState").toString().equals("3")?"待到达预约地点":
                                            d.get("orderState").toString().equals("4")?"待取货":
                                            d.get("orderState").toString().equals("4")?"待乘客上车":
                                                    d.get("orderState").toString().equals("5")?"服务中":
                                                            d.get("orderState").toString().equals("6")?"已送达":
                                                            d.get("orderState").toString().equals("6")?"完成服务":
                                                                    d.get("orderState").toString().equals("7")?"待支付":
                                                                            d.get("orderState").toString().equals("8")?"需补差价":
                                                                                    d.get("orderState").toString().equals("9")?"已取货":
                                                                            d.get("orderState").toString().equals("8")?"待评价":
                                                                                    d.get("orderState").toString().equals("9")?"已完成":
                                                                                            d.get("orderState").toString().equals("10")?"已取消":
                                                                                                    d.get("orderState").toString().equals("11")?"改派中":
                                                                                                            d.get("orderState").toString().equals("12")?"已支付差价":"";
                                                                                                            d.get("orderState").toString().equals("12")?"取消待支付":"";
                }
                if(null == d.get("state")){
                    values[i][13]="";

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

@@ -644,7 +644,6 @@
        request.setMhltiCenterAppId("52270015");
        request.setPayType(4);
        request.setPayChannel(6);
        request.setIsCompensate(1);
        //请求路径
        String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/paymentOrder";
        //私钥文件

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

@@ -50,8 +50,4 @@
     * 付款方式，6:微信  7:支付宝  8:银行卡 9:银联二维码 10银联购物车收银台
     */
    private Integer payChannel;
    /**
     * 是否补偿单。1、是，0、否
     */
    private Integer isCompensate;
}

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/JwtConstants.java

@@ -12,7 +12,7 @@

    String SECRET = "defaultSecret";

    Long EXPIRATION = 604800L;
    Long EXPIRATION = 2592000L;

    String AUTH_PATH = "/gunsApi/auth";


 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java

@@ -500,6 +500,8 @@

    private Integer abnormalStatus;

    private String abnormalRemark;

    private BigDecimal responsibilityMoney;

    private String voice;
@@ -1374,6 +1376,14 @@
        this.payTime = payTime;
    }

    public String getAbnormalRemark() {
        return abnormalRemark;
    }

    public void setAbnormalRemark(String abnormalRemark) {
        this.abnormalRemark = abnormalRemark;
    }

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

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

@@ -1847,7 +1847,7 @@
            return ResultUtil.error("订单不在待支付状态，不允许支付", "");
        }
        Integer uid = orderPrivateCar.getUserId();
        Double orderMoney = orderPrivateCar.getOrderMoney();
        Double orderMoney = (2 == orderPrivateCar.getAbnormal() && 2 == orderPrivateCar.getAbnormalStatus() ? orderPrivateCar.getResponsibilityMoney().doubleValue() : orderPrivateCar.getOrderMoney());
        UserInfo userInfo = userInfoService.selectById(uid);
        ResultUtil resultUtil = ResultUtil.success(new Object());
        orderPrivateCar.setCouponMoney(0D);//初始化历史数据
@@ -1942,7 +1942,7 @@
            //非追缴单才需要添加收入
            if(0 == orderPrivateCar.getRecoveryOrder()){
                //添加收入
                Double orderMoney1 = (1 == orderPrivateCar.getAbnormal() ? orderPrivateCar.getOrderMoney() : orderPrivateCar.getResponsibilityMoney().doubleValue());
                Double orderMoney1 = (2 == orderPrivateCar.getAbnormal() && 2 == orderPrivateCar.getAbnormalStatus() ? orderPrivateCar.getResponsibilityMoney().doubleValue() : orderPrivateCar.getOrderMoney());
                Map<String, Object> map = incomeService.saveIncome(orderPrivateCar.getId(), 1, orderMoney1);
                orderPrivateCar.setSplitAllocation(JSON.toJSONString(map));
            }
@@ -1983,7 +1983,7 @@
            return ResultUtil.error("订单不在待支付状态，不允许支付", new ArrayList<>());
        }
        Integer uid = orderPrivateCar.getUserId();
        Double orderMoney = (1 == orderPrivateCar.getAbnormal() ? orderPrivateCar.getOrderMoney() : orderPrivateCar.getResponsibilityMoney().doubleValue());
        Double orderMoney = (2 == orderPrivateCar.getAbnormal() && 2 == orderPrivateCar.getAbnormalStatus() ? orderPrivateCar.getResponsibilityMoney().doubleValue() : orderPrivateCar.getOrderMoney());
        UserInfo userInfo = userInfoService.selectById(uid);
        ResultUtil resultUtil = ResultUtil.success(new Object());
        orderPrivateCar.setCouponMoney(0D);//初始化历史数据
@@ -2194,9 +2194,9 @@
                tradeOrderCreateData.setTreatShopId(driver.getEmpId().toString());
                //追缴单不要分账
                if(0 == orderPrivateCar.getRecoveryOrder()){
                    tradeOrderCreateData.setField1("{\"profitSharing\":\"1\",\"isPromote\":\"" + (orderPrivateCar.getPromotion() == 2 ? 1 : 0) + "\"}");
                    tradeOrderCreateData.setField1("{\"profitSharing\":\"1\",\"isCompensate\":\"0\",\"isPromote\":\"" + (orderPrivateCar.getPromotion() == 2 ? 1 : 0) + "\"}");
                }else{
                    tradeOrderCreateData.setField1("{\"profitSharing\":\"0\",\"isPromote\":\"0\"}");
                    tradeOrderCreateData.setField1("{\"profitSharing\":\"0\",\"isCompensate\":\"1\",\"isPromote\":\"0\"}");
                }
                tradeOrderCreateData.setCharge(new BigDecimal(orderMoney));
                tradeOrderCreateData.setOrderId(orderPrivateCar.getTravelId());
@@ -2335,12 +2335,18 @@
            //非追缴单才添加收入记录
            if(0 == orderPrivateCar.getRecoveryOrder()){
                //添加收入
                Double orderMoney1 = (1 == orderPrivateCar.getAbnormal() ? orderPrivateCar.getOrderMoney() : orderPrivateCar.getResponsibilityMoney().doubleValue());
                Double orderMoney1 = (2 == orderPrivateCar.getAbnormal() && 2 == orderPrivateCar.getAbnormalStatus() ? orderPrivateCar.getResponsibilityMoney().doubleValue() : orderPrivateCar.getOrderMoney());
                Map<String, Object> map = incomeService.saveIncome(orderPrivateCar.getId(), 1, orderMoney1);
                orderPrivateCar.setSplitAllocation(JSON.toJSONString(map));
            }


            //待审核的异常单修改状态为已关闭
            if(2 == orderPrivateCar.getAbnormal() && 1 == orderPrivateCar.getAbnormalStatus()){
                orderPrivateCar.setAbnormalStatus(3);
                orderPrivateCar.setResponsibilityMoney(new BigDecimal(orderPrivateCar.getOrderMoney()));
                orderPrivateCar.setResponsibilityType(3);
                orderPrivateCar.setAbnormalRemark("乘客已支付订单，申诉已自动关闭");
            }
            this.updateAllColumnById(orderPrivateCar);
            promotion(orderPrivateCar.getId());

@@ -2551,8 +2557,10 @@
            UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
            OpenCity openCity = openCityService.openCity1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
            SysIntegral query1 = sysIntegralMapper.query(openCity.getId());
            userInfo.setIntegral(userInfo.getIntegral() + (query.getAmount().intValue() * query1.getIntegral()));//积分
            userInfoService.updateById(userInfo);
            if(null != query1){
                userInfo.setIntegral(userInfo.getIntegral() + (query.getAmount().intValue() * query1.getIntegral()));//积分
                userInfoService.updateById(userInfo);
            }
            
            //处理优惠券和红包
            if (null != orderPrivateCar.getCouponId()) {
@@ -2585,10 +2593,17 @@
            //非追缴单才需要记录收入
            if(0 == orderPrivateCar.getRecoveryOrder()){
                //添加收入
                Double orderMoney = (1 == orderPrivateCar.getAbnormal() ? orderPrivateCar.getOrderMoney() : orderPrivateCar.getResponsibilityMoney().doubleValue());
                Double orderMoney = (2 == orderPrivateCar.getAbnormal() && 2 == orderPrivateCar.getAbnormalStatus() ? orderPrivateCar.getResponsibilityMoney().doubleValue() : orderPrivateCar.getOrderMoney());
                Map<String, Object> map = incomeService.saveIncome(orderPrivateCar.getId(), 1, orderMoney);
                orderPrivateCar.setSplitAllocation(JSON.toJSONString(map));
            }
            //待审核的异常单修改状态为已关闭
            if(2 == orderPrivateCar.getAbnormal() && 1 == orderPrivateCar.getAbnormalStatus()){
                orderPrivateCar.setAbnormalStatus(3);
                orderPrivateCar.setResponsibilityMoney(new BigDecimal(orderPrivateCar.getOrderMoney()));
                orderPrivateCar.setResponsibilityType(3);
                orderPrivateCar.setAbnormalRemark("乘客已支付订单，申诉已自动关闭");
            }
            this.updateById(orderPrivateCar);
            promotion(orderPrivateCar.getId());
            

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java

@@ -1562,7 +1562,7 @@
        boolean passwordTrueFlag = md5CredentialsMatcher.doCredentialsMatch(
                usernamePasswordToken, simpleAuthenticationInfo);
        String s = JwtTokenUtil.generateToken(String.valueOf(userInfo.getId()));
        redisTemplate.opsForValue().set(s.substring(s.length() - 32), String.valueOf(userInfo.getId()), 180, TimeUnit.DAYS);
        redisTemplate.opsForValue().set(s.substring(s.length() - 32), String.valueOf(userInfo.getId()), 30, TimeUnit.DAYS);
        redisTemplate.opsForValue().set("USER_" + type + "_" + userInfo.getPhone(), s.substring(s.length() - 32));
        redisTemplate.opsForValue().set("USER_" + type + "_" + userInfo.getId(), s);
        return s;

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

@@ -151,13 +151,13 @@
                Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
                Company company = companyService.selectById(driver.getCompanyId());
                UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
                Double orderMoney = (1 == orderPrivateCar.getAbnormal() ? orderPrivateCar.getOrderMoney() : orderPrivateCar.getResponsibilityMoney().doubleValue());
                Double orderMoney = (2 == orderPrivateCar.getAbnormal() && 2 == orderPrivateCar.getAbnormalStatus() ? orderPrivateCar.getResponsibilityMoney().doubleValue() : orderPrivateCar.getOrderMoney());

                if(null == orderPrivateCar.getIsCreated()){
                    //先调中台创建订单
                    CreateOrderRequest createOrderRequest = new CreateOrderRequest();
                    createOrderRequest.setTreatShopId(driver.getEmpId().toString());
                    createOrderRequest.setField1("{\"profitSharing\":\"1\",\"isPromote\":\"" + (orderPrivateCar.getPromotion() == 2 ? 1 : 0) + "\"}");
                    createOrderRequest.setField1("{\"profitSharing\":\"1\",\"isCompensate\":\"0\",\"isPromote\":\"" + (orderPrivateCar.getPromotion() == 2 ? 1 : 0) + "\"}");
                    createOrderRequest.setCharge(new BigDecimal(orderMoney));
                    createOrderRequest.setOrderNo("PR" + orderPrivateCar.getId());
                    createOrderRequest.setOrderId(orderPrivateCar.getTravelId());
@@ -290,12 +290,12 @@
                Driver driver = driverService.selectById(orderTaxi.getDriverId());
                Company company = companyService.selectById(driver.getCompanyId());
                UserInfo userInfo = userInfoService.selectById(orderTaxi.getUserId());
                Double orderMoney = (1 == orderTaxi.getAbnormal() ? orderTaxi.getOrderMoney() : orderTaxi.getResponsibilityMoney().doubleValue());
                Double orderMoney = (2 == orderTaxi.getAbnormal() && 2 == orderTaxi.getAbnormalStatus() ? orderTaxi.getResponsibilityMoney().doubleValue() : orderTaxi.getOrderMoney());
                if(null == orderTaxi.getIsCreated()){
                    //先调中台创建订单
                    CreateOrderRequest createOrderRequest = new CreateOrderRequest();
                    createOrderRequest.setTreatShopId(driver.getEmpId().toString());
                    createOrderRequest.setField1("{\"profitSharing\":\"1\",\"isPromote\":\"" + (orderTaxi.getPromotion() == 2 ? 1 : 0) + "\"}");
                    createOrderRequest.setField1("{\"profitSharing\":\"1\",\"isCompensate\":\"0\",\"isPromote\":\"" + (orderTaxi.getPromotion() == 2 ? 1 : 0) + "\"}");
                    createOrderRequest.setCharge(new BigDecimal(orderMoney));
                    createOrderRequest.setOrderNo("TA" + orderTaxi.getId());
                    createOrderRequest.setOrderId(orderTaxi.getTravelId());

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

@@ -654,7 +654,6 @@
        request.setMhltiCenterAppId("52270015");
        request.setPayType(4);
        request.setPayChannel(6);
        request.setIsCompensate(1);
        //请求路径
        String url = qianYunTongConfig.getApiUrl() + "/openapi/rest/1.0/paymentOrder";
        //私钥文件

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

@@ -51,8 +51,4 @@
     * 付款方式，6:微信  7:支付宝  8:银行卡 9:银联二维码 10银联购物车收银台
     */
    private Integer payChannel;
    /**
     * 是否补偿单。1、是，0、否
     */
    private Integer isCompensate;
}

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java

@@ -392,6 +392,8 @@

    private Integer responsibilityType;

    private String abnormalRemark;


    private Integer promotion;

@@ -1166,6 +1168,14 @@
        this.payTime = payTime;
    }

    public String getAbnormalRemark() {
        return abnormalRemark;
    }

    public void setAbnormalRemark(String abnormalRemark) {
        this.abnormalRemark = abnormalRemark;
    }

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

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

@@ -1269,7 +1269,7 @@
            return ResultUtil.error("订单不在待支付状态，不允许支付", "");
        }
        Integer uid = orderTaxi.getUserId();
        Double orderMoney = orderTaxi.getOrderMoney();
        Double orderMoney = (2 == orderTaxi.getAbnormal() && 2 == orderTaxi.getAbnormalStatus() ? orderTaxi.getResponsibilityMoney().doubleValue() : orderTaxi.getOrderMoney());
        UserInfo userInfo = userInfoService.selectById(uid);
        ResultUtil resultUtil = ResultUtil.success(new Object());
        orderTaxi.setCouponMoney(0D);//初始化历史数据
@@ -1403,7 +1403,7 @@
            return ResultUtil.error("订单不在待支付状态，不允许支付", "");
        }
        Integer uid = orderTaxi.getUserId();
        Double orderMoney = (1 == orderTaxi.getAbnormal() ? orderTaxi.getOrderMoney() : orderTaxi.getResponsibilityMoney().doubleValue());
        Double orderMoney = (2 == orderTaxi.getAbnormal() && 2 == orderTaxi.getAbnormalStatus() ? orderTaxi.getResponsibilityMoney().doubleValue() : orderTaxi.getOrderMoney());
        UserInfo userInfo = userInfoService.selectById(uid);
        ResultUtil resultUtil = ResultUtil.success(new Object());
        orderTaxi.setCouponMoney(0D);//初始化历史数据
@@ -1608,9 +1608,9 @@
                tradeOrderCreateData.setTreatShopId(driver.getEmpId().toString());
                //追缴单不要分账
                if(0 == orderTaxi.getRecoveryOrder()){
                    tradeOrderCreateData.setField1("{\"profitSharing\":\"1\",\"isPromote\":\"" + (orderTaxi.getPromotion() == 2 ? 1 : 0) + "\"}");
                    tradeOrderCreateData.setField1("{\"profitSharing\":\"1\",\"isCompensate\":\"0\",\"isPromote\":\"" + (orderTaxi.getPromotion() == 2 ? 1 : 0) + "\"}");
                }else{
                    tradeOrderCreateData.setField1("{\"profitSharing\":\"0\",\"isPromote\":\"0\"}");
                    tradeOrderCreateData.setField1("{\"profitSharing\":\"0\",\"isCompensate\":\"1\",\"isPromote\":\"0\"}");
                }
                tradeOrderCreateData.setCharge(new BigDecimal(orderMoney));
                tradeOrderCreateData.setOrderId(orderTaxi.getTravelId());
@@ -1716,11 +1716,21 @@
                query.setEndTime(new Date());
                userRedPacketRecordService.updateById(query);
            }
			
            //添加收入
            Map<String, Object> map = incomeService.saveIncome(orderTaxi.getId(), 2, orderTaxi.getOrderMoney());
            orderTaxi.setSplitAllocation(JSON.toJSONString(map));
            //非追缴单才添加收入记录
            if(0 == orderTaxi.getRecoveryOrder()){
                //添加收入
                Double orderMoney1 = (2 == orderTaxi.getAbnormal() && 2 == orderTaxi.getAbnormalStatus() ? orderTaxi.getResponsibilityMoney().doubleValue() : orderTaxi.getOrderMoney());
                Map<String, Object> map = incomeService.saveIncome(orderTaxi.getId(), 2, orderTaxi.getOrderMoney());
                orderTaxi.setSplitAllocation(JSON.toJSONString(map));
            }

            //待审核的异常单修改状态为已关闭
            if(2 == orderTaxi.getAbnormal() && 1 == orderTaxi.getAbnormalStatus()){
                orderTaxi.setAbnormalStatus(3);
                orderTaxi.setResponsibilityMoney(new BigDecimal(orderTaxi.getOrderMoney()));
                orderTaxi.setResponsibilityType(3);
                orderTaxi.setAbnormalRemark("乘客已支付订单，申诉已自动关闭");
            }
            this.updateAllColumnById(orderTaxi);
            promotion(orderTaxi.getId());
            
@@ -2146,8 +2156,10 @@
            UserInfo userInfo = userInfoService.selectById(orderTaxi.getUserId());
            OpenCity openCity = openCityService.openCity1(orderTaxi.getStartLon().toString(), orderTaxi.getStartLat().toString());
            SysIntegral query1 = sysIntegralMapper.query(openCity.getId());
            userInfo.setIntegral(userInfo.getIntegral() + (query.getAmount().intValue() * query1.getIntegral()));//积分
            userInfoService.updateById(userInfo);
            if(null != query1){
                userInfo.setIntegral(userInfo.getIntegral() + (query.getAmount().intValue() * query1.getIntegral()));//积分
                userInfoService.updateById(userInfo);
            }
            
            //处理优惠券和红包
            if (null != orderTaxi.getCouponId()) {
@@ -2177,9 +2189,22 @@
            query.setCode(order_id);
            paymentRecordService.updateById(query);
            
            //添加收入
            Map<String, Object> map = incomeService.saveIncome(orderTaxi.getId(), 2, orderTaxi.getOrderMoney());
            orderTaxi.setSplitAllocation(JSON.toJSONString(map));
            //非追缴单才添加收入记录
            if(0 == orderTaxi.getRecoveryOrder()){
                //添加收入
                Double orderMoney1 = (2 == orderTaxi.getAbnormal() && 2 == orderTaxi.getAbnormalStatus() ? orderTaxi.getResponsibilityMoney().doubleValue() : orderTaxi.getOrderMoney());
                Map<String, Object> map = incomeService.saveIncome(orderTaxi.getId(), 2, orderMoney1);
                orderTaxi.setSplitAllocation(JSON.toJSONString(map));
            }

            //待审核的异常单修改状态为已关闭
            if(2 == orderTaxi.getAbnormal() && 1 == orderTaxi.getAbnormalStatus()){
                orderTaxi.setAbnormalStatus(3);
                orderTaxi.setResponsibilityMoney(new BigDecimal(orderTaxi.getOrderMoney()));
                orderTaxi.setResponsibilityType(3);
                orderTaxi.setAbnormalRemark("乘客已支付订单，申诉已自动关闭");
            }

            this.updateById(orderTaxi);
            
            // TODO: 2020/5/24 这里需要给司机和用户推送订单状态