Merge remote-tracking branch 'origin/master'

“mitao”

2026-02-14 4a9eaadf474c1d9e27b87ff3abac513bc10b20ef

Merge remote-tracking branch 'origin/master'

 xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserController.java

@@ -9,9 +9,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.ArrayList;
@@ -59,4 +57,16 @@
        }
        return R.ok(xpAppUserService.listByIds(ids));
    }

    /**
     * 根据ID查询用户信息
     *
     * @param id 用户ID
     * @return 用户信息
     */
    @GetMapping("/inner/appUser/queryOperationsUserById")
    public R<XpAppUser> queryOperationsUserById(@RequestParam Long id){
        XpAppUser xpAppUser = xpAppUserService.getById(id);
        return R.ok(xpAppUser);
    }
}

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/operation/XpPricingClientFallbackFactory.java

@@ -28,7 +28,7 @@
            }

            @Override
            public R<XpPricing> getPricingByCityId(Long cityId) {
            public R<XpPricing> getPricingByCid(Long cityId) {
                log.error("根据开通城市获取定价失败", cause);
                return R.ok(null);
            }

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/operation/XpPricingClient.java

@@ -21,8 +21,8 @@
    R<Integer> getWaitTime(@RequestBody LonLatDto dto);

    // 根据开通城市 获取定价
    @GetMapping("/base/v1/mini-program/getPricingByCityId/{cityId}")
     R<XpPricing> getPricingByCityId(@PathVariable("cityId")Long cityId);
    @GetMapping("/base/v1/mini-program/getPricingByCid")
     R<XpPricing> getPricingByCid(@RequestParam Long cityId);

    /**
     * 保存XpGeoQueryEntity

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java

@@ -35,7 +35,7 @@
     * 查询是否有未支付订单 或 正在进行的订单
     */
    @PostMapping("/inner/order/has-unpaid-order")
    R<Long> hasUnPaodOrder(String uid);
    R<Long> hasUnPaodOrder(@RequestParam String uid);


    /**

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/config/MyLocaleResolver.java

@@ -23,6 +23,7 @@
        Locale locale = null;
        if (StringUtils.isEmpty(language)) {
            locale = Locale.getDefault();
            language = "1";
        }
        //如果请求不为空 
        //If the request is not empty.

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

New file
@@ -0,0 +1,46 @@
package com.xiaopeng.operation.controller;


import com.xiaopeng.common.core.domain.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;

/**
 * <p>
 * 任务申诉 前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2025-05-28
 */
@Api(tags = "阿里云文件上传")
@RestController
@RequestMapping("/base/v1/oss")
public class OssController {

    @PostMapping("/upload")
    @ApiOperation(value = "文件上传",tags = "文件上传")
    public R<String> uploadOSS(@RequestPart("file") MultipartFile file) {
        try {
//            // 上传并返回访问地址
//            String fileName = file.getOriginalFilename();
//            String prefix = fileName.substring(fileName.lastIndexOf("."));
//            long fileSize = file.getSize();
//            String url = OssUploadUtil.ossUpload(file);
            return R.ok("https://we-park-life.oss-cn-beijing.aliyuncs.com/img/K4vqtLmVc6.png");
        } catch (Exception e) {
            System.err.println("上传文件失败"+e);
            return R.fail(e.getMessage());
        }
    }

}


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

@@ -65,11 +65,17 @@
    }

    // 根据开通城市 获取定价
    @GetMapping("/getPricingByCityId/{cityId}")
    @GetMapping("/base/v1/mini-program/getPricingByCityId/{cityId}")
    public R<XpPricing> getPricingByCityId(@PathVariable("cityId") Long cityId) {
        XpPricing pricing = xpPricingService.lambdaQuery().eq(XpPricing::getCityId, cityId).last("limit 1").one();
        return R.ok(pricing);
    }
    // 根据开通城市 获取定价
    @GetMapping("/base/v1/mini-program/getPricingByCid")
    public R<XpPricing> getPricingByCid(@RequestParam Long cityId) {
        XpPricing pricing = xpPricingService.lambdaQuery().eq(XpPricing::getCityId, cityId).last("limit 1").one();
        return R.ok(pricing);
    }


    @GetMapping("/base/v1/mini-program/pricing/rules/{openCityId}")

 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java

@@ -956,7 +956,7 @@
            userVehicleClient.cancelTaxiPassenger(cancelTaxiPassengerVo);
        }
        // 根据订单所属开通城市id 查询定价
        R<XpPricing> pricingByCityId = xpPricingClient.getPricingByCityId(order.getCityId());
        R<XpPricing> pricingByCityId = xpPricingClient.getPricingByCid(order.getCityId());
        XpPricing pricing = pricingByCityId.getData();
        if (pricing == null) {
            throw new ServiceException("当前城市未配置定价规则", I18nKeyConstant.ORDER_PRICING_NOT_EXISTS);