From 4e06dd60393eef57399fa0180aa2d36693745a64 Mon Sep 17 00:00:00 2001
From: Xianhui Guo <110033355+gxh0797@users.noreply.github.com>
Date: Tue, 2 Aug 2022 13:37:51 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20#2714=20=E3=80=90=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E3=80=91=E4=BF=AE=E5=A4=8D=E5=8D=B3=E6=97=B6=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E6=8A=A5=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E7=AD=BE=E5=90=8D=E9=AA=8C=E8=AF=81=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WxMaImmediateDeliveryServiceImpl.java     |  4 ++++
 .../base/WxMaDeliveryBaseRequest.java         |  3 ++-
 .../wx/miniapp/test/AddOrderJsonTest.java     | 20 +++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/test/AddOrderJsonTest.java

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaImmediateDeliveryServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaImmediateDeliveryServiceImpl.java
index ba774d332..2bf98d957 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaImmediateDeliveryServiceImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaImmediateDeliveryServiceImpl.java
@@ -98,6 +98,7 @@ public class WxMaImmediateDeliveryServiceImpl implements WxMaImmediateDeliverySe
    */
   @Override
   public AddOrderResponse addOrder(final AddOrderRequest request) throws WxErrorException {
+    request.getDeliverySign();
     return this.parse(this.wxMaService.post(WxMaApiUrlConstants.InstantDelivery.PlaceAnOrder.ADD_ORDER, request),
       AddOrderResponse.class);
   }
@@ -115,6 +116,7 @@ public class WxMaImmediateDeliveryServiceImpl implements WxMaImmediateDeliverySe
    */
   @Override
   public GetOrderResponse getOrder(final GetOrderRequest request) throws WxErrorException {
+    request.getDeliverySign();
     return this.parse(this.wxMaService.post(WxMaApiUrlConstants.InstantDelivery.GET_ORDER, request),
       GetOrderResponse.class);
   }
@@ -131,6 +133,7 @@ public class WxMaImmediateDeliveryServiceImpl implements WxMaImmediateDeliverySe
    */
   @Override
   public CancelOrderResponse cancelOrder(final CancelOrderRequest request) throws WxErrorException {
+    request.getDeliverySign();
     return this.parse(this.wxMaService.post(WxMaApiUrlConstants.InstantDelivery.Cancel.CANCEL_ORDER, request),
       CancelOrderResponse.class);
   }
@@ -147,6 +150,7 @@ public class WxMaImmediateDeliveryServiceImpl implements WxMaImmediateDeliverySe
    */
   @Override
   public AbnormalConfirmResponse abnormalConfirm(final AbnormalConfirmRequest request) throws WxErrorException {
+    request.getDeliverySign();
     return this.parse(this.wxMaService.post(WxMaApiUrlConstants.InstantDelivery.Cancel.ABNORMAL_CONFIRM, request),
       AbnormalConfirmResponse.class);
   }
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/delivery/base/WxMaDeliveryBaseRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/delivery/base/WxMaDeliveryBaseRequest.java
index a139ea907..b01b04e76 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/delivery/base/WxMaDeliveryBaseRequest.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/delivery/base/WxMaDeliveryBaseRequest.java
@@ -113,7 +113,8 @@ public abstract class WxMaDeliveryBaseRequest implements Serializable {
             str = str.concat(getShopOrderId());
         }
         str = str.concat(getAppSecret());
-        return DigestUtils.sha1Hex(str);
+        this.deliverySign = DigestUtils.sha1Hex(str);
+        return this.deliverySign;
     }
 
 }
diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/test/AddOrderJsonTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/test/AddOrderJsonTest.java
new file mode 100644
index 000000000..b072eff18
--- /dev/null
+++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/test/AddOrderJsonTest.java
@@ -0,0 +1,20 @@
+package cn.binarywang.wx.miniapp.test;
+
+import cn.binarywang.wx.miniapp.bean.delivery.AddOrderRequest;
+import me.chanjar.weixin.common.util.json.WxGsonBuilder;
+import org.testng.annotations.Test;
+
+public class AddOrderJsonTest {
+
+  /**
+   * 验证转化Json时是否有deliverySign
+   */
+  @Test
+  public void test(){
+    AddOrderRequest request = new AddOrderRequest();
+    request.setShopId("1");
+    request.setAppSecret("2");
+    request.getDeliverySign();
+    System.out.printf(WxGsonBuilder.create().toJson(request));
+  }
+}