Merge remote-tracking branch 'origin/master'

puzhibing

2024-01-31 2a0298bb6ce4584ba311d7eba8454f515d2b0b3c

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ManagementIGOTravel/guns-admin/src/main/resources/application.yml

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CarController.java

@@ -113,18 +113,21 @@
            @ApiImplicitParam(value = "保险照片", name = "insurancePhoto", required = false, dataType = "string"),
            @ApiImplicitParam(value = "保险到期时间(yyyy-MM-dd)", name = "commercialInsuranceTime", required = false, dataType = "string"),
            @ApiImplicitParam(value = "人车合影照片", name = "peopleAndCarsPhone", required = false, dataType = "string"),
            @ApiImplicitParam(value = "其他品牌", name = "otherBrand", required = false, dataType = "string"),
            @ApiImplicitParam(value = "其他型号", name = "otherModel", required = false, dataType = "string"),
//            @ApiImplicitParam(value = "其他颜色", name = "otherColor", required = false, dataType = "string"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = false, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil addCar(Integer modelId, String color, String licensePlate, Date time, String drivingLicenseNumber, String drivingLicensePhoto,
                             String drivingLicenseEndTime, String carPhoto, String insurancePhoto, String commercialInsuranceTime,
                             String peopleAndCarsPhone, HttpServletRequest request,Integer id, Integer language){
                             String peopleAndCarsPhone, HttpServletRequest request,Integer id, Integer language,String otherBrand,String otherModel){
        try {
            Integer uid = driverService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            return carService.addCar(modelId, color, licensePlate, time, drivingLicenseNumber, drivingLicensePhoto, drivingLicenseEndTime, carPhoto, insurancePhoto
                    , commercialInsuranceTime, uid,id, peopleAndCarsPhone, language);
                    , commercialInsuranceTime, uid,id, peopleAndCarsPhone, language,otherBrand,otherModel);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();

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

@@ -423,12 +423,17 @@
            @ApiImplicitParam(value = "保险到期时间(yyyy-MM-dd)", name = "commercialInsuranceTime", required = false, dataType = "string"),
            @ApiImplicitParam(value = "人车合一照片", name = "peopleAndCarsPhone", required = false, dataType = "string"),
            @ApiImplicitParam(value = "司机id", name = "uid", required = true, dataType = "int"),
            @ApiImplicitParam(value = "车辆id", name = "carId", required = false, dataType = "int")
            @ApiImplicitParam(value = "车辆id", name = "carId", required = false, dataType = "int"),
            @ApiImplicitParam(value = "其他品牌", name = "otherBrand", required = false, dataType = "string"),
            @ApiImplicitParam(value = "其他型号", name = "otherModel", required = false, dataType = "string")
    })
    public ResultUtil addDriverCar(Integer modelId, String color, String licensePlate, Date time, String drivingLicenseNumber, String drivingLicensePhoto, String drivingLicenseEndTime,
                                   String carPhoto, String insurancePhoto, String commercialInsuranceTime, Integer uid, Integer carId, String peopleAndCarsPhone, Integer language){
                                   String carPhoto, String insurancePhoto, String commercialInsuranceTime, Integer uid, Integer carId, String peopleAndCarsPhone, Integer language
                                    ,String otherBrand,String otherModel){
        try {
            return carService.addCar(modelId, color, licensePlate, time, drivingLicenseNumber, drivingLicensePhoto, drivingLicenseEndTime, carPhoto, insurancePhoto, commercialInsuranceTime, uid,carId, peopleAndCarsPhone, language);
            return carService.addCar(modelId, color, licensePlate,
                    time, drivingLicenseNumber, drivingLicensePhoto,
                    drivingLicenseEndTime, carPhoto, insurancePhoto, commercialInsuranceTime, uid,carId, peopleAndCarsPhone, language,otherBrand,otherModel);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
@@ -1115,6 +1120,27 @@
    }


    @ResponseBody
    @PostMapping("/api/driver/getSum")
    @ApiOperation(value = "获取收入明细总额", tags = {"司机端-个人中心"}, notes = "")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil getSum(HttpServletRequest request) throws Exception {
        Integer uid = driverService.getUserIdFormRedis(request);
        if(null == uid){
            return ResultUtil.tokenErr();
        }
        List<Income> objectId = incomeService.selectList(new EntityWrapper<Income>().eq("objectId", uid));
        double sum =  0;
        for (Income income : objectId) {
            Double money = income.getMoney();
            sum = sum+money;
        }
        return ResultUtil.success(sum);
    }


    /**
     * 获取收入明细
     * @param pageNum
@@ -1137,6 +1163,7 @@
                return ResultUtil.tokenErr();
            }
            List<Map<String, Object>> list = driverService.queryTotalRevenue(language, uid, pageNum, size);

            List<BaseWarpper> data = new ArrayList<>();
            for(Map<String, Object> map : list){
                String type = map.get("type").toString();

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ICarService.java

@@ -61,5 +61,5 @@
     * @throws Exception
     */
    ResultUtil addCar(Integer modelId, String color, String licensePlate, Date time, String drivingLicenseNumber, String drivingLicensePhoto, String drivingLicenseEndTime,
                      String carPhoto, String insurancePhoto, String commercialInsuranceTime, Integer uid,Integer id, String peopleAndCarsPhone, Integer language) throws Exception;
                      String carPhoto, String insurancePhoto, String commercialInsuranceTime, Integer uid,Integer id, String peopleAndCarsPhone, Integer language,String otherBrand,String otherModel) throws Exception;
}

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

@@ -1,5 +1,6 @@
package com.stylefeng.guns.modular.system.service.impl;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.CarBrandMapper;
@@ -12,6 +13,7 @@
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -127,7 +129,8 @@
     */
    @Override
    public ResultUtil addCar(Integer modelId, String color, String licensePlate, Date time, String drivingLicenseNumber, String drivingLicensePhoto, String drivingLicenseEndTime,
                             String carPhoto, String insurancePhoto, String commercialInsuranceTime, Integer uid,Integer id, String peopleAndCarsPhone, Integer language) throws Exception {
                             String carPhoto, String insurancePhoto, String commercialInsuranceTime, Integer uid,Integer id, String peopleAndCarsPhone, Integer language
                                ,String otherBrand,String otherModel) throws Exception {

        Car query = carMapper.query(licensePlate);
        if(id==null){
@@ -143,9 +146,46 @@
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        Car car = new Car();
        car.setPeopleAndCarsPhone(peopleAndCarsPhone);
        car.setCarModelId(modelId);
        //
        if (!StringUtils.isEmpty(otherBrand)){
            List<CarBrand> carBrandList = carBrandMapper.selectList(new EntityWrapper<CarBrand>().eq("name", otherBrand).eq("state",1));
            if (carBrandList.isEmpty()){
                CarBrand carBrand = new CarBrand();
                carBrand.setState(1);
                carBrand.setInsertTime(new Date());
                carBrand.setName(otherBrand);
                carBrand.setRemark("1");
                Integer insert = carBrandMapper.insert(carBrand);
                car.setCarBrandId(insert);
            }else {
//                CarModel carModel = carModelMapper.selectById(modelId);
                car.setCarBrandId(carBrandList.get(0).getId());
            }
        }else {
        CarModel carModel = carModelMapper.selectById(modelId);
        car.setCarBrandId(carModel.getBrandId());
        }
        //
        if (!StringUtils.isEmpty(otherModel)){
            List<CarModel> carModels = carModelMapper.selectList(new EntityWrapper<CarModel>().eq("name", otherModel).eq("brandId", car.getCarBrandId()).eq("state",1));
            if (carModels.isEmpty()){
            CarModel carModel = new CarModel();
            carModel.setName(otherModel);
            carModel.setState(1);
            carModel.setInsertTime(new Date());
                carModel.setSeat(5);
            carModel.setBrandId(car.getCarBrandId());
                carModel.setRemark("1");
                carModelMapper.insert(carModel);
//            carModel.setSeat();
            }else {
                car.setCarModelId(carModels.get(0).getId());
            }
        }else {
            car.setCarModelId(modelId);
        }

        //
        car.setCarColor(color);
        car.setCarLicensePlate(licensePlate);
        car.setAnnualInspectionTime(time);

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserCouponRecordMapper.xml

@@ -331,7 +331,7 @@
            FROM
                t_user_coupon_record r
            WHERE
                r.activityType = 4 AND r.couponUseType=3
                r.activityType = 4 AND r.couponUseType=4
        <if test="beginTime != null and beginTime !='' and endTime != null and endTime != ''">
            and (r.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
        </if>

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

@@ -123,10 +123,10 @@
                    userActivityBalance.setGeneralCouponMoney(jsonObject.getDouble("num3"));
                    userActivityBalance.setSpecialNum(jsonObject.getInteger("num4"));
                    userActivityBalance.setSpecialCouponMoney(jsonObject.getDouble("num5"));
                    userActivityBalance.setTaxiNum(jsonObject.getInteger("num6"));
                    userActivityBalance.setTaxiCouponMoney(jsonObject.getDouble("num7"));
                    userActivityBalance.setIntercityNum(jsonObject.getInteger("num8"));
                    userActivityBalance.setIntercityCouponMoney(jsonObject.getDouble("num9"));
//                    userActivityBalance.setTaxiNum(jsonObject.getInteger("num6"));
//                    userActivityBalance.setTaxiCouponMoney(jsonObject.getDouble("num7"));
                    userActivityBalance.setIntercityNum(jsonObject.getInteger("num6"));
                    userActivityBalance.setIntercityCouponMoney(jsonObject.getDouble("num7"));
                    userActivityBalance.setTotalPrice(jsonObject.getDouble("num11"));
                    userActivityBalance.setLavePrice(jsonObject.getDouble("num11"));
                    userActivityBalance.insertOrUpdate();

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

@@ -42,7 +42,7 @@

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

 ManagementIGOTravel/guns-admin/src/main/resources/application-produce.yml

@@ -42,9 +42,9 @@

spring:
  datasource:
    url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0
    url: jdbc:mysql://192.168.110.80/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0
    username: root
    password: HjKbXilb9zajmXbl
    password: 123456
    db-name: guns #用来搜集数据库的所有表
    filters: wall,mergeStat


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

@@ -15,8 +15,9 @@
                            <div class="col-sm-3">
                                <#SelectCon id="couponUseType" name="优惠券类型" >
                                    <option value="">全部</option>
                                    <option value="0">通用券</option>
                                    <option value="1">专车券</option>
                                <option value="0">通用优惠券</option>
                                <option value="1">打车优惠券</option>
                                <option value="4">包裹优惠券</option>
                                    <!--<option value="2">出租车券</option>-->
                                    <!--<option value="3">跨城出行券</option>-->
                                </#SelectCon>

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

@@ -15,8 +15,9 @@
                            <div class="col-sm-3">
                                <#SelectCon id="couponUseType" name="优惠券类型" >
                                    <option value="">全部</option>
                                    <option value="0">通用券</option>
                                    <option value="1">专车券</option>
                                    <option value="0">通用优惠券</option>
                                    <option value="1">打车优惠券</option>
                                    <option value="4">包裹优惠券</option>
                                    <!--<option value="2">出租车券</option>-->
                                    <!--<option value="3">跨城出行券</option>-->
                                </#SelectCon>

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/sysCouponRecord/sysCouponRecord_add.html

@@ -10,18 +10,17 @@
                        <label class="col-sm-3 control-label">优惠券类型</label>
                        <div class="col-sm-9">
                            <select class="form-control" id="couponType" name="couponType"
                                    onchange="changeType()"
                            >
                                    onchange="changeType()">
                                <option value="1">抵扣券</option>
                                <option value="2">满减券</option>
                            </select>
                        </div>
                    </div>
                    <#select id="couponUseType" name="服务类型" underline="true">
                        <option value="1">专车券</option>
                        <!--<option value="2">出租车券</option>
                        <option value="3">跨城出行券</option>-->
                        <!--<option value="0">通用券</option>-->
                        <option value="1">打车优惠券</option>
                        <!--<option value="2">出租车券</option>-->
                        <option value="4">包裹优惠券</option>
                        <option value="0">通用优惠券</option>
                    </#select>
                    <#input id="money" name="金额" underline="true" placeholder="最多4位数字"/>
                    <div class="form-group" id="fullMoneys" style="display: none">

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/addRegist.html

@@ -39,7 +39,7 @@
                                    <br/>
                                    送
                                    &nbsp;<input type="text"  name="zc1" id="num4" class="form-control newWidth" />&nbsp;张
                                    &nbsp;<input type="text"  name="zc1" id="num5" class="form-control newWidth"  placeholder="请选择" readonly="readonly" onclick="RegistInfoDlg.selecteCoupon(1)"/>&nbsp;元专车优惠券
                                    &nbsp;<input type="text"  name="zc1" id="num5" class="form-control newWidth"  placeholder="请选择" readonly="readonly" onclick="RegistInfoDlg.selecteCoupon(1)"/>&nbsp;元打车优惠券
                                    <br/>
                                    <!--<br/>-->
                                    <!--送-->
@@ -52,6 +52,11 @@
                                    <!--&nbsp;<input type="text"  name="zc1" id="num9" class="form-control newWidth"  placeholder="请选择" readonly="readonly" onclick="RegistInfoDlg.selecteCoupon(3)"/>&nbsp;元城际优惠券-->
                                    <!--<br/>-->
                                    <br/>
                                    送
                                    &nbsp;<input type="text"  name="zc1" id="num6" class="form-control newWidth" />&nbsp;张
                                    &nbsp;<input type="text"  name="zc1" id="num7" class="form-control newWidth" placeholder="请选择" readonly="readonly" onclick="RegistInfoDlg.selecteCoupon(4)"/>&nbsp;元包裹优惠券
                                    <br/>
                                    <br/>
                                    有效期
                                    &nbsp;<input type="text"  name="zc1" id="num10" class="form-control newWidth" />&nbsp;天，
                                    最高金额

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/receiveRecord.html

@@ -271,18 +271,18 @@
            {field: 'selectItem', radio: true},
            {title: '', field: 'id', visible: false, align: 'center', valign: 'middle'},
            {title: '充值金额', field: 'money', visible: true, align: 'center', valign: 'middle'},
            {title: '通用券领取总数', field: 'number', visible: true, align: 'center', valign: 'middle'},
            {title: '通用券使用总数', field: 'useNumber', visible: true, align: 'center', valign: 'middle'},
            {title: '通用券使用总金额', field: 'useMoney', visible: true, align: 'center', valign: 'middle'},
            {title: '专车券领取总数', field: 'speNumber', visible: true, align: 'center', valign: 'middle'},
            {title: '专车券使用总数', field: 'speUseNumber', visible: true, align: 'center', valign: 'middle'},
            {title: '专车券使用总金额', field: 'speUserMoney', visible: true, align: 'center', valign: 'middle'},
            {title: '通用优惠券领取总数', field: 'number', visible: true, align: 'center', valign: 'middle'},
            {title: '通用优惠券使用总数', field: 'useNumber', visible: true, align: 'center', valign: 'middle'},
            {title: '通用优惠券使用总金额', field: 'useMoney', visible: true, align: 'center', valign: 'middle'},
            {title: '打车优惠券领取总数', field: 'speNumber', visible: true, align: 'center', valign: 'middle'},
            {title: '打车优惠券使用总数', field: 'speUseNumber', visible: true, align: 'center', valign: 'middle'},
            {title: '打车优惠券使用总金额', field: 'speUserMoney', visible: true, align: 'center', valign: 'middle'},
            // {title: '出租车券领取总数', field: 'taxiNumber', visible: true, align: 'center', valign: 'middle'},
            // {title: '出租车券使用总数', field: 'taxiUseNumber', visible: true, align: 'center', valign: 'middle'},
            // {title: '出租车券使用总金额', field: 'taxiUserMoney', visible: true, align: 'center', valign: 'middle'},
            // {title: '城际券领取总数', field: 'intercityNumber', visible: true, align: 'center', valign: 'middle'},
            // {title: '城际券使用总数', field: 'intercityUseNumber', visible: true, align: 'center', valign: 'middle'},
            // {title: '城际券使用总金额', field: 'intercityUserMoney', visible: true, align: 'center', valign: 'middle'},
            {title: '包裹优惠券领取总数', field: 'intercityNumber', visible: true, align: 'center', valign: 'middle'},
            {title: '包裹优惠券使用总数', field: 'intercityUseNumber', visible: true, align: 'center', valign: 'middle'},
            {title: '包裹优惠券使用总金额', field: 'intercityUserMoney', visible: true, align: 'center', valign: 'middle'},
            {title: '', field: 'insertTime', visible: true, align: 'center', valign: 'middle',
                formatter: function (value, row) {
                    var btn = '';

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_add.html

@@ -153,14 +153,14 @@
                                                <th style="width: 250px;">充值金额</th>
                                                <th style="width: 250px;">有效天数</th>
                                                <th style="width: 300px;">最高金额</th>
                                                <th style="width: 300px;">通用券金额</th>
                                                <th style="width: 300px;">通用券数量</th>
                                                <th style="width: 300px;">专车券金额</th>
                                                <th style="width: 300px;">专车券数量</th>
                                                <th style="width: 300px;">通用优惠券金额</th>
                                                <th style="width: 300px;">通用优惠卷数量</th>
                                                <th style="width: 300px;">打车优惠券金额</th>
                                                <th style="width: 300px;">打车优惠券数量</th>
                                                <!--<th style="width: 400px;">出租车券金额</th>-->
                                                <!--<th style="width: 400px;">出租车券数量</th>-->
                                                <!--<th style="width: 300px;">城际金额</th>-->
                                                <!--<th style="width: 300px;">城际券数量</th>-->
                                                <th style="width: 300px;">包裹优惠卷金额</th>
                                                <th style="width: 300px;">包裹优惠券数量</th>
                                                <th style="width: 100px;">操作</th>
                                            </tr>
                                            </thead>

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_detail.html

@@ -264,14 +264,14 @@
                                                <th style="width: 250px;">充值金额</th>
                                                <th style="width: 250px;">有效天数</th>
                                                <th style="width: 300px;">最高金额</th>
                                                <th style="width: 300px;">通用券金额</th>
                                                <th style="width: 300px;">通用券数量</th>
                                                <th style="width: 300px;">专车券金额</th>
                                                <th style="width: 300px;">专车券数量</th>
                                                <th style="width: 300px;">通用优惠券金额</th>
                                                <th style="width: 300px;">通用优惠卷数量</th>
                                                <th style="width: 300px;">打车优惠券金额</th>
                                                <th style="width: 300px;">打车优惠券数量</th>
                                                <!--<th style="width: 400px;">出租车券金额</th>-->
                                                <!--<th style="width: 400px;">出租车券数量</th>-->
                                                <!--<th style="width: 300px;">城际金额</th>-->
                                                <!--<th style="width: 300px;">城际券数量</th>-->
                                                <th style="width: 300px;">包裹优惠卷金额</th>
                                                <th style="width: 300px;">包裹优惠券数量</th>
                                            </tr>
                                            </thead>
                                            <tbody id="coun">
@@ -289,8 +289,8 @@
                                                        <!--<td><input type="hidden" id="num7" name="num7" value="${obj.taxiCouponMoney}">${obj.taxiCouponMoney}</td>-->
                                                        <!--<td><input type="hidden" id="num6" name="num6" value="${obj.taxiNum}">${obj.taxiNum}</td>-->

                                                        <!--<td><input type="hidden" id="num9" name="num9" value="${obj.intercityCouponMoney}">${obj.intercityCouponMoney}</td>-->
                                                        <!--<td><input type="hidden" id="num8" name="num8" value="${obj.intercityNum}">${obj.intercityNum}</td>-->
                                                        <td><input type="hidden" id="num9" name="num7" value="${obj.intercityCouponMoney}">${obj.intercityCouponMoney}</td>
                                                        <td><input type="hidden" id="num8" name="num6" value="${obj.intercityNum}">${obj.intercityNum}</td>
                                                    </tr>
                                                @}
                                            </tbody>

 ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/userActivity/userActivity_edit.html

@@ -272,14 +272,14 @@
                                                <th style="width: 250px;">充值金额</th>
                                                <th style="width: 250px;">有效天数</th>
                                                <th style="width: 300px;">最高金额</th>
                                                <th style="width: 300px;">通用券金额</th>
                                                <th style="width: 300px;">通用券数量</th>
                                                <th style="width: 300px;">专车券金额</th>
                                                <th style="width: 300px;">专车券数量</th>
                                                <th style="width: 300px;">通用优惠券金额</th>
                                                <th style="width: 300px;">通用优惠卷数量</th>
                                                <th style="width: 300px;">打车优惠券金额</th>
                                                <th style="width: 300px;">打车优惠券数量</th>
                                                <!--<th style="width: 400px;">出租车券金额</th>-->
                                                <!--<th style="width: 400px;">出租车券数量</th>-->
                                                <!--<th style="width: 300px;">城际金额</th>-->
                                                <!--<th style="width: 300px;">城际券数量</th>-->
                                                <th style="width: 300px;">包裹优惠卷金额</th>
                                                <th style="width: 300px;">包裹优惠券数量</th>
                                                <th style="width: 100px;">操作</th>
                                            </tr>
                                            </thead>
@@ -295,11 +295,11 @@
                                                        <td><input type="hidden" id="num5" name="num5" value="${obj.specialCouponMoney}">${obj.specialCouponMoney}</td>
                                                        <td><input type="hidden" id="num4" name="num4" value="${obj.specialNum}">${obj.specialNum}</td>

                                                        <td><input type="hidden" id="num7" name="num7" value="${obj.taxiCouponMoney}">${obj.taxiCouponMoney}</td>
                                                        <td><input type="hidden" id="num6" name="num6" value="${obj.taxiNum}">${obj.taxiNum}</td>
<!--                                                        <td><input type="hidden" id="num7" name="num7" value="${obj.taxiCouponMoney}">${obj.taxiCouponMoney}</td>-->
<!--                                                        <td><input type="hidden" id="num6" name="num6" value="${obj.taxiNum}">${obj.taxiNum}</td>-->

                                                        <td><input type="hidden" id="num9" name="num9" value="${obj.intercityCouponMoney}">${obj.intercityCouponMoney}</td>
                                                        <td><input type="hidden" id="num8" name="num8" value="${obj.intercityNum}">${obj.intercityNum}</td>
                                                        <td><input type="hidden" id="num9" name="num7" value="${obj.intercityCouponMoney}">${obj.intercityCouponMoney}</td>
                                                        <td><input type="hidden" id="num8" name="num6" value="${obj.intercityNum}">${obj.intercityNum}</td>
                                                        <td><button onclick="deleteSub(this)">移除</button></td>
                                                    </tr>
                                                @}

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

@@ -19,11 +19,11 @@
            {title: '优惠券类型', field: 'couponUseType', visible: true, align: 'center', valign: 'middle',
                formatter: function (value, row) {
                    if(value==0){
                        return "通用券";
                        return "通用优惠券";
                    }else if(value==1){
                        return "专车券";
                    }else if(value==2){
                        return "出租券";
                        return "打车优惠券";
                    }else if(value==4){
                        return "包裹优惠券";
                    }else if(value==3){
                        return "跨城出行券";
                    }else{

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

@@ -249,7 +249,7 @@
 * @param money
 */
SysCouponActivityInfoDlg.selectCouponOpt=function(id,couponUseType,couponType,money){
    $("#couponUseType").val(couponUseType==0?"通用券":couponUseType==1?"专车券":couponUseType==2?"出租券":"跨城出行券");
    $("#couponUseType").val(couponUseType==0?"通用优惠券":couponUseType==1?"打车优惠券":couponUseType==4?"包裹优惠券":"跨城出行券");
    $("#couponType").val(couponType==1?"抵扣":"满减");
    $("#money").val(money);
    $("#activityId").val(id);

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

@@ -22,11 +22,11 @@
            {title: '优惠券类型', field: 'couponUseType', visible: true, align: 'center', valign: 'middle',
                formatter: function (value, row) {
                    if(value==0){
                        return "通用券";
                        return "通用优惠券";
                    }else if(value==1){
                        return "专车券";
                    }else if(value==2){
                        return "出租券";
                        return "打车优惠券";
                    }else if(value==4){
                        return "包裹优惠券";
                    }else if(value==3){
                        return "跨城出行券";
                    }else{

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

@@ -21,11 +21,11 @@
            {title: '优惠券类型', field: 'couponUseType', visible: true, align: 'center', valign: 'middle',
                formatter: function (value, row) {
                    if(value==0){
                        return "通用券";
                        return "通用优惠券";
                    }else if(value==1){
                        return "专车券";
                    }else if(value==2){
                        return "出租券";
                        return "打车优惠券";
                    }else if(value==4){
                        return "包裹优惠券";
                    }else if(value==3){
                        return "跨城出行券";
                    }else{

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

@@ -22,9 +22,9 @@
    }else if(couponUseType==2){
        $("#id3").val(id);
        $("#num7").val(money);
    }else if(couponUseType==3){
    }else if(couponUseType==4){
        $("#id4").val(id);
        $("#num9").val(money);
        $("#num7").val(money);
    }
}


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

@@ -22,11 +22,11 @@
            {title: '优惠券类型', field: 'couponUseType', visible: true, align: 'center', valign: 'middle',
                formatter: function (value, row) {
                    if(value==0){
                        return "通用券";
                        return "通用优惠券";
                    }else if(value==1){
                        return "专车券";
                    }else if(value==2){
                        return "出租券";
                        return "打车优惠券";
                    }else if(value==4){
                        return "包裹优惠券";
                    }else if(value==3){
                        return "跨城出行券";
                    }else{

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

@@ -398,7 +398,7 @@
 * @param money
 */
UserActivityInfoDlg.selectCouponOpt=function(id,couponUseType,couponType,money,name){
    $("#content2Num2").val(couponUseType==0?"通用券":couponUseType==1?"专车券":couponUseType==2?"出租券":"跨城出行券");
    $("#content2Num2").val(couponUseType==0?"通用优惠券":couponUseType==1?"打车优惠券":couponUseType==4?"包裹优惠券":"跨城出行券");
    $("#content2Num3").val(couponType==1?"抵扣":"满减");
    $("#content2Num4").val(money);
    $("#content2CouponId").val(id);
@@ -429,7 +429,7 @@
 * @param money
 */
UserActivityInfoDlg.selectCouponOpt1=function(id,couponUseType,couponType,money,name){
    $("#content3Num2").val(couponUseType==0?"通用券":couponUseType==1?"专车券":couponUseType==2?"出租券":"跨城出行券");
    $("#content3Num2").val(couponUseType==0?"通用优惠券":couponUseType==1?"打车优惠券":couponUseType==4?"包裹优惠券":"跨城出行券");
    $("#content3Num3").val(couponType==1?"抵扣":"满减");
    $("#content3Num4").val(money);
    $("#content3CouponId").val(id);
@@ -487,8 +487,8 @@
        '<td><input type="hidden" id="id4" name="id4" value="'+id4+'"><input type="hidden" id="num2" name="num2" value="'+num2+'">' + num2 + '</td>' +
        '<td><input type="hidden" id="num5" name="num5" value="'+num5+'">' + num5 + '</td>' +
        '<td><input type="hidden" id="num4" name="num4" value="'+num4+'">' + num4 + '</td>' +
        // '<td><input type="hidden" id="num7" name="num7" value="'+num7+'">' + num7 + '</td>' +
        // '<td><input type="hidden" id="num6" name="num6" value="'+num6+'">' + num6 + '</td>' +
        '<td><input type="hidden" id="num7" name="num7" value="'+num7+'">' + num7 + '</td>' +
        '<td><input type="hidden" id="num6" name="num6" value="'+num6+'">' + num6 + '</td>' +
        // '<td><input type="hidden" id="num9" name="num9" value="'+num9+'">' + num9 + '</td>' +
        // '<td><input type="hidden" id="num8" name="num8" value="'+num8+'">' + num8 + '</td>' +
        '<td><button onclick="deleteSub(this)">移除</button></td></tr>';

 ManagementIGOTravel/guns-core/src/main/java/com/stylefeng/guns/core/util/DateUtil.java

@@ -93,7 +93,11 @@
    public static String getAllTime() {
        return formatDate(new Date(), "yyyyMMddHHmmss");
    }

    public static int getNowWeekDay() {
        Calendar canlendar = Calendar.getInstance(); // java.util包
        int week= canlendar.get(Calendar.DAY_OF_WEEK);
        return week == 0 ? 7 : week - 1;
    }
    /**
     * 获取YYYY-MM-DD HH:mm:ss格式
     */