xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/model/vo/XpAppUserCouponListVo.java
@@ -24,6 +24,10 @@ @ApiModelProperty(value = "用户id 根据手机号获取") private Long appUserId; @ApiModelProperty(value = "优惠券类型 1-满减 2-折扣 3-抹零") private Integer couponType; @ApiModelProperty("条件金额") private BigDecimal conditionAmount;
@@ -41,6 +41,7 @@ use_time as useTime, create_time as createTime, expiration_time as expireTime, coupon_type as couponType, case when status = 1 and now() >= expiration_time then 3 -- 包含等于的情况 when status = 1 and expiration_time > now() then 1 xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/service/impl/XpCruiseCheckInRuleServiceImpl.java
@@ -72,7 +72,7 @@ @Override public AppXpCruiseCheckInRuleVo getMyXpCruiseCheckInRule(Long uid) { List<XpCruiseCheckInRule> list = this.list(new LambdaQueryWrapper<XpCruiseCheckInRule>().eq(XpCruiseCheckInRule::getDeleted, 0) .eq(XpCruiseCheckInRule::getOperationsUserId, uid).last(" and (now() BETWEEN start_time and end_time or cyclic_mode = 1)")); .apply("find_in_set({0}, operations_user_id)", uid).last(" and (now() BETWEEN start_time and end_time or cyclic_mode = 1)")); if(list.isEmpty()){ return null; } @@ -147,7 +147,7 @@ public Long saveCruiseCheckInRecord(XpCruiseCheckInRecord dto) { Long checkLocationId = dto.getCheckLocationId(); List<XpCruiseCheckInRule> list = this.list(new LambdaQueryWrapper<XpCruiseCheckInRule>().eq(XpCruiseCheckInRule::getDeleted, 0) .eq(XpCruiseCheckInRule::getOperationsUserId, dto.getOperationsUserId()).last(" and (now() BETWEEN start_time and end_time or cyclic_mode = 1)")); .apply("find_in_set({0}, operations_user_id)", dto.getOperationsUserId()).last(" and (now() BETWEEN start_time and end_time or cyclic_mode = 1)")); if(list.isEmpty()){ return null; } @@ -294,10 +294,10 @@ long count = xpCruiseCheckInRuleLocationService.count(new LambdaQueryWrapper<XpCruiseCheckInRuleLocation>() .eq(XpCruiseCheckInRuleLocation::getCruiseCheckInRuleId, cruiseCheckInRuleListPage.getId())); cruiseCheckInRuleListPage.setPointNum(count); XpOperationsUser xpOperationsUser = xpOperationsUserClient.queryById(cruiseCheckInRuleListPage.getOperationsUserId()).getData(); cruiseCheckInRuleListPage.setUserName(xpOperationsUser.getNickName()); cruiseCheckInRuleListPage.setPhone(xpOperationsUser.getPhoneNumber()); cruiseCheckInRuleListPage.setRoleName(xpOperationsUser.getRoleName()); List<XpOperationsUser> xpOperationsUser = xpOperationsUserClient.queryByIds(cruiseCheckInRuleListPage.getOperationsUserId()).getData(); cruiseCheckInRuleListPage.setUserName(xpOperationsUser.stream().map(XpOperationsUser::getNickName).collect(Collectors.toList())); cruiseCheckInRuleListPage.setPhone(xpOperationsUser.stream().map(XpOperationsUser::getPhoneNumber).collect(Collectors.toList())); cruiseCheckInRuleListPage.setRoleName(xpOperationsUser.stream().map(XpOperationsUser::getRoleName).collect(Collectors.toList())); } return xpCruiseCheckInRuleListPage; } xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/vo/XpCruiseCheckInRuleListPage.java
@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @Data @ApiModel public class XpCruiseCheckInRuleListPage { @@ -14,11 +16,11 @@ @ApiModelProperty("关联点位数量") private Long pointNum; @ApiModelProperty("执行人员") private String userName; private List<String> userName; @ApiModelProperty("手机号") private String phone; private List<String> phone; @ApiModelProperty("人员角色") private String roleName; private List<String> roleName; private Long operationsUserId; private String operationsUserId; } xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
@@ -16,8 +16,6 @@ import com.xiaopeng.api.dto.statistics.StatisticsQueryDTO; import com.xiaopeng.api.dto.vehicleConvoy.BaseVehicleUserDto; import com.xiaopeng.api.dto.vehicleConvoy.BleInfoResponseDto; import com.xiaopeng.api.feignClient.account.SysGroupMenuClient; import com.xiaopeng.api.feignClient.frdXfipEvent.XpFrdXfipEventClient; import com.xiaopeng.api.feignClient.operation.XpSystemSettingClient; import com.xiaopeng.api.feignClient.operation.XpWhiteListClient; import com.xiaopeng.api.feignClient.vehicleConvoy.BluetoothUnlockClient; @@ -51,12 +49,6 @@ import com.xiaopeng.order.config.BluetoothDebugConfig; import com.xiaopeng.order.dto.OrderNavigationDto; import com.xiaopeng.order.model.dto.*; import com.xiaopeng.api.model.order.OrderTrajectory; import com.xiaopeng.order.mangodb.service.OrderTrajectoryService; import com.xiaopeng.order.model.dto.XpOrderCommentDto; import com.xiaopeng.order.model.dto.XpOrderOperateDTO; import com.xiaopeng.order.model.dto.XpOrderPayDto; import com.xiaopeng.order.model.dto.XpOrderReassignDTO; import com.xiaopeng.order.model.exportExcel.XpOrderExportExcel; import com.xiaopeng.order.model.query.XpHistoryOrderListQuery; import com.xiaopeng.order.model.query.XpOrderExcelQuery; @@ -178,7 +170,7 @@ */ @PostMapping("/logan/inner/order/has-unpay-order") @ApiOperation(value = "查询是否有未支付订单", tags = {"内部接口"}) public R<Long> hasUnPayOrder(String uid) { public R<Long> hasUnPayOrder1(String uid) { XpOrder order = xpOrderService.getOne(new LambdaQueryWrapper<XpOrder>() .eq(XpOrder::getAppUserId, Long.parseLong(uid)) .eq(XpOrder::getStatus, 8) xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -5211,7 +5211,6 @@ itinerary.setStartPoint(xpOrder.getStartAddress()); itinerary.setEndPoint(xpOrder.getEndAddress()); itinerary.setMileage(xpOrder.getMileageKilometers()!=null ? xpOrder.getMileageKilometers().toString() :"0"); itinerary.setAmount(xpOrder.getOrderMoney()); xpInvoiceVo.setItinerary(itinerary); xpInvoiceVoList.add(xpInvoiceVo);
