From 5d1aba4eae118a9099edd4fe18981fad84a6f8e2 Mon Sep 17 00:00:00 2001 From: chenjiahe <763432473@qq.com> Date: 星期三, 31 八月 2022 19:44:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- phis-feign/src/main/java/com/hz/phis/dt/spec/SpecDt.java | 20 ++-- phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java | 24 ++++++ phis-feign/src/main/java/com/hz/phis/dt/spec/SpuSpecDt.java | 21 +++++ phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java | 6 + phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 18 +++- phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java | 3 phis-feign/src/main/java/com/hz/phis/dt/spec/SkuAndSpuDt.java | 16 ++++ phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java | 3 phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java | 12 ++ phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 7 + phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 30 +++++++ phis-feign/src/main/java/com/hz/phis/dt/spec/SkuSpecDt.java | 39 +++------ phis-feign/src/main/java/com/hz/phis/dt/spec/SpuSpecValueDt.java | 18 ++++ 13 files changed, 175 insertions(+), 42 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java index b412caf..802a33c 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderItemDto.java @@ -93,6 +93,9 @@ /** 鍗″寘鏍囪瘑 */ private List<CardItemInfoDto> cardItemInfoIds; + /** 绗笁鏂筰tem鏍囪瘑 */ + private String commonItemId; + /**骞冲彴绫诲瀷-CRM*/ diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java index fdd9d01..b6315ad 100644 --- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java +++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java @@ -3,6 +3,8 @@ import com.hz.his.dto.PageDto; import lombok.Data; +import java.util.List; + /** * Created with IntelliJ IDEA. * @@ -18,7 +20,10 @@ private String operatorId; //鎿嶄綔浜洪棬搴楁爣璇嗭紝蹇呭~ private String shopId; + //鎬昏鍗曚俊鎭紝蹇呭~ private OrdersTotalDto ordersTotal; - private OrderItemDto orderItem; + //涓�绾у瓙璁㈠崟锛屽繀濉� + private List<OrderItemDto> orderItem; + //寮�鍙戜汉闆嗗悎 private OrderDeveloperDto orderDeveloper; } 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 new file mode 100644 index 0000000..91e40a7 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayAmountDto.java @@ -0,0 +1,24 @@ +package com.hz.his.dto.order; + +import lombok.Data; + +/** + * 缁撹处閲戦闆嗗悎 + * + * @Author: zhouxiang + * @Date: 2022/08/31/15:26 + * @Description: + */ +@Data +public class PayAmountDto { + //瀹為檯鏀粯閲戦 + private String amount; + //鏀粯鏂瑰紡 + private String method; + //鍟嗗搧/椤圭洰id/缁勫悎椤规爣璇�(鍗¢」鏀粯鏃跺繀浼犵粍鍚堥」鏍囪瘑) + private String commonId; + //鏉冪泭绫诲瀷:鍗¢」鏀粯蹇呬紶 + private String cardEquityId; + //鍗″寘鏍囪瘑:鍗¢」鏀粯蹇呬紶 + private String userCardId; +} diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java new file mode 100644 index 0000000..2c8e35e --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java @@ -0,0 +1,30 @@ +package com.hz.his.dto.order; + +import lombok.Data; + +import java.util.List; + +/** + * 缁撹处鍙傛暟 + * + * @Author: zhouxiang + * @Date: 2022/06/29/15:11 + * @Description: + */ +@Data +public class PayDto { + //鏄惁鏄寜椤圭洰浠樻,0:鍚�,1:鏄� + private Integer type; + //璁㈠崟id 蹇呭~ + private String orderId; + //搴斾粯鎬婚噾棰� 蹇呭~ + private String total; + //缁撹处鍙傛暟 蹇呭~ + private List<PayAmountDto> amount; + //鎿嶄綔浜烘爣璇� 蹇呭~,crm濉敤鎴� + private String operatorId; + //浼樻儬鍒竔d + private String userCouponId; + //璁㈠崟棰嗗缓鏍囪瘑 + private String hisOrderId; +} diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java index 428a4bb..029f575 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java @@ -78,10 +78,18 @@ Result getUpdateSpuProject(@RequestBody ProjectDto projectDto); /** - * 鑾峰彇椤圭洰spu瑙勬牸鍒楄〃(鍚屾浣跨敤) + * 鑾峰彇褰撳墠椤圭洰sku瑙勬牸鍜屽叾spu瑙勬牸(鍚屾浣跨敤) * @return Result + * 杩斿洖浣跨敤SpecDt */ @PostMapping(value = "/project/page/spu/spec/update") - Result getUpdateSpuSpecProject(@RequestParam("hisId") String hisId); + Result getUpdateSpuSpecProject(@RequestParam("projectId") String projectId); + + /** + * 鑾峰彇褰撳墠椤圭洰sku鍜屽搴旂殑spu淇℃伅 + * @return Result + */ + @PostMapping(value = "/project/sku/spu") + Result getSkuAndSpu(@RequestParam("projectId") String projectId); } \ No newline at end of file diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java index 1287e96..e0e353f 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java @@ -7,6 +7,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; +import javax.servlet.http.HttpServletRequest; + /** * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� */ @@ -49,10 +51,16 @@ @PostMapping(value = "/refund/syn/refund") Result synRefund(@RequestBody OrderRefundDto dto, @RequestHeader("appIdCode") String appIdCode); - /** - * 寮�鏀惧钩鍙�-寮�鍗曞苟涓旂粨璐︽帴鍙� - */ - @PostMapping(value = "/create/pay/order") - Result createPayOrder(@RequestBody OrderPHisDto dto); + /** + * 寮�鏀惧钩鍙�-寮�鍗� + */ + @PostMapping(value = "/order/add") + Result orderAdd(@RequestBody OrderPHisDto dto); + + /** + * 寮�鏀惧钩鍙�-缁撹处 + */ + @PostMapping(value = "/order/pay") + Result orderPay(@RequestBody PayDto dto); } \ No newline at end of file diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java index 1bdab13..2e6b485 100644 --- a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java +++ b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java @@ -6,6 +6,7 @@ import com.hx.resultTool.Result; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -20,6 +21,6 @@ * @param orderId * @return */ - @PostMapping(value = "/sync/order/getOrderById") + @GetMapping(value = "/sync/order/getOrderById") Result getOrderById(@RequestParam("orderId") String orderId); } diff --git a/phis-feign/src/main/java/com/hz/phis/dt/spec/SkuAndSpuDt.java b/phis-feign/src/main/java/com/hz/phis/dt/spec/SkuAndSpuDt.java new file mode 100644 index 0000000..bb38ef8 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/phis/dt/spec/SkuAndSpuDt.java @@ -0,0 +1,16 @@ +package com.hz.phis.dt.spec; + +import lombok.Data; + +/** + * sku鍜宻pu淇℃伅杩斿洖鎵╁睍 + * @author fwq + * */ +@Data +public class SkuAndSpuDt { + /**sku鏍囪瘑*/ + private String skuId; + /**spu鏍囪瘑*/ + private String spuId; + +} diff --git a/phis-feign/src/main/java/com/hz/phis/dt/spec/SkuSpecDt.java b/phis-feign/src/main/java/com/hz/phis/dt/spec/SkuSpecDt.java index c7d4b99..cd8f7ab 100644 --- a/phis-feign/src/main/java/com/hz/phis/dt/spec/SkuSpecDt.java +++ b/phis-feign/src/main/java/com/hz/phis/dt/spec/SkuSpecDt.java @@ -1,35 +1,26 @@ package com.hz.phis.dt.spec; +import lombok.Data; +/** + * 椤圭洰sku杩斿洖鎵╁睍 + * @author fwq + * */ +@Data public class SkuSpecDt { + /**瑙勬牸鍊艰褰曟爣璇�*/ private String id; + /**椤圭洰sku鏍囪瘑*/ + private String projectId; + /**椤圭洰sku瑙勬牸鏍囪瘑*/ + private String specId; + /**椤圭洰sku瑙勬牸鍚嶇О*/ private String specName; + /**椤圭洰sku瑙勬牸鍊兼爣璇�*/ + private String specValue; + /**椤圭洰sku瑙勬牸鍊煎悕绉�*/ private String specValueName; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getSpecName() { - return specName; - } - - public void setSpecName(String specName) { - this.specName = specName; - } - - public String getSpecValueName() { - return specValueName; - } - - public void setSpecValueName(String specValueName) { - this.specValueName = specValueName; - } } diff --git a/phis-feign/src/main/java/com/hz/phis/dt/spec/SpecDt.java b/phis-feign/src/main/java/com/hz/phis/dt/spec/SpecDt.java index b5b5588..0aba681 100644 --- a/phis-feign/src/main/java/com/hz/phis/dt/spec/SpecDt.java +++ b/phis-feign/src/main/java/com/hz/phis/dt/spec/SpecDt.java @@ -1,16 +1,18 @@ package com.hz.phis.dt.spec; +import lombok.Data; + import java.util.List; +/** + * 瑙勬牸杩斿洖鎵╁睍 + * @author fwq + * */ +@Data public class SpecDt { + /**spu瑙勬牸淇℃伅*/ + private List<SpuSpecDt> spuSpecList; + /**sku瑙勬牸淇℃伅*/ + private List<SkuSpecDt> projectValueList; - private List<SkuSpecDt> skuSpecList; - - public List<SkuSpecDt> getSkuSpecList() { - return skuSpecList; - } - - public void setSkuSpecList(List<SkuSpecDt> skuSpecList) { - this.skuSpecList = skuSpecList; - } } diff --git a/phis-feign/src/main/java/com/hz/phis/dt/spec/SpuSpecDt.java b/phis-feign/src/main/java/com/hz/phis/dt/spec/SpuSpecDt.java new file mode 100644 index 0000000..5ee9035 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/phis/dt/spec/SpuSpecDt.java @@ -0,0 +1,21 @@ +package com.hz.phis.dt.spec; + + +import lombok.Data; + +import java.util.List; +/** + * spu瑙勬牸杩斿洖鎵╁睍 + * @author fwq + * */ +@Data +public class SpuSpecDt { + /**椤圭洰spu鏍囪瘑*/ + private String generalId; + /**瑙勬牸鍊艰褰曟爣璇�*/ + private String id; + /**瑙勬牸鏍囪瘑*/ + private String specId; + /**瑙勬牸鍊�*/ + private List<SpuSpecValueDt> specValueList; +} diff --git a/phis-feign/src/main/java/com/hz/phis/dt/spec/SpuSpecValueDt.java b/phis-feign/src/main/java/com/hz/phis/dt/spec/SpuSpecValueDt.java new file mode 100644 index 0000000..1969c41 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/phis/dt/spec/SpuSpecValueDt.java @@ -0,0 +1,18 @@ +package com.hz.phis.dt.spec; + + +import lombok.Data; + +/** + * spu瑙勬牸鍊艰繑鍥炴墿灞� + * @author fwq + * */ +@Data +public class SpuSpecValueDt { + + /**瑙勬牸鍊兼爣璇�*/ + private String id; + /**瑙勬牸鍊煎悕绉�*/ + private String specValueName; + +} diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java index daa96e5..757737e 100644 --- a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java +++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java @@ -61,4 +61,10 @@ private String hisCorpUser; /**鎬у埆*/ private Integer gender; + /**鑱屼笟绫诲瀷鍚嶇О*/ + private String professionTypeName; + /**寰俊鍙�*/ + private String wechat; + /**閭*/ + private String email; } -- Gitblit v1.8.0