Merge remote-tracking branch 'origin/1.0' into 1.0

yyy

2026-05-06 b59bca62353f93424818a4dd39068b10948c5267

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

@@ -8,6 +8,7 @@
import com.xiaopeng.api.feignClient.account.UserResourcesClient;
import com.xiaopeng.api.feignClient.maintenance.XpVehicleModelClient;
import com.xiaopeng.api.model.maintenance.XpVehicleModel;
import com.xiaopeng.api.model.operation.XpOfficialPartner;
import com.xiaopeng.api.model.operation.XpPricing;
import com.xiaopeng.api.model.operation.XpWhitelist;
import com.xiaopeng.api.vo.operation.RouteAndFareVo;
@@ -15,6 +16,7 @@
import com.xiaopeng.common.core.exception.ServiceException;
import com.xiaopeng.common.core.web.controller.BaseController;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.common.security.service.TokenService;
import com.xiaopeng.operation.constant.I18nKeyConstant;
import com.xiaopeng.operation.dto.*;
import com.xiaopeng.operation.query.PricingPageListQuery;
@@ -63,6 +65,9 @@

    @Resource
    private XpVehicleModelClient xpVehicleModelClient;

    @Resource
    private TokenService tokenService;

    public XpPricingController(XpPricingService xpPricingService, IXpGeoQueryEntityService xpGeoQueryEntityService, UserResourcesClient userResourcesClient, IXpWhitelistService xpWhitelistService, XpRegionService xpRegionService, XpOpenCityService xpOpenCityService, ImageTagProcessor imageTagProcessor) {
        this.xpPricingService = xpPricingService;
@@ -270,18 +275,19 @@
    }


//    /**
//     * 合作商添加计费策略 todo 现在的版本不支持手动选择车型
//     * @param vo
//     * @return
//     */
//    @PostMapping("/v1/pricing/save")
//    @ApiOperation(value = "保存计价规则", notes = "流量接入-基础信息")
//    @ApiImplicitParams({
//            @ApiImplicitParam(value = "token", name = "token", required = true, paramType = "header")
//    })
//    public R<?> save(@RequestBody PricingInfoVo vo) {
//
//        return R.ok();
//    }
    /**
     * 合作商添加计费策略
     * @param vo
     * @return
     */
    @PostMapping("/drainage/v1/pricing/save")
    @ApiOperation(value = "保存计价规则", notes = "流量接入-基础信息")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "token", name = "token", required = true, paramType = "header")
    })
    public R<?> save(@RequestBody PricingInfoVo vo) {
        XpOfficialPartner officialPartner = tokenService.getOfficialPartner();
        xpPricingService.savePrice(vo, officialPartner);
        return R.ok();
    }
}