Merge remote-tracking branch 'origin/2.0' into 2.0

luodangjia

2024-07-24 38470a0317c44220f371ef96a4a1b935ac16bdc0

Merge remote-tracking branch 'origin/2.0' into 2.0

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java

@@ -15,6 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;

@@ -176,7 +177,7 @@
                    .ne("type", 1)
                    .isNotNull("orderType"));
        }else{
            if (time == 5 && insertTime==null){
            if (time == 5 && !StringUtils.hasLength(insertTime)){
                incomes = tIncomeService.selectList(new EntityWrapper<Income>()
                        .eq("userType", 1)
                        .eq("objectId",1)
@@ -304,7 +305,7 @@
        }

        EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
        if (time == 5 && insertTime==null){
        if (time == 5 && !StringUtils.hasLength(insertTime)){

        }else{
            settlementDetailEntityWrapper.between("createTime", start, end);
@@ -333,21 +334,24 @@
                    platformVO.setMoney(bigDecimal1);
                    platformVO.setPayType("现金支付");
                    if (settlementDetail.getSettlementRecordId()!=null){
                        if (state!=null && state!=1){
                            continue;
                        }
                        // 已结算
                        platformVO.setState(1);
                        SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
                        balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
                        platformVO.setEndTime(format.format(settlementRecord.getDay()));
                    }else{
                        if (state!=null && state!=2){
                            continue;
                        if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus()==2){
                            if (state!=null && state!=1){
                                continue;
                            }
                            // 已结算
                            platformVO.setState(1);
                            balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
                            platformVO.setEndTime(format.format(settlementRecord.getDay()));
                        }else{
                            // 未结算
                            if (state!=null && state!=2){
                                continue;
                            }
                            platformVO.setState(2);
                            unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
                            platformVO.setEndTime(format.format(settlementRecord.getDay()));
                        }
                        // 未结算
                        platformVO.setState(2);
                        unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
                    }

                    res.add(platformVO);
@@ -372,21 +376,24 @@
                    platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
                    platformVO.setPayType("现金支付");
                    if (settlementDetail.getSettlementRecordId()!=null){
                        if (state!=null && state!=1){
                            continue;
                        }
                        // 已结算
                        platformVO.setState(1);
                        SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
                        balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
                        platformVO.setEndTime(format.format(settlementRecord.getDay()));
                    }else{
                        if (state!=null && state!=2){
                            continue;
                        if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus()==2){
                            if (state!=null && state!=1){
                                continue;
                            }
                            // 已结算
                            platformVO.setState(1);
                            balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
                            platformVO.setEndTime(format.format(settlementRecord.getDay()));
                        }else{
                            // 未结算
                            if (state!=null && state!=2){
                                continue;
                            }
                            platformVO.setState(2);
                            unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
                            platformVO.setEndTime(format.format(settlementRecord.getDay()));
                        }
                        // 未结算
                        platformVO.setState(2);
                        unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
                    }
                    res.add(platformVO);
                    break;
@@ -414,6 +421,16 @@
    @RequestMapping(value = "/water/getCount")
    @ResponseBody
    public Object getCount1(Integer time,String insertTime,Integer payType,Integer type) {
        if (payType!=null){
            switch (payType){
                case 1:
                    payType = 2;
                    break;
                case 2:
                    payType = 1;
                    break;
            }
        }
        if (time == null){
            time = 1;
        }
@@ -495,7 +512,7 @@
        EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
        // 司机手动结算金额
        Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
        if (time == 5 && insertTime==null){
        if (time == 5 && !StringUtils.hasLength(insertTime)){
            // 余额充值wrapper
            orderType = new EntityWrapper<TPubTransactionDetails>()
                    .eq("userType",1)
@@ -679,7 +696,7 @@

        // 司机提现
        for (TPubWithdrawal tPubWithdrawal : driver) {
            if(payType!=null && payType == 2){
            if(payType!=null && payType == 1){
                break;
            }
            WaterVO waterVO = new WaterVO();
@@ -700,7 +717,7 @@
        }
        // 用户提现
        for (TPubWithdrawal tPubWithdrawal : user) {
            if(payType!=null && payType == 2){
            if(payType!=null && payType == 1){
                break;
            }
            WaterVO waterVO = new WaterVO();
@@ -772,11 +789,11 @@
                case 1:
                    SettlementRecord settlementRecord = settlementRecordService.selectById(income.getSettlementRecordId());
                    if (settlementRecord!=null){
                        if (settlementRecord.getPayType()!=null){
                        if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus() == 2){
                            switch (settlementRecord.getPayType()){
                                case 1:
                                    if (payType!=null){
                                        if (payType == 1){
                                        if (payType != 1){
                                            continue;
                                        }
                                    }
@@ -784,7 +801,7 @@
                                    break;
                                case 2:
                                    if (payType!=null){
                                        if (payType == 2){
                                        if (payType != 2){
                                            continue;
                                        }
                                    }
@@ -795,6 +812,8 @@
                                    continue;
                            }

                        }else{
                            continue;
                        }
                    }else{
                        continue;
@@ -835,12 +854,12 @@
                    break;
                case 4:
                    SettlementRecord settlementRecord1 = settlementRecordService.selectById(income.getSettlementRecordId());
                    if (settlementRecord1==null){
                    if (settlementRecord1!=null&& settlementRecord1.getPaymentStatus()!=null && settlementRecord1.getPaymentStatus() == 2){
                        if (settlementRecord1.getPayType()!=null){
                            switch (settlementRecord1.getPayType()){
                                case 1:
                                    if (payType!=null){
                                        if (payType == 1){
                                        if (payType != 1){
                                            continue;
                                        }
                                    }
@@ -848,7 +867,7 @@
                                    break;
                                case 2:
                                    if (payType!=null){
                                        if (payType == 2){
                                        if (payType != 2){
                                            continue;
                                        }
                                    }
@@ -860,6 +879,8 @@
                            }

                        }
                    }else {
                        continue;
                    }
                    // 小件物流
                    // 查询订单信息
@@ -916,6 +937,16 @@
    @RequestMapping(value = "/water/list")
    @ResponseBody
    public Object list1(Integer time,String insertTime,Integer payType,Integer type) {
        if (payType!=null){
            switch (payType){
                case 1:
                    payType = 2;
                    break;
                case 2:
                    payType = 1;
                    break;
            }
        }
        if (time == null){
            time = 1;
        }
@@ -997,7 +1028,7 @@
        EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
        // 司机手动结算金额
        Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
        if (time == 5 && insertTime==null){
        if (time == 5 && !StringUtils.hasLength(insertTime)){
            // 余额充值wrapper
            orderType = new EntityWrapper<TPubTransactionDetails>()
                    .eq("userType",1)
@@ -1112,7 +1143,6 @@
                    continue;
                }
            }

            WaterVO waterVO = new WaterVO();
            waterVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
            waterVO.setType("用户订单消费");
@@ -1181,7 +1211,7 @@
        }
        // 司机提现
        for (TPubWithdrawal tPubWithdrawal : driver) {
            if(payType!=null && payType == 2){
            if(payType!=null && payType == 1){
                break;
            }
            WaterVO waterVO = new WaterVO();
@@ -1202,7 +1232,7 @@
        }
        // 用户提现
        for (TPubWithdrawal tPubWithdrawal : user) {
            if(payType!=null && payType == 2){
            if(payType!=null && payType == 1){
                break;
            }
            WaterVO waterVO = new WaterVO();
@@ -1271,19 +1301,18 @@
            userRecharge = userRecharge.add(new BigDecimal(paymentRecord.getAmount().toString()));
        }
        // 查询所有已结算的订单
        // 查询所有已结算的订单
        for (SettlementDetail income : settlementDetails1) {
            WaterVO platformVO = new WaterVO();
            platformVO.setType("司机结算");
            switch (income.getOrderType()){
                case 1:
                    SettlementRecord settlementRecord = settlementRecordService.selectById(income.getSettlementRecordId());
                    if (settlementRecord!=null){
                    if (settlementRecord!=null && settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus() == 2){
                        if (settlementRecord.getPayType()!=null){
                            switch (settlementRecord.getPayType()){
                                case 1:
                                    if (payType!=null){
                                        if (payType == 1){
                                        if (payType != 1){
                                            continue;
                                        }
                                    }
@@ -1291,7 +1320,7 @@
                                    break;
                                case 2:
                                    if (payType!=null){
                                        if (payType == 2){
                                        if (payType != 2){
                                            continue;
                                        }
                                    }
@@ -1343,12 +1372,12 @@
                    // 小件物流
                    // 查询订单信息
                    SettlementRecord settlementRecord1 = settlementRecordService.selectById(income.getSettlementRecordId());
                    if (settlementRecord1==null){
                        if (settlementRecord1.getPayType()!=null){
                    if (settlementRecord1!=null){
                        if (settlementRecord1.getPaymentStatus()!=null && settlementRecord1.getPaymentStatus() == 2){
                            switch (settlementRecord1.getPayType()){
                                case 1:
                                    if (payType!=null){
                                        if (payType == 1){
                                        if (payType != 1){
                                            continue;
                                        }
                                    }
@@ -1356,7 +1385,7 @@
                                    break;
                                case 2:
                                    if (payType!=null){
                                        if (payType == 2){
                                        if (payType != 2){
                                            continue;
                                        }
                                    }
@@ -1367,7 +1396,11 @@
                                    continue;
                            }

                        }else{
                            continue;
                        }
                    }else{
                        continue;
                    }
                    TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(income.getOrderId());
                    if (tOrderLogistics1==null){
@@ -1500,7 +1533,8 @@
                    .ne("type", 1)
                    .isNotNull("orderType"));
        }else{
            if (time == 5 && insertTime==null){

            if (time == 5 && !StringUtils.hasLength(insertTime)){
                incomes = tIncomeService.selectList(new EntityWrapper<Income>()
                        .eq("userType", 1)
                        .eq("objectId",1)
@@ -1516,7 +1550,7 @@
            }
        }
        EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
        if (time == 5 && insertTime==null){
        if (time == 5 && !StringUtils.hasLength(insertTime)){

        }else{
            settlementDetailEntityWrapper.between("createTime", start, end);
@@ -1623,7 +1657,6 @@
                    break;
            }
        }

        // 查询所有现金支付的订单
        for (SettlementDetail settlementDetail : settlementDetails) {
            PlatformVO platformVO = new PlatformVO();
@@ -1640,33 +1673,31 @@
                        platformVO.setDriverName(tDriver.getFirstName()+tDriver.getLastName());
                        platformVO.setDriverPhone(tDriver.getPhone());
                    }

                    platformVO.setRemark(tOrderPrivateCar.getRemark());

                    platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
                    String string = settlementDetail.getPrice().toString();
                    BigDecimal bigDecimal1 = new BigDecimal(string);
                    platformVO.setMoney(bigDecimal1);
                    platformVO.setPayType("现金支付");

                    if (settlementDetail.getSettlementRecordId()!=null){
                        if (state!=null && state!=1){
                            continue;
                        }
                        // 已结算
                        platformVO.setState(1);
                        SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
                        balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
                        platformVO.setEndTime(format.format(settlementRecord.getDay()));
                    }else{
                        if (state!=null && state!=2){
                            continue;
                        if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus()==2){
                            if (state!=null && state!=1){
                                continue;
                            }
                            // 已结算
                            platformVO.setState(1);
                            balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
                            platformVO.setEndTime(format.format(settlementRecord.getPayTime()));
                        }else{
                            // 未结算
                            if (state!=null && state!=2){
                                continue;
                            }
                            platformVO.setState(2);
                            unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
                        }
                        // 未结算
                        platformVO.setState(2);
                        unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
                    }

                    res.add(platformVO);
                    break;
                case 4:
@@ -1689,21 +1720,24 @@
                    platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
                    platformVO.setPayType("现金支付");
                    if (settlementDetail.getSettlementRecordId()!=null){
                        if (state!=null && state!=1){
                            continue;
                        }
                        // 已结算
                        platformVO.setState(1);
                        SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
                        balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
                        platformVO.setEndTime(format.format(settlementRecord.getDay()));
                    }else{
                        if (state!=null && state!=2){
                            continue;
                        if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus()==2){
                            if (state!=null && state!=1){
                                continue;
                            }
                            // 已结算
                            platformVO.setState(1);
                            balance = balance.add(new BigDecimal(settlementDetail.getPrice()));
                            platformVO.setEndTime(format.format(settlementRecord.getDay()));
                        }else{
                            // 未结算
                            if (state!=null && state!=2){
                                continue;
                            }
                            platformVO.setState(2);
                            unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
                            platformVO.setEndTime(format.format(settlementRecord.getDay()));
                        }
                        // 未结算
                        platformVO.setState(2);
                        unBalance = unBalance.add(new BigDecimal(settlementDetail.getPrice()));
                    }
                    res.add(platformVO);
                    break;

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TSubsidyController.java

@@ -17,6 +17,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;

@@ -28,6 +29,7 @@
import java.time.*;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
import java.util.stream.Collectors;

/**
 * 控制器
@@ -204,11 +206,7 @@
        // 司机已消费金额
        Wrapper<BalanceUsageRecord> between4 = new EntityWrapper<BalanceUsageRecord>()
                ;
        if (time == 5 && insertTime==null){
            driverWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("userType", 2)
                    ;
        if (time == 5 && !StringUtils.hasLength(insertTime)){
            // 专车wrapper
            between = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("activityId")
@@ -237,11 +235,13 @@
            // 司机提现
            driverWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("type",1)
                    .eq("userType", 2)
                    ;
            ;
        }else{
            driverWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("type",1)
                    .eq("userType", 2)
                    .between("insertTime", start, end);
            // 专车wrapper
@@ -484,6 +484,7 @@
        driver = driverConsume.add(driverWithdrawal1);
        return res;
    }

    @RequestMapping(value = "/use/getCount")
    @ResponseBody
    public Object getCount1(Integer time,String insertTime,Integer type) {
@@ -587,7 +588,7 @@
        // 司机提现
        Wrapper<TPubWithdrawal> between44 = new EntityWrapper<TPubWithdrawal>()
                ;
        if (time == 5 && insertTime==null){
        if (time == 5 && !StringUtils.hasLength(insertTime)){
            driverWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("userType", 2)
@@ -767,7 +768,7 @@
            }
            grantVO.setRemark("订单号："+userRedPacketRecord.getOrderNum());
            res.add(grantVO);
            redPackage = redPackage.add(new BigDecimal(userRedPacketRecord.getPayMoney().toString()));
            redPackage = redPackage.add(new BigDecimal(temp.toString()));
        }
        for (TOrderLogistics userRedPacketRecord : userRedPacketRecords1) {
            if (userRedPacketRecord.getState() != 9 &&userRedPacketRecord.getState() != 8){
@@ -789,7 +790,7 @@
            }
            grantVO.setRemark("订单号："+userRedPacketRecord.getOrderNum());
            res.add(grantVO);
            redPackage = redPackage.add(new BigDecimal(userRedPacketRecord.getPayMoney().toString()));
            redPackage = redPackage.add(new BigDecimal(temp.toString()));
        }
        // 查询已领取优惠券总额
        for (TOrderPrivateCar userCouponRecord : userCouponRecords) {
@@ -805,7 +806,7 @@
                grantVO.setName(tUser.getNickName());
            }
            grantVO.setRemark("订单号："+userCouponRecord.getOrderNum());
            coupon = coupon.add(new BigDecimal(userCouponRecord.getPayMoney().toString()));
            coupon = coupon.add(new BigDecimal(userCouponRecord.getCouponMoney().toString()));
            res.add(grantVO);
        }
        for (TOrderLogistics userCouponRecord : userCouponRecords1) {
@@ -821,7 +822,7 @@
                grantVO.setName(tUser.getNickName());
            }
            grantVO.setRemark("订单号："+userCouponRecord.getOrderNum());
            coupon = coupon.add(new BigDecimal(userCouponRecord.getPayMoney().toString()));
            coupon = coupon.add(new BigDecimal(userCouponRecord.getCouponMoney().toString()));
            res.add(grantVO);
        }
        // 司机消费奖励
@@ -985,7 +986,7 @@
        // 司机奖励
        Wrapper<DriverActivityHistory> between4 = new EntityWrapper<DriverActivityHistory>()
                ;
        if (time == 5 && insertTime==null){
        if (time == 5 && !StringUtils.hasLength(insertTime)){
            // 专车wrapper
            between = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("discountMoney")
@@ -1154,10 +1155,9 @@
            if (tUser!=null){
                grantVO.setName(tUser.getNickName());
            }
            SysCouponRecord sysCouponRecord =
                    sysCouponRecordService.selectById(userCouponRecord.getCouponId());
            if (sysCouponRecord!=null){
                grantVO.setRemark(sysCouponRecord.getName());
            SysCouponActivity sysCouponActivity = sysCouponActivityService.selectById(userCouponRecord.getCouponActivityId());
            if (sysCouponActivity!=null){
                grantVO.setRemark(sysCouponActivity.getName());
            }
            coupon = coupon.add(new BigDecimal(userCouponRecord.getMoney().toString()));
            res.add(grantVO);
@@ -1190,8 +1190,11 @@
            driver = driver.add(new BigDecimal(driverActivityHistory.getMoney().toString()));
            res.add(grantVO);
        }
        List<GrantVO> sortedList = res.stream()
                .sorted((o1, o2) -> o2.getInsertTime().compareTo(o1.getInsertTime()))
                .collect(Collectors.toList());
        total = total.add(redPackage).add(coupon).add(discount).add(driver);
        return res;
        return sortedList;
    }
    @RequestMapping(value = "/grant/getCount")
    @ResponseBody
@@ -1286,7 +1289,7 @@
        // 司机奖励
        Wrapper<DriverActivityHistory> between4 = new EntityWrapper<DriverActivityHistory>()
                ;
        if (time == 5 && insertTime==null){
        if (time == 5 && !StringUtils.hasLength(insertTime)){
            // 专车wrapper
            between = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("discountMoney")

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java

@@ -241,7 +241,7 @@
    @ResponseBody
    public Object add(String staTime, String startTime, String num1, Double num2
            , Double num3
            , Integer num4
            , String num4
            , Double num5
            , Integer num6
            , Double num7
@@ -283,7 +283,7 @@
    @ResponseBody
    public Object update(Integer id,String staTime, String startTime, String num1, Double num2
            , Double num3
            , Integer num4
            , String num4
            , Double num5
            , Integer num6
            , Double num7

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java

@@ -40,7 +40,7 @@
    /**
     * 在线小时
     */
    private Integer online;
    private String online;
    /**
     * 奖励金额
     */
@@ -93,11 +93,11 @@
        this.type = type;
    }

    public Integer getOnline() {
    public String getOnline() {
        return online;
    }

    public void setOnline(Integer online) {
    public void setOnline(String online) {
        this.online = online;
    }


 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IDriverActivityService.java

@@ -34,7 +34,7 @@

    void insertOrUpdate(Integer id,String staTime, String startTime, String num1, Double num2
            , Double num3
            , Integer num4
            , String num4
            , Double num5
            , Integer num6
            , Double num7

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java

@@ -53,7 +53,7 @@

    @Override
    public void insertOrUpdate(Integer id, String staTime, String startTime,
                               String num1, Double num2, Double num3, Integer num4,
                               String num1, Double num2, Double num3, String num4,
                               Double num5, Integer num6, Double num7, Integer num8,
                               Double num9, Integer num10, Double num11,String num12) {
        //判断id是否为空，为空执行添加，或者执行修改

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_add.html

@@ -35,7 +35,7 @@
                            &nbsp;<input type="text"   id="num5" class="form-control newWidth" />&nbsp;GHS
                            <br/>
                            <br/>
                            连续在线&nbsp;<input type="text"   id="num12" class="form-control newWidth" />&nbsp;小时不接单 则强制更改司机账号状态为:下班,并且累计的在线时长清零;
                            累计在线&nbsp;<input type="text"   id="num12" class="form-control newWidth" />&nbsp;小时不接单 则强制更改司机账号状态为:下班,并且累计的在线时长清零;
                            <br/>
                            <br/>
                            <!--

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html

@@ -55,7 +55,7 @@
                                         name="zc7" class="form-control newWidth" readonly/>&nbsp;GHS
                            <br/>
                            <br/>
                            连续在线&nbsp;<input type="text" @if(isNotEmpty(online1.offlineTime)){
                            累计在线&nbsp;<input type="text" @if(isNotEmpty(online1.offlineTime)){
                                                 value="${online1.offlineTime}"
                                                 @}else{
                                                 value=""

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html

@@ -56,7 +56,7 @@
                                         name="zc7" id="num5" class="form-control newWidth"/>&nbsp;GHS
                            <br/>
                            <br/>
                            连续在线&nbsp;<input type="text" @if(isNotEmpty(online1.offlineTime)){
                            累计在线&nbsp;<input type="text" @if(isNotEmpty(online1.offlineTime)){
                                                 value="${online1.offlineTime}"
                                                 @}else{
                                                 value=""

 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/driverActivity/driverActivity_info.js

@@ -69,6 +69,7 @@
        return;
    }
    var re =  /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/;
    var re1 =  /^\d+(\.\d{1,2})?$/;
    if (!re.test($("#num2").val())) {
        Feng.error("请输入正确金额数!");
        return;
@@ -82,7 +83,7 @@
        Feng.error("请输入正确金额数!");
        return;
    }
    if (!re.test($("#num12").val())) {
    if (!re1.test($("#num12").val())) {
        Feng.error("请输入正确小时数!");
        return;
    }
@@ -99,7 +100,7 @@
        return;
    }

    if (!/^[1-9]\d*$/.test($("#num4").val())) {
    if (!re1.test($("#num4").val())) {
        Feng.error("请输入正确小时数!");
        return;
    }
@@ -196,6 +197,7 @@
        return;
    }
    var re =  /^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/;
    var re1 =  /^\d+(\.\d{1,2})?$/;
    if (!re.test($("#num2").val())) {
        Feng.error("请输入正确金额数!");
        return;
@@ -209,7 +211,7 @@
        Feng.error("请输入正确金额数!");
        return;
    }
    if (!re.test($("#num12").val())) {
    if (!re1.test($("#num12").val())) {
        Feng.error("请输入正确小时数!");
        return;
    }
@@ -226,7 +228,7 @@
        return;
    }

    if (!/^[1-9]\d*$/.test($("#num4").val())) {
    if (!re1.test($("#num4").val())) {
        Feng.error("请输入正确小时数!");
        return;
    }

 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/platform.js

@@ -237,7 +237,7 @@
    TUser.getCount();
};
TUser.resetSearch = function () {
    $("#time").val("");
    $("#time").val("5");
    $("#insertTime").val("");
    $("#state").val("");
    TUser.search();

 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/platform/water.js

@@ -229,7 +229,7 @@
    TUser.getCount();
};
TUser.resetSearch = function () {
    $("#time").val("");
    $("#time").val("5");
    $("#insertTime").val("");
    $("#type").val("");
    $("#payType").val("");

 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/grant.js

@@ -212,7 +212,7 @@
    TUser.getCount();
};
TUser.resetSearch = function () {
    $("#time").val("");
    $("#time").val("5");
    $("#insertTime").val("");
    $("#type").val("");
    TUser.search();

 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/subsidy/use.js

@@ -216,7 +216,7 @@
    TUser.getCount();
};
TUser.resetSearch = function () {
    $("#time").val("");
    $("#time").val("5");
    $("#insertTime").val("");
    $("#type").val("");
    TUser.search();