BUG修改

xuhy

2023-12-08 4adf49cd01c70e3867ddcad214e690619ddc3d07

BUG修改

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

@@ -74,6 +74,7 @@
    @ResponseBody
    public Object driverWorkDetailList(String times) {
        Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
        times = times.split(" ")[0];
        page.setRecords(tIncomeService.getList2(page,times));
        return super.packForBT(page);
    }

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

@@ -67,15 +67,16 @@
    </select>
    <select  id="getList1" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
            select
            a.date as times,
            a.`date` as times,
            a.driverNum,
            b.duration as timeNumber
            from (
            select date, count(driverId) as driverNum from t_driver_online where assessment = 0 group by date
            select `date`, count(driverId) as driverNum from t_driver_online where assessment = 0 group by `date`
            ) as a
            left join (
            select date, sum(duration) as duration from t_driver_online where assessment = 0 group by date
            select `date`, sum(duration) as duration from t_driver_online where assessment = 0 group by `date`
            ) as b on (a.date = b.date)
            ORDER BY a.date DESC
    </select>
    <select  id="getList2" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
        select
@@ -83,7 +84,7 @@
        a.duration as timeNumber
        from t_driver_online a
        left join t_driver b on (a.driverId = b.id)
         where assessment = 0 and DATE_FORMAT(date, '%Y-%m-%d') = '2022-12-29'
         where a.assessment = 0 and DATE_FORMAT(a.`date`, '%Y-%m-%d') = #{times}
    </select>
    <select  id="getTotal" resultType="map">
      SELECT COUNT(o.driverId) driverNum,SUM(o.timeNumber) timeNumber from (SELECT

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java

@@ -1257,6 +1257,7 @@
    @ApiImplicitParams({
            @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
            @ApiImplicitParam(value = "订单类型", name = "orderType", required = true, dataType = "int"),
            @ApiImplicitParam(value = "语言", name = "language", required = true, dataType = "int"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil shareRedEnvelope(Integer orderId, Integer orderType, Integer language){

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

@@ -127,7 +127,8 @@
    @ApiImplicitParams({
            @ApiImplicitParam(value = "手机号码", name = "phone", required = true, dataType = "String"),
            @ApiImplicitParam(value = "图片验证码", name = "kaptcha", required = true, dataType = "String"),
            @ApiImplicitParam(value = "场景类型（1=身份验证，2=登录确认，3=用户注册，4=修改密码）", name = "type", required = true, dataType = "String")
            @ApiImplicitParam(value = "场景类型（1=身份验证，2=登录确认，3=用户注册，4=修改密码）", name = "type", required = true, dataType = "String"),
            @ApiImplicitParam(value = "语言", name = "language", required = true, dataType = "int")
    })
    public ResultUtil queryCaptcha(HttpServletRequest request,String phone, Integer type,String kaptcha, Integer language){
        if(ToolUtil.isNotEmpty(phone)){
@@ -319,7 +320,8 @@
            @ApiImplicitParam(value = "短信验证码", name = "code", required = true, dataType = "String"),
            @ApiImplicitParam(value = "分享的用户id", name = "uid", required = true, dataType = "int"),
            @ApiImplicitParam(value = "用户类型（1=用户，2=司机）", name = "type", required = true, dataType = "int"),
            @ApiImplicitParam(value = "注册类型（1=司机注册，2=用户注册）", name = "userType", required = true, dataType = "int")
            @ApiImplicitParam(value = "注册类型（1=司机注册，2=用户注册）", name = "userType", required = true, dataType = "int"),
            @ApiImplicitParam(value = "语言", name = "language", required = true, dataType = "int")
    })
    public ResultUtil<LoginWarpper> captchaLogin_(String phoneOperator, String phone, String code, Integer uid, Integer type, Integer userType, Integer language){
        try {
@@ -848,6 +850,7 @@
    @ApiOperation(value = "修改登录密码", tags = {"用户端-个人中心"}, notes = "")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "新密码", name = "password", required = true, dataType = "string"),
            @ApiImplicitParam(value = "语言", name = "language", required = true, dataType = "int"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil updatePassword(String password, Integer language, HttpServletRequest request){

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml

@@ -158,7 +158,7 @@
        orderMoney as orderMoney,
        payMoney as payMoney,
        (select price from t_order_logistics_spread where orderLogisticsId = a.id) as differenceMoney
        from t_order_logistics as a where userId = #{uid} order by insertTime desc limit #{pageNum}, #{size}
        from t_order_logistics as a where userId = #{uid} and isDelete = 1 order by insertTime desc limit #{pageNum}, #{size}
    </select>



 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml

@@ -344,7 +344,7 @@
        (1) as orderType,
        state as state,
        oldState as oldState
        from t_order_private_car where userId = #{uid} order by insertTime desc limit #{pageNum}, #{size}
        from t_order_private_car where userId = #{uid} and isDelete = 1 order by insertTime desc limit #{pageNum}, #{size}
    </select>



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

@@ -1187,9 +1187,12 @@
                            if(!file1.exists()){
                                file1.createNewFile();
                            }
                            FileOutputStream fileOutputStream = new FileOutputStream(file1);
                            HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);

                            try {
                                FileOutputStream fileOutputStream = new FileOutputStream(file1);
                                HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
                            }catch (Exception e){
                                System.out.println("html转pdf异常");
                            }

                            String link ="http://182.160.16.251:81/files/html/ride_receipt_" + orderId + ".html";
                            TEmail tEmail = new TEmail();