修改bug

puzhibing

2026-04-25 1040311651f6b21e4742574ecdd3b144c19bce53

修改bug

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/operation/XpActivity.java

@@ -1,6 +1,8 @@
package com.xiaopeng.api.model.operation;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -14,6 +16,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;

/**
 * <p>
@@ -37,13 +40,16 @@
    private String acticityName;

    @ApiModelProperty(value = "活动类型 如新人活动、媒体邀约活动、日常提频等")
    private Integer activityType;
    private Integer acticityType;

    @ApiModelProperty(value = "是否开启活动总限额")
    private boolean enableTotalLimit;
    private Integer aggregateLimit;

    @ApiModelProperty(value = "是否开启活动总限额")
    private BigDecimal totalLimit;
    @ApiModelProperty(value = "总限额")
    private BigDecimal limitation;

    @ApiModelProperty(value = "封面图片json")
    private JSONObject coverImage;

    @ApiModelProperty(value = "开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -118,4 +124,12 @@
    private Integer floatWindowPriority;
    @ApiModelProperty("浮窗跳转链接")
    private String floatWindowJumpUrl;

    @ApiModelProperty(value = "是否第一次 1=是 0=否")
    @TableField(exist = false)
    private Boolean isFirst;

    @ApiModelProperty(value = "优惠券")
    @TableField(exist = false)
    private List<XpActicityCoupon> coupons;
}

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/operation/XpActivityVo.java

File was deleted

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java

@@ -7,10 +7,8 @@
import com.xiaopeng.api.model.operation.XpActivity;
import com.xiaopeng.api.model.operation.XpCoupon;
import com.xiaopeng.api.query.operation.XpActivityPageListQuery;
import com.xiaopeng.api.vo.operation.XpActivityVo;
import com.xiaopeng.common.core.constant.CacheConstants;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.utils.bean.BeanUtils;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.operation.service.IXpActicityCouponService;
import com.xiaopeng.operation.service.IXpActicityService;
@@ -83,20 +81,18 @@
    @GetMapping("/api/v1/mini-program/acticity/firstEnter")
    @ApiOperation(value = "获取是否第一次推送活动", tags = {"小程序-首页活动"})
    @XpClientCheck(checkToken = false, checkOtpToken = true)
    public R<XpActivityVo> firstEnter(HttpServletRequest request){
    public R<XpActivity> firstEnter(HttpServletRequest request){
        String uid = request.getHeader("XP-Uid");
        ValueOperations<String, String> ops = redisTemplate.opsForValue();
        XpActivity activity = service.activiting(Long.valueOf(uid));
        XpActivityVo ret = new XpActivityVo();
        if (activity !=null) {
            List<XpActicityCoupon> cps = couponService.lambdaQuery().eq(XpActicityCoupon::getActivityId, activity.getId()).list();
            BeanUtils.copyBeanProp(ret, activity);
            Duration duration = Duration.between(LocalDateTime.now(), activity.getEndTime());
            Boolean isFirst = ops.setIfAbsent(CacheConstants.firstEnterActivity(String.valueOf(activity.getId()), uid),"1", duration);
            ret.setIsFirst(isFirst);
            ret.setCoupons(cps);
            activity.setIsFirst(isFirst);
            activity.setCoupons(cps);
        }
        return R.ok(ret);
        return R.ok(activity);
    }



 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/CustomerServiceController.java

@@ -154,7 +154,7 @@
    @GetMapping("/getOrderHistoryTrajectory/{orderId}")
    @ApiOperation(value = "根据订单号查询实际行驶路径", notes = "客服系统对接")
    @ApiImplicitParam(name = "orderId", value = "订单ID", required = true, dataType = "Long", paramType = "path")
    public R<List<TrajectoryVo>> getOrderHistoryTrajectory(@PathVariable Long orderId){
    public R<OrderHistoryTrajectoryVo> getOrderHistoryTrajectory(@PathVariable Long orderId){
        List<OrderTrajectory> orderTrajectoryList = mongoTemplate.find(Query.query(Criteria.where("orderId").is(orderId)), OrderTrajectory.class);
        List<TrajectoryVo> collect = orderTrajectoryList.stream().map(trajectory -> {
            String[] split = trajectory.getLocation().split(",");
@@ -163,7 +163,9 @@
            jsonObject.setLat(Double.parseDouble(split[1]));
            return jsonObject;
        }).collect(Collectors.toList());
        return R.ok(collect);
        OrderHistoryTrajectoryVo vo = new OrderHistoryTrajectoryVo();
        vo.setActualPath(collect);
        return R.ok(vo);
    }



 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/vo/OrderHistoryTrajectoryVo.java

New file
@@ -0,0 +1,17 @@
package com.xiaopeng.order.vo;


import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@Data
@ApiModel
public class OrderHistoryTrajectoryVo {
    @ApiModelProperty("预估行驶路径")
    private List<TrajectoryVo> estimatedPath;
    @ApiModelProperty("实际行驶路径")
    private List<TrajectoryVo> actualPath;
}

 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/vo/VehicleSeatStatus.java

New file
@@ -0,0 +1,14 @@
package com.xiaopeng.order.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel
public class VehicleSeatStatus {
    @ApiModelProperty("座椅状态")
    private String seatOccupied;
    @ApiModelProperty("安全带状态")
    private String seatbeltFastened;
}

 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/vo/VehicleSeatStatusVo.java

@@ -9,11 +9,11 @@
@ApiModel
public class VehicleSeatStatusVo {
    @ApiModelProperty("主驾")
    private String frontLeft;
    private VehicleSeatStatus frontLeft;
    @ApiModelProperty("副驾")
    private String frontRight;
    private VehicleSeatStatus frontRight;
    @ApiModelProperty("左后")
    private String rearLeft;
    private VehicleSeatStatus rearLeft;
    @ApiModelProperty("右后")
    private String rearRight;
    private VehicleSeatStatus rearRight;
}