From 7a774c4d798fc6c40a02045a9ea69849bb8a4695 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 13 五月 2024 10:25:52 +0800
Subject: [PATCH] Merge branch 'fhx-prod-复购活动' into master-test
---
phis-feign/src/main/java/com/hz/his/constant/ActivityPreferentialConstants.java | 16 ++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 4 ++++
2 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/constant/ActivityPreferentialConstants.java b/phis-feign/src/main/java/com/hz/his/constant/ActivityPreferentialConstants.java
index e084f5e..9a88017 100644
--- a/phis-feign/src/main/java/com/hz/his/constant/ActivityPreferentialConstants.java
+++ b/phis-feign/src/main/java/com/hz/his/constant/ActivityPreferentialConstants.java
@@ -1,5 +1,7 @@
package com.hz.his.constant;
+import com.hx.util.StringUtils;
+
/**
* 娲诲姩浼樻儬绫诲瀷
* @USER: fhx
@@ -30,4 +32,18 @@
default: return "鏈煡";
}
}
+
+ /** 妫�鏌ュ垽鏂槸鍚﹁禒閫佺被鍨� */
+ public static boolean checkGiftType(String type){
+ if(StringUtils.isEmpty(type)){
+ return false;
+ }
+
+ if(TYPE_GIFT_COUPON.equals(type)
+ || TYPE_GIFT_INTEGRAL.equals(type)
+ || TYPE_GIFT_PROJECT.equals(type)){
+ return true;
+ }
+ return false;
+ }
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
index 71f9bdb..dbdd194 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java
@@ -24,6 +24,10 @@
private BigDecimal totalPoints;
/**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100,涓嶄紶鍚庡彴榛樿100*/
private BigDecimal discount;
+ /** 浼樻儬鍒搁噾棰濓紙鍏冿級蹇呭～锛屼笉浼犲垯榛樿0 */
+ private BigDecimal couponTotal;
+ /** 浼樻儬绂忓埄鎬婚噾棰濓紙鍏冿級蹇呭～锛屼笉浼犲垯榛樿0 */
+ private BigDecimal preferentialTotal;
/**鎶垫墸鐜伴噾閲戦*/
private BigDecimal cash = BigDecimal.ZERO;
/**鎶垫墸鐜伴噾閲戦闇�瑕佹敮浠樼殑绉垎*/
--
Gitblit v1.8.0