2.0bug修改

无关风月

2024-07-17 91fa8588b3e7a8d6db4ef0f7847d78050d36998f

2.0bug修改

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

@@ -1650,8 +1650,6 @@
                             .ne("type", 1)
                             .isNotNull("orderType")
                                .between("insertTime", start, end));


                    break;
                case 2:
                    // 未结算

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

@@ -643,7 +643,7 @@
                grantVO.setName(tUser.getNickName());
            }
            grantVO.setRemark("订单号："+tOrderPrivateCar.getOrderNum());

            res.add(grantVO);
        }
        for (TOrderLogistics tOrderPrivateCar : tOrderLogistics) {
            if (tOrderPrivateCar.getState() != 9 &&tOrderPrivateCar.getState() != 8){
@@ -659,6 +659,7 @@
                grantVO.setName(tUser.getNickName());
            }
            grantVO.setRemark("订单号："+tOrderPrivateCar.getOrderNum());
            res.add(grantVO);
        }
        // 查询已领取红包总额
        for (TOrderPrivateCar userRedPacketRecord : userRedPacketRecords) {

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

@@ -175,7 +175,7 @@
    @ResponseBody
    public Object listSmall(String name,Integer state) {
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tSystemPriceService.getSpecialPriceList(page,ShiroKit.getUser().getObjectId(),name,state));
        page.setRecords(tSystemPriceService.getSpecialPriceList1(page,ShiroKit.getUser().getObjectId(),name,state));
        return super.packForBT(page);
    }


 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TSystemPriceMapper.java

@@ -26,6 +26,13 @@
                                                 @Param("name") String name,
                                                 @Param("state") Integer state);
    /**
     * 查询小件物流价格设置
     */
    List<Map<String,Object>> getSpecialPriceList1(@Param("page") Page<Map<String, Object>> page,
                                                 @Param("companyId") Integer companyId,
                                                 @Param("name") String name,
                                                 @Param("state") Integer state);
    /**
     * 获取价格
     * @param companyId
     * @param type

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

@@ -33,6 +33,22 @@
        </where>
        order by o.id desc
    </select>
    <!--查询小件物流价格设置-->
    <select id="getSpecialPriceList1" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
            SELECT * FROM (SELECT sp.id,sp.type,sp.companyId,sc.`name`,sc.img,sp.state from t_system_price as sp
        LEFT JOIN t_server_carmodel as sc on sc.id = sp.serverCarModelId) as o
        <where>
            o.type = 4 and o.state != 3 and o.companyId = #{companyId}
            <if test="name != null and name != ''">
                and o.name LIKE CONCAT('%',#{name},'%')
            </if>
            <if test="state != null and state != ''">
                and o.state = #{state}
            </if>
        </where>
        order by o.id desc
    </select>

    <select id="query" resultType="map">
        select
        id as id,

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

@@ -55,7 +55,6 @@
    private Date endTime;

    private Integer companyType;
    private String offline;

    public Integer getCompanyType() {
        return companyType;

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

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableName;
import lombok.Data;

import java.io.Serializable;

/**
@@ -16,6 +18,7 @@
 * @since 2020-06-17
 */
@TableName("t_driver_activity_online")
@Data
public class DriverActivityOnline extends Model<DriverActivityOnline> {

    private static final long serialVersionUID = 1L;
@@ -42,6 +45,8 @@
     * 奖励金额
     */
    private Double money;
    // 自动下班时间
    private Double offlineTime;
    /**
     * 有效期开始时间
     */

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

@@ -25,4 +25,11 @@
                                                 @Param("companyId") Integer companyId,
                                                 @Param("name") String name,
                                                 @Param("state") Integer state);
    /**
     * 查询小件物流价格设置
     */
    List<Map<String,Object>> getSpecialPriceList1(@Param("page") Page<Map<String, Object>> page,
                                                 @Param("companyId") Integer companyId,
                                                 @Param("name") String name,
                                                 @Param("state") Integer state);
}

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

@@ -52,7 +52,10 @@
    }

    @Override
    public void insertOrUpdate(Integer id, String staTime, String startTime, String num1, Double num2, Double num3, Integer num4, Double num5, Integer num6, Double num7, Integer num8, Double num9, Integer num10, Double num11,String num12) {
    public void insertOrUpdate(Integer id, String staTime, String startTime,
                               String num1, Double num2, Double num3, Integer num4,
                               Double num5, Integer num6, Double num7, Integer num8,
                               Double num9, Integer num10, Double num11,String num12) {
        //判断id是否为空，为空执行添加，或者执行修改
        if(id==null){
            String[] timeArray = startTime.split(" - ");
@@ -69,7 +72,6 @@
            driverActivity.setName(num1);
            driverActivity.setStartTime(startTimes);
            driverActivity.setEndTime(endTimes);
            driverActivity.setOffline(num12);
            driverActivity.insertOrUpdate();
            //添加在线活动-专车
            DriverActivityOnline driverActivityOnline = new DriverActivityOnline();
@@ -82,6 +84,7 @@
            driverActivityOnline.setOnline(num4);
            driverActivityOnline.setMoney(num5);
            driverActivityOnline.insertOrUpdate();
            driverActivityOnline.setOfflineTime(Double.valueOf(num12));
//            //添加在线活动-出租车
//            driverActivityOnline = new DriverActivityOnline();
//            driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
@@ -152,7 +155,7 @@
            driverActivity.setName(num1);
            driverActivity.setStartTime(startTimes);
            driverActivity.setEndTime(endTimes);
            driverActivity.setOffline(num12);

            driverActivity.insertOrUpdate();
            //添加在线活动-专车
            DriverActivityOnline driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",1));
@@ -168,6 +171,7 @@
            driverActivityOnline.setOnline(num4);
            driverActivityOnline.setMoney(num5);
            driverActivityOnline.insertOrUpdate();
            driverActivityOnline.setOfflineTime(Double.valueOf(num12));
            //添加在线活动-出租车
//            driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",2));
//            if(driverActivityOnline==null){

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

@@ -25,4 +25,8 @@
    public List<Map<String, Object>> getSpecialPriceList(Page<Map<String, Object>> page, Integer companyId, String name, Integer state) {
        return this.baseMapper.getSpecialPriceList(page, companyId, name, state);
    }
    @Override
    public List<Map<String, Object>> getSpecialPriceList1(Page<Map<String, Object>> page, Integer companyId, String name, Integer state) {
        return this.baseMapper.getSpecialPriceList1(page, companyId, name, state);
    }
}