java/Robotaxi.git

			@@ -8,9 +8,11 @@
			import com.xiaopeng.api.vo.operation.RouteAndFareVo;
			import com.xiaopeng.common.core.domain.R;
			import com.xiaopeng.common.core.web.controller.BaseController;
			import com.xiaopeng.common.redis.service.RedisService;
			import com.xiaopeng.itinerary.dto.XpOrderDto;
			import com.xiaopeng.itinerary.service.IXpGeoQueryEntityService;
			import com.xiaopeng.itinerary.service.XpPricingService;
			import com.xiaopeng.itinerary.vo.HotFixInfoVo;
			import com.xiaopeng.itinerary.vo.SaveOrderVo;
			import com.xiaopeng.unifiedverification.interceptor.XpClientCheck;
			import io.swagger.annotations.Api;
			@@ -39,11 +41,14 @@

			private final XpPricingService xpPricingService;
			private final IXpGeoQueryEntityService xpGeoQueryEntityService;
			private final RedisService redisService;


			public XpPricingController(XpPricingService xpPricingService, IXpGeoQueryEntityService xpGeoQueryEntityService) {
			public XpPricingController(XpPricingService xpPricingService, IXpGeoQueryEntityService xpGeoQueryEntityService, RedisService redisService) {
			this.xpPricingService = xpPricingService;
			this.xpGeoQueryEntityService = xpGeoQueryEntityService;
			this.redisService = redisService;

			}


			@@ -96,6 +101,25 @@
			return R.ok(saveOrderVo);
			}

			/**
			* 获取热修复信息
			* @param
			* @param
			* @return
			*/
			@GetMapping("/base/v1/mini-program/order/getHotFixInfo")
			@ApiOperation(value = "获取热修复信息", tags = {"小程序-获取热修复信息"}, response = HotFixInfoVo.class)
			public R<HotFixInfoVo> getHotFixInfo() {
			Object cacheObject = redisService.getCacheObject("HOT_FIX_INFO");
			if(cacheObject!=null){
			HotFixInfoVo hotFixInfoVo = (HotFixInfoVo) cacheObject;
			return R.ok(hotFixInfoVo);
			}
			HotFixInfoVo hotFixInfoVo = new HotFixInfoVo();
			hotFixInfoVo.setHotfixStatus(0);
			return R.ok(hotFixInfoVo);
			}



			@GetMapping("/base/v1/mini-program/order/testOrder")

New file
			@@ -0,0 +1,26 @@
			package com.xiaopeng.itinerary.vo;

			import com.fasterxml.jackson.annotation.JsonFormat;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;

			import java.time.LocalDateTime;
			import java.util.Date;

			@Data
			@ApiModel("HotFixInfoVo")
			public class HotFixInfoVo {

			@ApiModelProperty("HotFix状态0-关闭 1-开启" )
			private Integer hotfixStatus;

			@ApiModelProperty("热修复开始时间" )
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private Date hotfixStartTime;

			@ApiModelProperty("热修复结束时间" )
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private Date hotfixEndTime;

			}

			@@ -98,7 +98,7 @@
			and xefa.area_status = 1 and p.electronic_area_id is not null
			and xefa.city_code = #{query.cityCode}
			<if test="query.pointPoi != null and query.pointPoi != ''">
			and p.point_address like concat('%',#{query.pointPoi},'%')
			and ( p.point_address like concat('%',#{query.pointPoi},'%') or p.point_name like concat('%',#{query.pointPoi},'%') )
			</if>
			<if test="query.electronicAreaId != null">
			and p.electronic_area_id = #{query.electronicAreaId}

	xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/controller/XpPricingController.java	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/vo/HotFixInfoVo.java	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-operation-boot/src/main/resources/mapper/operation/XpPointMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史