From 03a4e86b1026c5f2e53bf355e4a346c7b8d93877 Mon Sep 17 00:00:00 2001 From: zhouxiang <zhouxiang> Date: 星期三, 03 八月 2022 11:51:11 +0800 Subject: [PATCH] Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign --- phis-feign/src/main/java/com/hz/his/dto/order/OrderPayDto.java | 29 +++++++ phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java | 24 ++++++ phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderCanUseCouponDto.java | 24 ++++++ phis-feign/src/main/java/com/hz/his/dto/order/OrderCreateDto.java | 27 ++++++ phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 16 ++- phis-feign/src/main/java/com/hz/his/dto/order/OrderDeveloperDto.java | 101 +++++++++++++++++++++++++ 6 files changed, 214 insertions(+), 7 deletions(-) diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderCreateDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderCreateDto.java new file mode 100644 index 0000000..e204f8f --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderCreateDto.java @@ -0,0 +1,27 @@ +package com.hz.his.dto.order; + + +import lombok.Data; + +import java.util.List; + +/** + * @author wzh + * 璁㈠崟鍒涘缓鎵╁睍 + */ +@Data +public class OrderCreateDto { + + private OrdersTotalDto orderTotal; + + private List<OrderItemDto> orderItem; + + private List<OrderDeveloperDto> orderDeveloper; + + private List<String> cardItemInfoIds; + + private String operatorId; + + private String shopId; + +} diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderDeveloperDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderDeveloperDto.java new file mode 100644 index 0000000..1e77c83 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderDeveloperDto.java @@ -0,0 +1,101 @@ +package com.hz.his.dto.order; + +import java.util.Date; + +/** + * 璁㈠崟涓庡紑鍙戜汉鍏宠仈琛�(榛樿:鐢ㄦ埛缁戝畾鐨勬墍灞為【闂�) + */ +public class OrderDeveloperDto { + + private String id; + private Date createTime; + private Date editTime; + + /** 璁㈠崟id锛圤rdersTotal锛� */ + private String orderId; + + /** 寮�鍗曚汉闂ㄥ簵鏍囪瘑(榛樿:鐢ㄦ埛缁戝畾鐨勬墍灞為【闂�) */ + private String shopId; + /** 寮�鍗曚汉闂ㄥ簵鍚嶇О(榛樿:鐢ㄦ埛缁戝畾鐨勬墍灞為【闂�)*/ + private String shopName; + + /** 寮�鍗曚汉鍛樺伐鏍囪瘑(榛樿:鐢ㄦ埛缁戝畾鐨勬墍灞為【闂�)*/ + private String employeeId; + /** 寮�鍗曚汉鍛樺伐鍚嶇О(榛樿:鐢ㄦ埛缁戝畾鐨勬墍灞為【闂�)*/ + private String employeeName; + + /** 绫诲瀷(缇庡甯�/鍖荤敓)*/ + private String type; + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + + public String getShopId() { + return shopId; + } + + public void setShopId(String shopId) { + this.shopId = shopId; + } + + public String getShopName() { + return shopName; + } + + public void setShopName(String shopName) { + this.shopName = shopName; + } + + public String getEmployeeId() { + return employeeId; + } + + public void setEmployeeId(String employeeId) { + this.employeeId = employeeId; + } + + public String getEmployeeName() { + return employeeName; + } + + public void setEmployeeName(String employeeName) { + this.employeeName = employeeName; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getEditTime() { + return editTime; + } + + public void setEditTime(Date editTime) { + this.editTime = editTime; + } +} diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayDto.java new file mode 100644 index 0000000..034edb7 --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPayDto.java @@ -0,0 +1,29 @@ +package com.hz.his.dto.order; + +import lombok.Data; + +/** + * @author wzh + * 璁㈠崟缁撹处鎵╁睍 + */ +@Data +public class OrderPayDto { + + /** 鏄惁鏄寜椤圭洰浠樻,0:鍚�,1:鏄� */ + private Integer type; + /** 璁㈠崟id */ + private String orderId; + /** 搴斾粯鐨勬�婚噾棰� */ + private String total; + /** 鐢ㄦ埛鐪熸鏀粯鐨勯噾棰濋泦鍚� */ + private String amount; + /** 鎿嶄綔浜哄憳淇℃伅json */ + private String operator; + /** 鎿嶄綔浜哄憳id */ + private String operatorId; + /** 浼樻儬鍒竔d */ + private String userCouponId; + /** 鐢ㄦ埛璧勯噾淇℃伅 */ + private String userMoney; + +} diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderCanUseCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderCanUseCouponDto.java new file mode 100644 index 0000000..e68ba2b --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderCanUseCouponDto.java @@ -0,0 +1,24 @@ +package com.hz.his.dto.user.coupon; + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * @author wzh + * 鍒ゆ柇璁㈠崟鏄惁鍙敤璇ヤ紭鎯犲埜鐨勮鍗曚俊鎭� + * */ +@Data +public class OrderCanUseCouponDto { + /**鐢ㄦ埛鏍囪瘑*/ + private String userId; + /**浼樻儬鍒告爣璇�*/ + private String couponId; + /**璁㈠崟閲戦*/ + private BigDecimal total; + /**璐拱浠舵暟*/ + private Integer itemNum; + /**瀛愯鍗曞晢鍝佷俊鎭垪琛�*/ + private List<OrderItemCouponDto> itemList; +} diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java new file mode 100644 index 0000000..9db72be --- /dev/null +++ b/phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderItemCouponDto.java @@ -0,0 +1,24 @@ +package com.hz.his.dto.user.coupon; + + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author wzh + * 鍒ゆ柇璁㈠崟鏄惁鍙敤璇ヤ紭鎯犲埜鐨勮鍗曚俊鎭� + * */ +@Data +public class OrderItemCouponDto { + /**鍟嗗搧绫诲瀷*/ + private Integer goodsType; + /**鍟嗗搧鏍囪瘑*/ + private String goodsId; + /**sku鏍囪瘑*/ + private String goodsSkuId; + /**璐拱鍟嗗搧鏁伴噺*/ + private Integer goodsNum; + /**璁㈠崟閲戦*/ + private BigDecimal total; +} 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 430e340..5827a98 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 @@ -1,11 +1,13 @@ package com.hz.his.feign.service.platform; import com.hx.resultTool.Result; -import com.hz.his.dto.card.CardQueryDto; +import com.hz.his.dto.order.OrderCreateDto; +import com.hz.his.dto.order.OrderPayDto; +import com.hz.his.dto.order.OrderRefundDto; +import com.hz.his.dto.order.OrdersTotalDto; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; /** * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂� @@ -17,30 +19,30 @@ * 寮�鏀惧钩鍙�-鏂�-鏂板璁㈠崟鏇存柊鑷硃his */ @PostMapping(value = "/newSync/order/add") - Result createOrder(@RequestParam("params") String params); + Result createOrder(@RequestBody OrderCreateDto params); /** * 寮�鏀惧钩鍙�-鏂�-璁㈠崟鐘舵�佹洿鏂拌嚦phis */ @PostMapping(value = "/newSync/order/orderUpdate") - Result updateOrderStatus(@RequestParam("params") String params); + Result updateOrderStatus(@RequestBody OrdersTotalDto params); /** * 寮�鏀惧钩鍙�-鏂�-璁㈠崟缁撹处鏇存柊鑷硃his */ @PostMapping(value = "/newSync/order/pay") - Result payOrderSuc(@RequestParam("params") String params); + Result payOrderSuc(@RequestBody OrderPayDto params); /** * 寮�鏀惧钩鍙�-鏂�-璁㈠崟閫�娆炬洿鏂拌嚦phis */ @PostMapping(value = "/newSync/order/refund") - Result refundOrder(@RequestParam("params") String params); + Result refundOrder(@RequestBody OrderRefundDto params); /** * 寮�鏀惧钩鍙�-鏂�-鍙栨秷璁㈠崟鏇存柊鑷硃his */ @PostMapping(value = "/newSync/order/cancel") - Result cancelOrder(@RequestParam("params") String params); + Result cancelOrder(@RequestBody OrderRefundDto params); } \ No newline at end of file -- Gitblit v1.8.0