From 2762a98279b0017140ce280ce6ce2570798c84e5 Mon Sep 17 00:00:00 2001 From: altusea <114981887+altusea@users.noreply.github.com> Date: Tue, 13 May 2025 22:52:24 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=20#3569=20=E3=80=90=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E5=8F=B7=E3=80=91=E5=BE=AE=E4=BF=A1=E5=B0=8F=E5=BA=97-?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../channel/api/WxChannelOrderService.java | 11 +++++++ .../api/impl/WxChannelOrderServiceImpl.java | 22 ++++++------- .../channel/bean/order/OrderInfoParam.java | 31 +++++++++++++++++++ .../impl/WxChannelOrderServiceImplTest.java | 10 ++++++ 4 files changed, 61 insertions(+), 13 deletions(-) create mode 100644 weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderInfoParam.java diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelOrderService.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelOrderService.java index d426a3980..49e2b879b 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelOrderService.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/WxChannelOrderService.java @@ -34,6 +34,17 @@ public interface WxChannelOrderService { */ OrderInfoResponse getOrder(String orderId) throws WxErrorException; + /** + * 获取订单详情 + * + * @param orderId 订单id + * @param encodeSensitiveInfo 是否编码敏感信息 + * @return 订单详情 + * + * @throws WxErrorException 异常 + */ + OrderInfoResponse getOrder(String orderId, Boolean encodeSensitiveInfo) throws WxErrorException; + /** * 获取订单列表 * diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelOrderServiceImpl.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelOrderServiceImpl.java index 433118506..80fdc7137 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelOrderServiceImpl.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelOrderServiceImpl.java @@ -14,18 +14,7 @@ import me.chanjar.weixin.channel.bean.delivery.DeliveryCompanyResponse; import me.chanjar.weixin.channel.bean.delivery.DeliveryInfo; import me.chanjar.weixin.channel.bean.delivery.DeliverySendParam; import me.chanjar.weixin.channel.bean.delivery.FreshInspectParam; -import me.chanjar.weixin.channel.bean.order.ChangeOrderInfo; -import me.chanjar.weixin.channel.bean.order.DecodeSensitiveInfoResponse; -import me.chanjar.weixin.channel.bean.order.DeliveryUpdateParam; -import me.chanjar.weixin.channel.bean.order.OrderAddressParam; -import me.chanjar.weixin.channel.bean.order.OrderIdParam; -import me.chanjar.weixin.channel.bean.order.OrderInfoResponse; -import me.chanjar.weixin.channel.bean.order.OrderListParam; -import me.chanjar.weixin.channel.bean.order.OrderListResponse; -import me.chanjar.weixin.channel.bean.order.OrderPriceParam; -import me.chanjar.weixin.channel.bean.order.OrderRemarkParam; -import me.chanjar.weixin.channel.bean.order.OrderSearchParam; -import me.chanjar.weixin.channel.bean.order.VirtualTelNumberResponse; +import me.chanjar.weixin.channel.bean.order.*; import me.chanjar.weixin.channel.util.ResponseUtils; import me.chanjar.weixin.common.error.WxErrorException; @@ -47,7 +36,14 @@ public class WxChannelOrderServiceImpl implements WxChannelOrderService { @Override public OrderInfoResponse getOrder(String orderId) throws WxErrorException { - OrderIdParam param = new OrderIdParam(orderId); + OrderInfoParam param = new OrderInfoParam(orderId, null); + String resJson = shopService.post(ORDER_GET_URL, param); + return ResponseUtils.decode(resJson, OrderInfoResponse.class); + } + + @Override + public OrderInfoResponse getOrder(String orderId, Boolean encodeSensitiveInfo) throws WxErrorException { + OrderInfoParam param = new OrderInfoParam(orderId, encodeSensitiveInfo); String resJson = shopService.post(ORDER_GET_URL, param); return ResponseUtils.decode(resJson, OrderInfoResponse.class); } diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderInfoParam.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderInfoParam.java new file mode 100644 index 000000000..e7a8c9a2b --- /dev/null +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/order/OrderInfoParam.java @@ -0,0 +1,31 @@ +package me.chanjar.weixin.channel.bean.order; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * 获取订单详情参数 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +public class OrderInfoParam implements Serializable { + + private static final long serialVersionUID = 42L; + + /** 订单ID */ + @JsonProperty("order_id") + private String orderId; + + /** + * 用于商家提前测试订单脱敏效果，如果传true，即对订单进行脱敏，后期会默认对所有订单脱敏 + */ + @JsonProperty("encode_sensitive_info") + private Boolean encodeSensitiveInfo; +} diff --git a/weixin-java-channel/src/test/java/me/chanjar/weixin/channel/api/impl/WxChannelOrderServiceImplTest.java b/weixin-java-channel/src/test/java/me/chanjar/weixin/channel/api/impl/WxChannelOrderServiceImplTest.java index 78bd13e7d..d1f648661 100644 --- a/weixin-java-channel/src/test/java/me/chanjar/weixin/channel/api/impl/WxChannelOrderServiceImplTest.java +++ b/weixin-java-channel/src/test/java/me/chanjar/weixin/channel/api/impl/WxChannelOrderServiceImplTest.java @@ -45,6 +45,16 @@ public class WxChannelOrderServiceImplTest { assertTrue(response.isSuccess()); } + @Test + public void testGetOrder2() throws WxErrorException { + WxChannelOrderService orderService = channelService.getOrderService(); + String orderId = ""; + boolean encodeSensitiveInfo = true; + OrderInfoResponse response = orderService.getOrder(orderId, encodeSensitiveInfo); + assertNotNull(response); + assertTrue(response.isSuccess()); + } + @Test public void testGetOrders() throws WxErrorException { WxChannelOrderService orderService = channelService.getOrderService();