From 764dbc21c817e7d054696270a90c9c06d3b78875 Mon Sep 17 00:00:00 2001 From: zhouxiang <zhouxiang> Date: 星期二, 08 十一月 2022 17:00:54 +0800 Subject: [PATCH] Merge branch 'master-prod-new' of http://1.15.4.62/r/~chenjiahe/phis-service-feign into 禅道号42-his助手要有折扣申请订单,走营销助手审批 --- phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 7 +++++++ phis-feign/src/main/java/com/hz/his/dto/marketing/OrderDiscountDto.java | 5 +++-- phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java | 5 +++-- phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 7 +++++++ phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java | 3 +++ 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java index 96c12a3..64309a8 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java @@ -1,5 +1,6 @@ package com.hz.his.dto.marketing; +import com.hz.his.dto.order.OrdersTotalDto; import lombok.Data; /** @@ -9,6 +10,6 @@ @Data public class OrderCancelDto extends MarketingDto{ /*******************蹇呭~椤�(娉ㄦ剰缁ф壙鐨勫叕鍏辩被MarketingDto)*************************/ - /**璁㈠崟鏍囪瘑*/ - private String orderId; + /**璁㈠崟淇℃伅*/ + private OrdersTotalDto ordersTotalDto; } diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderDiscountDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderDiscountDto.java index dc748e6..96c37f0 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderDiscountDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderDiscountDto.java @@ -1,5 +1,6 @@ package com.hz.his.dto.marketing; +import com.hz.his.dto.order.OrdersTotalDto; import lombok.Data; import java.math.BigDecimal; @@ -11,8 +12,8 @@ @Data public class OrderDiscountDto extends MarketingDto{ /*******************蹇呭~椤�(娉ㄦ剰缁ф壙鐨勫叕鍏辩被MarketingDto)*************************/ - /**璁㈠崟鏍囪瘑*/ - private String orderId; + /**璁㈠崟淇℃伅*/ + private OrdersTotalDto ordersTotalDto; /**璁㈠崟鎶樻墸(鍗曚綅:鐧惧垎姣�)*/ private BigDecimal discountNum; diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java index e89eb6f..518d20f 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrdersTotalDto.java @@ -169,6 +169,9 @@ /** 搴峰崥浣虫爣璇�(KoapOrderTotal) */ private String koapOrderId; + /**璁㈠崟鎬婚噾棰濈殑鎶樺悗閲戦*/ + private BigDecimal disTotal; + private OrderInfoDto orderInfo; private List<String> activityIds; 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 3926995..bb6ecf6 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 @@ -80,4 +80,11 @@ */ @PostMapping(value = "/get/coupon/goods") Result getCouponGoods(@RequestBody CouponGoodsDto couponGoodsDto); + + /** + * 鑾峰彇浼樻儬鍒稿垪琛�(涓嶅垎椤�) + * @return Result + */ + @PostMapping(value = "/getCouponList") + Result getCouponList(@RequestBody CouponDto couponDto); } 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 f638802..fa0720e 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 @@ -262,4 +262,11 @@ @PostMapping(value = "/user/project/items") Result findUserProjectItem(@RequestBody UserProjectDto userProjectDto); + /** + * 鑾峰彇鍒扮敤鎴疯鎯�(鍚屾浣跨敤) + * @param userId 鐢ㄦ埛鏍囪瘑 + * @return 杞寲浣跨敤UserDt + */ + @PostMapping(value = "/user/info/baseInfo") + Result userInfoBaseInfo(@RequestParam("userId") String userId); } \ No newline at end of file -- Gitblit v1.8.0