From ad4edbbf6ad2f20df3c21e60798ea649a47289ff Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 08 八月 2023 16:47:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test

---
 phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayResponeVo.java                         |    2 
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponRecordDto.java                                 |    2 +
 phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java                          |    2 +
 phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SConsumeNotifyRefundService.java |    1 
 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java                                           |    6 +--
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java                            |    4 ++
 phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPaymentService.java             |    7 +--
 phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoVo.java                                        |    2 
 phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java               |    2 
 phis-feign/src/main/java/com/hz/phis/dt/user/UserDrawDt.java                                        |   49 ++++++++++++++++++++++++
 phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayVo.java                                |    2 
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java                          |    7 +++
 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java                                       |    5 ++
 13 files changed, 78 insertions(+), 13 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 fdb98a9..260182b 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
@@ -51,4 +51,9 @@
 
     /** 鏄惁鏄惀閿�鍔╂墜鐢宠 0=鍚� 1=鏄�*/
     private Integer isMarketApply = 0;
+
+    /** 浼樻儬鍒稿垎绫籌D*/
+    private String couponTypeId;
+    /** 鍩虹鍒嗙被-浼樻儬鍒�*/
+    private String type;
 }
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 82af4b1..edd4d5c 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
@@ -39,4 +39,6 @@
     public static final String TYPE_COMMON_GOODS_DETAILS = "goods_details";
     /**鍏叡鏍囪瘑绫诲瀷,璁㈠崟璐拱浼樻儬鍒�*/
     public static final String TYPE_COMMON_ORDER = "order";
+    /**鍏叡鏍囪瘑绫诲瀷,鎶藉娲诲姩*/
+    public static final String TYPE_COMMON_DRAW = "draw";
 }
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
index 3768939..00da1d8 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java
@@ -1,7 +1,5 @@
 package com.hz.his.dto.user;
 
-import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
-import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
 import com.hz.his.dto.PageDto;
 import lombok.Data;
 
@@ -39,9 +37,9 @@
     private Integer isHaveShop;
     /**鏄惁鏈夐【闂�*/
     private Integer isHaveCorp;
-
+    /**寮�濮嬫椂闂�*/
     private Date startTime;
-
+    /**缁撴潫鏃堕棿*/
     private Date endTime;
 
 }
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
index 5ec403f..a1a41fb 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/money/UserMoneyUpdateDto.java
@@ -99,4 +99,6 @@
     public static final String OPERATION_REASON_GIFT_0701 = "bringNewUserGift_0701";
     /**鎿嶄綔鏂瑰紡-娲诲姩鍙備笌*/
     public static final String OPERATION_REASON_ACTIVITY_JOIN = "activity_join";
+    /**鎿嶄綔鏂瑰紡-钀ラ攢鍔╂墜绉垎鍏戞崲浼樻儬鍒�*/
+    public static final String OPERATION_REASON_EXCHANGE_COUPON_USE_INTEGRAL = "exchange_coupon_use_integral";
 }
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
index ee1befb..656629c 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
@@ -130,4 +130,11 @@
      */
     @PostMapping(value = "/coupon/user/goods")
     Result findUserGoodsCoupon(@RequestBody(required = false) GoodsUsedCouponDto dto);
+
+    /**
+     * 鏌ヨ浼樻儬鍒稿垎绫�
+     */
+    @PostMapping(value = "/coupon/type/list")
+    Result getCouponTypeList(@RequestBody(required = false) CouponDto dto);
+
 }
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index 6309cc7..77ac4ed 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -340,4 +340,8 @@
      * */
     @PostMapping(value = "/user/query/oldNewPerformance")
     Result queryOldNewPerformance(@RequestBody UserDto userDto);
+
+
+    @PostMapping(value = "/user/draw/list")
+    Result drawGetUserDt(@RequestBody UserDto userDto);
 }
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SConsumeNotifyRefundService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SConsumeNotifyRefundService.java
index 1f00177..82eee24 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SConsumeNotifyRefundService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SConsumeNotifyRefundService.java
@@ -2,7 +2,6 @@
 
 import com.hx.resultTool.Result;
 import com.hz.his.vo.order.refund.qr.RefundQrVo;
-import com.hz.his.vo.payment.PayNoVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java
index d02644e..3eea9ae 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPayNoService.java
@@ -1,7 +1,7 @@
 package com.hz.his.feign.service.platform.payment;
 
 import com.hx.resultTool.Result;
-import com.hz.his.vo.payment.PayNoVo;
+import com.hz.phis.vo.payment.PayNoVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/PaymentService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPaymentService.java
similarity index 78%
rename from phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/PaymentService.java
rename to phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPaymentService.java
index 8fc78f9..fbff360 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/PaymentService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/payment/SPaymentService.java
@@ -1,8 +1,7 @@
 package com.hz.his.feign.service.platform.payment;
 
 import com.hx.resultTool.Result;
-import com.hz.his.vo.payment.PayNoVo;
-import com.hz.phis.vo.payment.qr.OrderQrVo;
+import com.hz.phis.vo.payment.qr.OrderQrPayVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -11,13 +10,13 @@
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
 @FeignClient(name="phi-platform-service",path = "/phip",contextId = "payment-qr")
-public interface PaymentService {
+public interface SPaymentService {
 
     /**
      * 鑾峰彇鏀粯缂栧彿锛屽彧杩斿洖鏀粯缂栧彿
      * data杞寲瀵硅薄OrderQrResponeVo
      */
     @PostMapping(value = "/payment/order/qr")
-    Result orderQrPay(@RequestBody OrderQrVo orderQrVo);
+    Result orderQrPay(@RequestBody OrderQrPayVo orderQrPayVo);
 
 }
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDrawDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDrawDt.java
new file mode 100644
index 0000000..37a7442
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDrawDt.java
@@ -0,0 +1,49 @@
+package com.hz.phis.dt.user;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**鎶藉-鐢ㄦ埛璇︽儏鏁版嵁杩斿洖瀹炰綋*/
+@Data
+public class UserDrawDt {
+    /**鏄惁鍛樺伐:0鍚�1鏄�*/
+    private Integer isEmployee;
+    /**鏍囪瘑*/
+    private String id;
+    private String crmId;
+    /**ciq浼氬憳鍙�*/
+    private String ciq;
+    /**鍚嶇О*/
+    private String name;
+    /**鎵嬫満鍙�*/
+    private String tel;
+    /**鐢熸棩yyyy-MM-dd*/
+    private String birthDay;
+    /**娉ㄥ唽鏃堕棿*/
+    private Date regTime;
+    /**鐢ㄦ埛浼氬憳鍚嶇О*/
+    private String userLevel;
+    /**鐢ㄦ埛浼氬憳绛夌骇缂栫爜*/
+    private String hisNo;
+    /**鐢ㄦ埛浼氬憳绛夌骇id*/
+    private String memberLevelId;
+    /**鐢ㄦ埛浼氬憳绛夌骇鍚嶇О*/
+    private String memberName;
+
+    /**鏉ユ簮id,椤剁骇*/
+    private String channelId;
+    /**鏉ユ簮,椤剁骇*/
+    private String channelType;
+    /**浜岀骇鏉ユ簮id,鏈骇*/
+    private String channel2Id;
+    /**浜岀骇鏉ユ簮,鏈骇*/
+    private String channelType2;
+    /**鎵�灞為棬搴�*/
+    private String shopId;
+    /**鎵�灞為棬搴楀悕绉�*/
+    private String shopName;
+    /**鎬у埆*/
+    private Integer gender;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java b/phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoVo.java
similarity index 95%
rename from phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java
rename to phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoVo.java
index 7476c03..28020a4 100644
--- a/phis-feign/src/main/java/com/hz/his/vo/payment/PayNoVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/payment/PayNoVo.java
@@ -1,4 +1,4 @@
-package com.hz.his.vo.payment;
+package com.hz.phis.vo.payment;
 
 import lombok.Data;
 
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrResponeVo.java b/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayResponeVo.java
similarity index 93%
rename from phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrResponeVo.java
rename to phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayResponeVo.java
index 85c4cc2..1f7ef58 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrResponeVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayResponeVo.java
@@ -7,7 +7,7 @@
  * @author CJH
  */
 @Data
-public class OrderQrResponeVo {
+public class OrderQrPayResponeVo {
 
     /**鍟嗘埛鍙�-Y-32锛堝晢鎴峰湪鎷涜瀹屾垚鍟嗘埛杩涗欢鍚庡垎閰嶇殑鎷涜鍟嗘埛鍙凤級*/
     private String merId;
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrVo.java b/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayVo.java
similarity index 97%
rename from phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrVo.java
rename to phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayVo.java
index e58b107..6b98361 100644
--- a/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrVo.java
+++ b/phis-feign/src/main/java/com/hz/phis/vo/payment/qr/OrderQrPayVo.java
@@ -8,7 +8,7 @@
  * @author CJH
  */
 @Data
-public class OrderQrVo {
+public class OrderQrPayVo {
 
     /**N-32-绗笁鏂瑰晢鎴峰彿锛屾病鏈夋寚瀹氬彲涓嶄紶*/
     private String merId;

--
Gitblit v1.8.0