bug修改

xuhy

2025-08-11 0eef43ff28924d7b890db2c59e72de9c62699bae

bug修改

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

@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.api;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
@@ -11,6 +12,7 @@
import com.stylefeng.guns.modular.system.model.Driver;
import com.stylefeng.guns.modular.system.model.Income;
import com.stylefeng.guns.modular.system.model.OrderPosition;
import com.stylefeng.guns.modular.system.model.TransactionDetails;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.qiniuyun.QNYAuth;
@@ -22,6 +24,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
@@ -69,7 +72,8 @@

    @Autowired
    private IDriverOnlineService driverOnlineService;

    @Autowired
    private ITransactionDetailsService transactionDetailsService;


    /**
@@ -874,6 +878,7 @@
                baseWarpper.setAmount(Double.valueOf(String.valueOf(map.get("amount"))));
                baseWarpper.setName(String.valueOf(map.get("name")));
                baseWarpper.setDay(String.valueOf(map.get("day")));
                baseWarpper.setRemark(String.valueOf(map.get("remark")));
                data.add(baseWarpper);
            }
            return ResultUtil.success(data);
@@ -965,6 +970,9 @@
                    case 5:
                        baseWarpper.setName("跨城小件物流");
                        break;
                    case 6:
                        baseWarpper.setName("平台充值");
                        break;
                }
                Map<String, Object> map1 = new HashMap<>();
                switch (Integer.valueOf(map.get("orderType").toString())){
@@ -1013,11 +1021,39 @@
                        map1.put("roadTollMoney", 0);//过路费
                        map1.put("rakeMoney", incomes4.size() > 0 ? incomes4.get(0).getMoney() : 0);//抽成
                        break;
                    case 6:
                        List<TransactionDetails> transactionDetails = transactionDetailsService.selectList(new EntityWrapper<TransactionDetails>()
                                .eq("type", 1)
                                .eq("userId", uid)
                                .eq("state", 1)
                                .eq("userType", 2)
                                .eq("orderType", 6));
                        if(!CollectionUtils.isEmpty(transactionDetails)){
                            baseWarpper.setAmount(transactionDetails.get(0).getMoney());
                            baseWarpper.setRemark(transactionDetails.get(0).getRemark());
                        }
                        break;
                }

                baseWarpper.setData(map1);
                data.add(baseWarpper);
            }
            List<TransactionDetails> transactionDetails = transactionDetailsService.selectList(new EntityWrapper<TransactionDetails>()
                    .eq("type", 1)
                    .eq("userId", uid)
                    .eq("state", 1)
                    .eq("userType", 2)
                    .eq("orderType", 6));
            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
            for (TransactionDetails transactionDetail : transactionDetails) {
                BaseWarpper baseWarpper = new BaseWarpper();
                baseWarpper.setDay(format.format(transactionDetail.getInsertTime()));
                baseWarpper.setAmount(transactionDetail.getMoney());
                baseWarpper.setRemark(transactionDetail.getRemark());
                baseWarpper.setName("平台充值");
                baseWarpper.setData(new HashMap<>());
                data.add(baseWarpper);
            }
            return ResultUtil.success(data);
        }catch (Exception e){
            e.printStackTrace();

 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/ReassignMapper.xml

@@ -66,7 +66,8 @@
        select
        money as amount,
        DATE_FORMAT(insertTime, '%Y-%m-%d% %H:%i') as `day`,
        ('改派处罚') as name
        ('改派处罚') as name,
        remark
        from t_reassign where payTime is not null and originalDriverId = #{uid} order by insertTime desc limit #{pageNum}, #{size}
    </select>
</mapper>

 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/BaseWarpper.java

@@ -33,6 +33,8 @@
    private String day;
    @ApiModelProperty("其他内容")
    private Object data;
    @ApiModelProperty("备注")
    private String remark;

    public BaseWarpper() {
        this.id = 0;
@@ -126,6 +128,14 @@
        this.data = data;
    }

    public String getRemark() {
        return remark;
    }

    public void setRemark(String remark) {
        this.remark = remark;
    }

    @Override
    public String toString() {
        return "BaseWarpper{" +