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

Pu Zhibing

6 天以前 998bc10d74f370f7f99331d9df53d43311949f53

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

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

@@ -679,7 +679,7 @@
    public Object save(Integer responsibilityTypeVal,String remark,String money,Integer type,String orderNum) {
        Integer userId =null;
        if(type==1){
            TOrderPrivateCar tOrderPrivateCar = tOrderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>().eq("orderNum",orderNum));
            TOrderPrivateCar tOrderPrivateCar = tOrderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>().eq("id",orderNum));
            userId = tOrderPrivateCar.getUserId();
            tOrderPrivateCar.setResponsibilityType(responsibilityTypeVal);
            tOrderPrivateCar.setAbnormalStatus(2);
@@ -691,6 +691,7 @@
                // 追偿订单记录表
                TAbnormalPayOrder tAbnormalPayOrder = new TAbnormalPayOrder();
                tAbnormalPayOrder.setOrderNum(orderNum);
                tAbnormalPayOrder.setOrderNo(tOrderPrivateCar.getOrderNum());
                tAbnormalPayOrder.setType(1);
                tAbnormalPayOrder.setUserId(tOrderPrivateCar.getUserId());
                tAbnormalPayOrder.setPayStatus(1);
@@ -712,7 +713,7 @@
        }

        if(type==2){
            TOrderCrossCity tOrderCrossCity = tOrderCrossCityService.selectOne(new EntityWrapper<TOrderCrossCity>().eq("orderNum", orderNum));
            TOrderCrossCity tOrderCrossCity = tOrderCrossCityService.selectOne(new EntityWrapper<TOrderCrossCity>().eq("id", orderNum));
            userId = tOrderCrossCity.getUserId();
            tOrderCrossCity.setResponsibilityType(responsibilityTypeVal);
            tOrderCrossCity.setAbnormalStatus(2);
@@ -724,6 +725,8 @@
                // 追偿订单记录表
                TAbnormalPayOrder tAbnormalPayOrder = new TAbnormalPayOrder();
                tAbnormalPayOrder.setOrderNum(orderNum);

                tAbnormalPayOrder.setOrderNo(tOrderCrossCity.getOrderNum());
                tAbnormalPayOrder.setType(2);
                tAbnormalPayOrder.setUserId(tOrderCrossCity.getUserId());
                tAbnormalPayOrder.setPayStatus(1);
@@ -744,7 +747,7 @@

        }
        if(type==3){
            TOrderTaxi tOrderTaxi = tOrderTaxiService.selectOne(new EntityWrapper<TOrderTaxi>().eq("orderNum", orderNum));
            TOrderTaxi tOrderTaxi = tOrderTaxiService.selectOne(new EntityWrapper<TOrderTaxi>().eq("id", orderNum));
            userId = tOrderTaxi.getUserId();
            tOrderTaxi.setResponsibilityType(responsibilityTypeVal);
            tOrderTaxi.setAbnormalStatus(2);
@@ -756,6 +759,7 @@
                // 追偿订单记录表
                TAbnormalPayOrder tAbnormalPayOrder = new TAbnormalPayOrder();
                tAbnormalPayOrder.setOrderNum(orderNum);
                tAbnormalPayOrder.setOrderNo(tOrderTaxi.getOrderNum());
                tAbnormalPayOrder.setType(3);
                tAbnormalPayOrder.setUserId(tOrderTaxi.getUserId());
                tAbnormalPayOrder.setPayStatus(1);

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

@@ -4,14 +4,14 @@


    <select id="list" resultType="java.util.Map">
        select o.id,o.createTime, o.orderNum, t2.nickName userName, t2.phone userPhone, o.passengers, o.passengersPhone, o.payStatus, o.payTime, o.payMoney, o.insertTime, o.companyId
        select o.id,o.createTime, o.orderNo as orderNum, t2.nickName userName, t2.phone userPhone, o.passengers, o.passengersPhone, o.payStatus, o.payTime, o.payMoney, o.insertTime, o.companyId
        from t_abnormal_pay_order o left join  t_user t2 on o.userId = t2.id
        where 1=1
        <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
            AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
        </if>
        <if test="orderNum != null and orderNum != ''">
            and o.orderNum  LIKE CONCAT('%',#{orderNum},'%')
            and o.orderNo  LIKE CONCAT('%',#{orderNum},'%')
        </if>
        <if test="userName != null and userName != ''">
            and t2.nickName  LIKE CONCAT('%',#{userName},'%')

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAbnormalPayOrder.java

@@ -73,6 +73,8 @@
     */
    private Integer companyId;

    private String orderNo;


    @Override
    protected Serializable pkVal() {

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tAbnormalOrderCar/tAbnormalOrder_orderDetail.html

@@ -400,7 +400,7 @@
         let money = $("#money").val();
         let orderMoney = $("#orderMoney").val();
         let type = document.querySelector('input[name=type]').value;
         let orderNum = document.querySelector('input[name=orderNum]').value;
         let orderNum = document.querySelector('input[name=orderId]').value;
         console.log(responsibilityTypeVal,money,orderMoney)
         console.log(money>orderMoney)


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

@@ -359,7 +359,7 @@


            // 是否需要绑定司机
            TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", userInfo.getRegistAreaCode()).ge("startTime", new Date()).lt("endTime", new Date()).last(" limit 1"));
            TDriverPromotionActivity tDriverPromotionActivity = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("districtCode", userInfo.getRegistAreaCode()).le("startTime", new Date()).ge("endTime", new Date()).last(" limit 1"));
            if(tDriverPromotionActivity!=null){
                if(userInfo.getBindDriverId()==null || userInfo.getBindExpireDate().getTime()<=System.currentTimeMillis()){
                    Integer bindingDays = tDriverPromotionActivity.getBindingDays();
@@ -373,7 +373,7 @@
            }else {
                Region code = regionService.selectOne(new EntityWrapper<Region>().eq("code", userInfo.getRegistAreaCode()));
                Region region = regionService.selectById(code.getParentId());
                TDriverPromotionActivity tDriverPromotionActivity1 = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("cityCode", region.getCode()).ge("startTime", new Date()).lt("endTime", new Date()).last(" limit 1"));
                TDriverPromotionActivity tDriverPromotionActivity1 = driverPromotionActivityService.selectOne(new EntityWrapper<TDriverPromotionActivity>().eq("cityCode", region.getCode()).le("startTime", new Date()).ge("endTime", new Date()).last(" limit 1"));
                if(tDriverPromotionActivity1!=null) {
                    if (userInfo.getBindDriverId() == null || userInfo.getBindExpireDate().getTime() <= System.currentTimeMillis()) {
                        Integer bindingDays = tDriverPromotionActivity1.getBindingDays();