From 8fc8c4954bb9d048b432e6a8dbe801c79ebe357b Mon Sep 17 00:00:00 2001 From: rx <auster_i@163.com> Date: 星期二, 31 十月 2023 18:11:01 +0800 Subject: [PATCH] Merge branch 'rx-1023-营销优惠券新版' into master-prod-new --- phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponQuotaConfigService.java | 22 +++++++++++ phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrganizationDeptService.java | 22 +++++++++++ phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponService.java | 14 +++++++ phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java | 29 ++++++++++++++ phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java | 7 +++ phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 2 + phis-feign/src/main/java/com/hz/his/dto/coupon/CouponDto.java | 3 + 7 files changed, 99 insertions(+), 0 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java new file mode 100644 index 0000000..6a040f6 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponAddDto.java @@ -0,0 +1,29 @@ +package com.hz.his.dto.coupon; + +import com.hz.his.dto.PageDto; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; + +/** + * 浼樻儬鍒告柊澧炲弬鏁� + */ +@Data +public class CouponAddDto extends PageDto { + /**浼樻儬鍒告爣棰� */ + private String title; + /**鐢宠绫诲瀷**/ + private Integer type; + /**鎸囧畾椤圭洰 鎴栬�� 閫氱敤椤圭洰 绫诲瀷 0=鎸囧畾 1=閫氱敤 **/ + private Integer useProjectType; + /**鎸囧畾椤圭洰 鎴栬�� 閫氱敤椤圭洰 ID,name **/ + private List<Map<String,Object>> serviceIds; + /**闂ㄥ簵ID*/ + private String shopId; + /**绱鐢宠鏁伴噺*/ + private Integer applyNum; + /**绱鐢宠閲戦*/ + private BigDecimal applyAmount; +} 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 6ff579f..2e30c02 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 @@ -56,4 +56,7 @@ private String couponTypeId; /** 鍩虹鍒嗙被-浼樻儬鍒�*/ private String type; + + /** 浼樻儬鍒窱D*/ + private List<String> couponIdList; } diff --git a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java index 34912e0..2fd860d 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/coupon/CouponSendItemDto.java @@ -25,4 +25,11 @@ private String costDeptName; /**褰掑睘鎴愭湰閮ㄩ棬鍚嶇О -闈炲繀濉� */ private String ascrCostDeptName; + + /**鍙戞斁鍘熷洜 -闈炲繀濉� 鐩稿綋浜� 淇冩垚浜� 瀹㈣瘔 鎵撴澘 绫诲瀷*/ + private String sendReason; + /**鍙戞斁闂ㄥ簵 -闈炲繀濉� */ + private String sendShopId; + /**鍙戞斁闂ㄥ簵鍚嶇О*/ + private String sendShopName; } 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 dc62742..cb942aa 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 @@ -149,4 +149,6 @@ */ @PostMapping(value = "/couponType/list") Result couponTypeList(@RequestBody(required = false) CouponTypeDto couponTypeDto); + + } diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrganizationDeptService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrganizationDeptService.java new file mode 100644 index 0000000..70e3e92 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrganizationDeptService.java @@ -0,0 +1,22 @@ +package com.hz.his.feign.service.phis; + +import com.hx.resultTool.Result; +import com.hz.his.dto.PageDto; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� + */ +@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "organization") +public interface SOrganizationDeptService { + + + /** + * 鑾峰彇缁勭粐鏋舵瀯瀛楀吀鍒楄〃 + */ + @PostMapping(value = "organization/dept/list") + Result getList(@RequestBody(required = false) PageDto pageDto); + +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponQuotaConfigService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponQuotaConfigService.java new file mode 100644 index 0000000..494a42b --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipCouponQuotaConfigService.java @@ -0,0 +1,22 @@ +package com.hz.his.feign.service.platform; + +import com.hx.resultTool.Result; +import com.hz.his.dto.coupon.CouponAddDto; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� + */ +@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-coupon-quota-config") +public interface SPhipCouponQuotaConfigService { + + /** + * 寮�鏀惧钩鍙�-鏍¢獙浼樻儬鍒告槸鍚﹀瓨鍦� 鍒涘缓鎴栬�呮洿鏂� + */ + @PostMapping(value = "/coupon/quota/config/check/apply") + Result checkQuotaApply(@RequestBody CouponAddDto couponAddDto); + + +} \ 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 d9da89b..859ef9e 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 @@ -1,6 +1,7 @@ package com.hz.his.feign.service.platform; import com.hx.resultTool.Result; +import com.hz.his.dto.coupon.CouponAddDto; import com.hz.his.dto.coupon.CouponDto; import com.hz.his.dto.coupon.CouponSendDto; import com.hz.his.dto.coupon.OrderSendCouponDto; @@ -69,4 +70,17 @@ */ @PostMapping(value = "/coupon/check/coupon/to/orderAndPay") Result checkCouponToOrderAndPay(@RequestBody CouponDto couponDto); + + /** + * 寮�鏀惧钩鍙�-鏍¢獙浼樻儬鍒告槸鍚﹀瓨鍦� 鍒涘缓鎴栬�呮洿鏂� + */ + @PostMapping(value = "/coupon/check/create") + Result couponCheckCreate(@RequestBody CouponAddDto couponAddDto); + + /** + * 寮�鏀惧钩鍙�- 鏍¢獙浼樻儬鍒稿墿浣欐暟閲� + */ + @PostMapping(value = "/coupon/check/surplus/num") + Result checkCouponSurplusNum(@RequestBody CouponDto couponDto); + } \ No newline at end of file -- Gitblit v1.8.0