From 70e0e8669c318161b91bfab891d7fac2e2c8eb0e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 24 四月 2026 22:35:57 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpAppUserCouponServiceImpl.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpAppUserCouponServiceImpl.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpAppUserCouponServiceImpl.java
index c62d152..bf21d89 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpAppUserCouponServiceImpl.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpAppUserCouponServiceImpl.java
@@ -22,7 +22,9 @@
import com.xiaopeng.api.dto.account.UcUserInfo;
import com.xiaopeng.api.dto.account.UseUserCouponDto;
import com.xiaopeng.api.enums.NavigationCouponBubbleType;
+import com.xiaopeng.api.feignClient.operation.XpActicityClient;
import com.xiaopeng.api.feignClient.pushMessage.SubscribeMessageClient;
+import com.xiaopeng.api.model.operation.XpActicityStrategy;
import com.xiaopeng.api.query.account.XpAppUserCouponPageListQuery;
import com.xiaopeng.api.vo.account.NavigationCouponItemVo;
import com.xiaopeng.api.vo.account.NavigationCouponPickerVo;
@@ -73,6 +75,9 @@
private UserResourcesClient userResourcesClient;
@Resource
private SubscribeMessageClient subscribeMessageClient;
+
+ @Resource
+ private XpActicityClient xpActicityClient;
@Override
@@ -526,6 +531,8 @@
if(null == data){
continue;
}
+ XpActicityStrategy acticityStrategy = xpActicityClient.getXpActicityStrategy(xpAppUserCoupon.getActivityId(), data.getId()).getData();
+
CouponVo vo = new CouponVo();
vo.setId(xpAppUserCoupon.getId());
vo.setConditionalAmount(data.getConditionalAmount());
@@ -534,6 +541,19 @@
vo.setCouponName(data.getCouponName());
vo.setCouponDesc(data.getCouponDescription());
vo.setEndTime(xpAppUserCoupon.getExpirationTime().toString());
+ vo.setUnavailable("");
+ vo.setStackable("");
+ Integer effectiveRules = acticityStrategy.getEffectiveRules();
+ if(1 == effectiveRules){
+ vo.setEffectAndInvalid("");
+ }
+ if(2 == effectiveRules){
+
+ }
+ if(3 == effectiveRules){
+
+ }
+
if(orderMoney.compareTo(data.getConditionalAmount()) >= 0){
usableCouponList.add(vo);
}else{
--
Gitblit v1.7.1