From b185ead5fcf5f87c19df0abe6a32ea2c1b02eb66 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期三, 19 七月 2023 17:02:48 +0800
Subject: [PATCH] Merge branch 'fhx-prod-兑换优惠券' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java | 8 ++
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java | 4 +
phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java | 7 ++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java | 7 ++
phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDeLimitDt.java | 5 +
phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsAssocDt.java | 30 ++++++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderItemPHisDto.java | 2
phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java | 7 ++
phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java | 3 +
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 1
phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java | 11 +++
phis-feign/src/main/java/com/hz/his/dto/coupon/OrderSendCouponDto.java | 44 ++++++++++++++
12 files changed, 127 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
index 2f57aab..a79a32c 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java
@@ -24,6 +24,7 @@
private String userId;
/**娲诲姩鏍囪瘑*/
private String groupBuyId;
+ private String id;
/**鍙戦�佽褰�*/
private CouponRecordDto couponReleaseRecordItem;
/**鐢ㄦ埛璇︽儏*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java
index 8402cc6..d2c7327 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponItemDto.java
@@ -11,8 +11,17 @@
/**浼樻儬鍒告爣璇�*/
private String couponId;
-
/**鏁伴噺*/
private Integer num;
+ //澶氫紭鎯犲埜鍙戞斁鏃朵娇鐢ㄥ瓧娈�
+ /**鎵规鍙峰悕绉�*/
+ private String recordName;
+ /**鍏叡鏍囪瘑*/
+ private String commonId;
+ /**鍏叡瀛愭爣璇�*/
+ private String commonItemId;
+ /**鍏叡绫诲瀷(CouponRecordDto)*/
+ private String commonType;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
index a76c56d..82af4b1 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java
@@ -16,6 +16,8 @@
private String recordName;
/**鍏叡鏍囪瘑*/
private String commonId;
+ /**鍏叡瀛愭爣璇�*/
+ private String commonItemId;
/**鍏叡绫诲瀷*/
private String commonType;
@@ -35,4 +37,6 @@
public static final String TYPE_COMMON_QUEEN_DAY = "queen_day";
/**鍏叡鏍囪瘑绫诲瀷,crm鍟嗗搧璇︽儏棰嗗彇浼樻儬鍒�*/
public static final String TYPE_COMMON_GOODS_DETAILS = "goods_details";
+ /**鍏叡鏍囪瘑绫诲瀷,璁㈠崟璐拱浼樻儬鍒�*/
+ public static final String TYPE_COMMON_ORDER = "order";
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/OrderSendCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/OrderSendCouponDto.java
new file mode 100644
index 0000000..8c33864
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/OrderSendCouponDto.java
@@ -0,0 +1,44 @@
+package com.hz.his.dto.coupon;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 璁㈠崟鍙戞斁浼樻儬鍒竏to
+ * @USER: fhx
+ * @DATE: 2023/6/27
+ **/
+@Data
+public class OrderSendCouponDto {
+
+ /**鐢ㄦ埛淇℃伅*/
+ UserArrDto userArrDto;
+
+ /** 浼樻儬鍒镐俊鎭垪琛� */
+ private List<CouponItemDto> itemDtoList;
+
+ /**鏉ユ簮缂栫爜,鍟嗘埛鑷畾涔夋湇鍔℃潵婧愭爣璇�*/
+ private String appIdCode;
+ /**鎿嶄綔浜烘爣璇�*/
+ private String operatorId;
+ /**鎿嶄綔浜哄悕绉�*/
+ private String operatorName;
+ /**鎿嶄綔浜虹被鍨�*/
+ private Integer operatorType;
+
+
+ //--------------------------------------------------------------------
+ //瀵瑰簲phis琛–ouponReleaseRecord甯搁噺
+ /**鎿嶄綔浜虹被鍨�-鍛樺伐*/
+ public static Integer OPERATOR_TYPE_EMPLOYEES = 0;
+ /**鎿嶄綔浜虹被鍨�-绠＄悊鍛�*/
+ public static Integer OPERATOR_TYPE_ADMIN = 1;
+ /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛鑷*/
+ public static Integer OPERATOR_TYPE_USER = 2;
+ /**鎿嶄綔浜虹被鍨�-绯荤粺*/
+ public static Integer OPERATOR_TYPE_SYSTEM = 3;
+ /**鎿嶄綔浜虹被鍨�-鐢ㄦ埛璁㈠崟璐拱*/
+ public static Integer OPERATOR_TYPE_USER_ORDER = 4;
+
+}
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 caca455..2992a9f 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
@@ -20,6 +20,8 @@
private BigDecimal total;
/**蹇呭～ 瀛愬崟鎬荤Н鍒嗭紝瀹炰粯绉垎(鏆傛椂鐢ㄤ笉涓�)*/
private BigDecimal totalIntegral;
+ /**闈炲繀濉� 瀛愬崟鎬荤Н鍒嗭紝寮�鍗曟椂搴斾粯鎬荤Н鍒�(CRM绉垎璁㈠崟鏃跺繀濉�)*/
+ private BigDecimal totalPoints;
/**闈炲繀濉� 鎶樻墸(鍗曚綅:鐧惧垎姣�) 蹇呭～锛岄粯璁�100,涓嶄紶鍚庡彴榛樿100*/
private BigDecimal discount;
/**蹇呭～ 璐拱鏁伴噺 蹇呭～锛岄粯璁�0*/
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
index 3590a52..60a9bc3 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java
@@ -65,6 +65,9 @@
/**蹇呭～ 璁㈠崟鎬婚噾棰�(璁㈠崟绫诲瀷鏄厖鍊艰鍗曞繀濉�,鍚﹀垯闈炲繀濉�) */
private BigDecimal total;
+ /**闈炲繀濉� 璁㈠崟鎬荤Н鍒�(璁㈠崟绫诲瀷鏄Н鍒嗚鍗曞繀濉�,鍚﹀垯闈炲繀濉�) */
+ private BigDecimal totalPoints;
+
/**闈炲繀濉� 璁㈠崟鍏朵粬淇℃伅(娌℃湁鍚庡彴榛樿)*/
private OrderInfoDto orderInfo;
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
index 4e5fccc..a92147a 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java
@@ -22,4 +22,12 @@
private String cardEquityId;
/**闈炲繀濉� 鍗″寘鏍囪瘑:鍗￠」鏀粯蹇呬紶*/
private String userCardId;
+
+ /**
+ * 鏍囪瀛楁锛岄粯璁�0
+ * 鏀粯鏂瑰紡涓虹Н鍒嗘椂锛�
+ * isDel=100锛屽垯phis杩欒竟闇�瑕佹墸鍑忕敤鎴风Н鍒�
+ * isDel=101锛屽垯phis杩欒竟涓嶉渶瑕佹墸鍑忕敤鎴风Н鍒�
+ */
+ private Integer isDel = 0;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java
index d745c62..57fef07 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SConsumablesService.java
@@ -35,4 +35,11 @@
*/
@PostMapping(value = "/consumables/update/list")
Result getUpdateConsumables(@RequestBody ConsumablesDto consumablesDto);
+
+ /**
+ * 鑾峰彇浼樻儬鍒稿晢鍝佸垪琛�
+ * @return Result
+ */
+ @PostMapping(value = "/consumables/coupon/list")
+ Result getConsumablesCouponList(@RequestBody PageDto pageDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
index edd3c19..2c16814 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.coupon.CouponDto;
+import com.hz.his.dto.coupon.OrderSendCouponDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -49,4 +50,10 @@
*/
@PostMapping(value = "/coupon/check/coupon")
Result checkCoupon(@RequestBody CouponDto couponDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-璁㈠崟鍙戞斁浼樻儬鍒�
+ */
+ @PostMapping(value = "/coupon/order/send/coupon")
+ Result orderSendCoupon(@RequestBody OrderSendCouponDto couponDto);
}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsAssocDt.java b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsAssocDt.java
new file mode 100644
index 0000000..c980f9c
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsAssocDt.java
@@ -0,0 +1,30 @@
+package com.hz.phis.dt.consumables;
+
+import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
+import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
+import lombok.Data;
+
+/**
+ * 鍟嗗搧鍏宠仈缁勫悎
+ * @USER: fhx
+ * @DATE: 2023/7/12
+ **/
+@Data
+public class GoodsAssocDt {
+
+ /** 鑰楁潗琛ㄦ爣璇�(Consumables) */
+ private String consumableId;
+ /** 鍏宠仈绫诲瀷 */
+ public String commonType;
+ /** 鍏宠仈鏍囪瘑(浼樻儬鍒竔d) */
+ public String commonId;
+ /** 鍏宠仈鍚嶇О */
+ public String commonName;
+ /** 鏁伴噺 */
+ public Integer quantity;
+
+
+ //////////////////////////////////
+ /** 鍏宠仈绫诲瀷 - 浼樻儬鍒� */
+ public static final String COMMON_TYPE_COUPON = "coupon";
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDeLimitDt.java b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDeLimitDt.java
index 8284598..66d5616 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDeLimitDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDeLimitDt.java
@@ -3,6 +3,8 @@
import com.hz.phis.dt.limit.LimitDt;
import lombok.Data;
+import java.util.List;
+
/**
* 鍟嗗搧璇︽儏闄愬埗瀹炰綋
* @author fwq
@@ -14,4 +16,7 @@
private GoodsDetailDt consumables;
/**闄愬埗淇℃伅*/
private LimitDt limitBo;
+ /** 鍟嗗搧鍏宠仈淇℃伅 */
+ private List<GoodsAssocDt> assocList;
+
}
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java
index b92d257..a08b8de 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/consumables/GoodsDetailDt.java
@@ -12,7 +12,7 @@
* */
@Data
public class GoodsDetailDt extends BaseDt {
- /**绫诲瀷(1鍟嗗搧2鑽搧)*/
+ /**绫诲瀷(1鍟嗗搧2鑽搧3浼樻儬鍒�)*/
private Integer type;
/**缂栧彿*/
private String serialNumber;
@@ -172,4 +172,9 @@
private String bigTypeCode;
/**鑽搧澶х被鍚�*/
private String bigTypeName;
+
+ //鍏宠仈鏍囪瘑(绫诲瀷涓�3鍒欏叧鑱斾紭鎯犲埜id)
+ public String commonId;
+ //鍏戞崲绉垎
+ private BigDecimal integral;
}
--
Gitblit v1.8.0