From 648eb72de16da108373a2e74b42de25f6c3120a6 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 10 五月 2024 18:04:11 +0800
Subject: [PATCH] Merge branch 'fhx-prod-复购活动' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPreferentialDto.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 2 ++
2 files changed, 58 insertions(+), 0 deletions(-)
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 9ed4794..71f9bdb 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
@@ -59,4 +59,6 @@
/** 璇夋眰鍒嗙被idList */
private List<String> appealTypeIdList;
+ /** 瀛愬崟浼樻儬绂忓埄鏁版嵁 */
+ private List<OrderItemPreferentialDto> orderItemPreferentialList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPreferentialDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPreferentialDto.java
new file mode 100644
index 0000000..5fabdb9
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPreferentialDto.java
@@ -0,0 +1,56 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 璁㈠崟瀛愬崟鍟嗗搧鍏宠仈鐨勪紭鎯犳椿鍔�
+ * @USER: fhx
+ * @DATE: 2024/5/8
+ **/
+@Data
+public class OrderItemPreferentialDto {
+
+ /** 璁㈠崟id锛圤rdersTotal锛� */
+ private String orderId;
+ /** 涓�绾у瓙璁㈠崟id锛圤rderItem锛� */
+ private String orderItemId;
+
+ /** 浼樻儬娲诲姩鍚嶇О */
+ private String name;
+ /** 鏉ユ簮绫诲瀷 */
+ private String sourceType;
+ /** 鏉ユ簮鏍囪瘑 */
+ private String sourceId;
+
+ /** 杈呭姪瀛楁1 */
+ private String common1Id;
+ /** 杈呭姪瀛楁2 */
+ private String common2Id;
+ /** 杈呭姪鏁板�� */
+ private Integer commonNum;
+
+ /** 娲诲姩绫诲瀷(ActivityPreferentialConstants) */
+ private String type;
+
+ /** 浼樻儬鏁板�� */
+ private BigDecimal valNum;
+ /** 璧犻�佷紭鎯爅son */
+ private String giftJson;
+
+ /** 浼樻儬璁＄畻鎺掑簭 */
+ private Integer sortNum;
+ /** 浼樻儬鍓嶄环鏍� */
+ private BigDecimal beforePrice = BigDecimal.ZERO;
+ /** 浼樻儬鍚庝环鏍� */
+ private BigDecimal afterPrice = BigDecimal.ZERO;
+ /** 浼樻儬浠锋牸(浼樻儬鍓�-浼樻儬鍚�) */
+ private BigDecimal preferentialPrice = BigDecimal.ZERO;
+
+
+ ////////////////////////////////////////////////////////////////////////////////////////////
+
+ public OrderItemPreferentialDto() {
+ }
+}
--
Gitblit v1.8.0