From 1f958e1435689b008e04f9d3c6d5133d0c3a9b8c Mon Sep 17 00:00:00 2001 From: fhx <308050795@qq.com> Date: 星期一, 07 八月 2023 15:31:43 +0800 Subject: [PATCH] Merge branch 'fhx-prod-热门活动' into master-prod-new --- phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java | 67 +++++++++++++++++++++++++++++++++ phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java | 29 ++++++++++++++ 2 files changed, 96 insertions(+), 0 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java new file mode 100644 index 0000000..e32e640 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java @@ -0,0 +1,67 @@ +package com.hz.his.dto.marketing; + +import com.hz.his.dto.PageDto; +import lombok.Data; + +/** + * 钀ラ攢娲诲姩 + * @USER: fhx + * @DATE: 2023/7/3 + **/ +@Data +public class MarketActivityDto extends PageDto { + + /** 鍒嗙被id */ + private String classifyId; + /** 鐘舵��:0鏈紑濮�1杩涜涓�2宸茬粨鏉� */ + private Integer status; + /** 寮�濮嬫椂闂� */ + private String startTime; + /** 缁撴潫鏃堕棿 */ + private String endTime; + /** 鏄惁鍏宠仈浼樻儬鍒� */ + private Integer isCoupon; + /** 鏄惁鍏宠仈椤圭洰 */ + private Integer isProject; + /** 鏄惁鍚屾鑹捐姱浼� */ + private Integer isSyncCrm; + /** 鏄惁涓婁笅鏋� */ + private Integer isUp; + + /** 浼氬憳绛夌骇 */ + private String userLevel; + /** 闂ㄥ簵id/鎵�灞為棬搴梚d */ + private String shopId; + /** 鏄惁鏄鍙栦紭鎯犲埜 */ + private Integer isReceiveCoupon; + /** 鏄惁鏄娇鐢ㄤ紭鎯犲埜 */ + private Integer isUseCoupon; + /** 鏄惁娑堣垂 */ + private Integer isConsume; + + + //------------------- + /** 澶氶棬搴梚d锛堥�楀彿鍒嗗壊锛� */ + private String shopIds; + /** 鐢ㄦ埛id */ + private String userId; + /** 鍒拌璁㈠崟id */ + private String visitOrderId; + /** 钀ラ攢娲诲姩id */ + private String marketActivityId; + /** 钀ラ攢娲诲姩鍏宠仈浼樻儬鍒竔d */ + private String activityCouponId; + + /** 骞冲彴绫诲瀷(PlatformConstants) */ + private String platformType; + /** 鎿嶄綔浜烘爣璇� */ + private String opId; + /** 鎿嶄綔浜哄悕绉� */ + private String opName; + /** 鎿嶄綔浜虹被鍨�(OperatorConstants) */ + private Integer opType; + /** 鎿嶄綔浜鸿鑹瞚d(EmployeeRole) */ + private String opRoleId; + + +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java new file mode 100644 index 0000000..809ec04 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java @@ -0,0 +1,29 @@ +package com.hz.his.feign.service.platform; + +import com.hx.resultTool.Result; +import com.hz.his.dto.marketing.MarketActivityDto; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 钀ラ攢娲诲姩service + * @USER: fhx + * @DATE: 2023/8/2 + **/ +@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-market-activity") +public interface SPhipMarketActivityService { + + /** 鍒楄〃 */ + @PostMapping(value = "/market/activity/list") + Result list(@RequestBody MarketActivityDto dto); + + /** 璇︽儏 */ + @PostMapping(value = "/market/activity/detail") + Result detail(@RequestBody MarketActivityDto dto); + + /** 棰嗗彇浼樻儬鍒� */ + @PostMapping(value = "/market/activity/receiveCoupon") + Result receiveCoupon(@RequestBody MarketActivityDto dto); + +} -- Gitblit v1.8.0