diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaIntracityService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaIntracityService.java index 80cd88b46..4359fc7b1 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaIntracityService.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaIntracityService.java @@ -57,7 +57,7 @@ public interface WxMaIntracityService { WxMaGetPayModeResponse getPayMode() throws WxErrorException; /** 查询运费 */ - WxMaAddOrderResponse preAddOrder(WxMaPreAddOrderRequest request) throws WxErrorException; + WxMaPreAddOrderResponse preAddOrder(WxMaPreAddOrderRequest request) throws WxErrorException; /** 创建配送单 */ WxMaAddOrderResponse addOrder(WxMaAddOrderRequest order) throws WxErrorException; diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaIntracityServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaIntracityServiceImpl.java index 46a728eca..3e21dab79 100644 --- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaIntracityServiceImpl.java +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaIntracityServiceImpl.java @@ -205,9 +205,10 @@ public class WxMaIntracityServiceImpl implements WxMaIntracityService { } @Override - public WxMaAddOrderResponse preAddOrder(WxMaPreAddOrderRequest request) throws WxErrorException { + public WxMaPreAddOrderResponse preAddOrder(WxMaPreAddOrderRequest request) + throws WxErrorException { String response = this.wxMaService.postWithSignature(Intracity.PRE_ADD_ORDER, request); - return gson.fromJson(response, WxMaAddOrderResponse.class); + return gson.fromJson(response, WxMaPreAddOrderResponse.class); } @Override diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/intractiy/WxMaPreAddOrderResponse.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/intractiy/WxMaPreAddOrderResponse.java new file mode 100644 index 000000000..f198c81ba --- /dev/null +++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/intractiy/WxMaPreAddOrderResponse.java @@ -0,0 +1,63 @@ +package cn.binarywang.wx.miniapp.bean.intractiy; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class WxMaPreAddOrderResponse { + private static final Logger logger = LoggerFactory.getLogger(WxMaPreAddOrderResponse.class); + + /** 运力公司ID */ + private String serviceTransId; + + /** 配送距离 */ + private int distance; + + /** 预估配送费 */ + private int estFee; + + /** 商品预计送达时间 */ + private long expectedFinishedTime; + + /** 配送时长(单位:分钟) */ + private int promiseDeliveryTime; + + public String getServiceTransId() { + return serviceTransId; + } + + public void setServiceTransId(String serviceTransId) { + this.serviceTransId = serviceTransId; + } + + public int getDistance() { + return distance; + } + + public void setDistance(int distance) { + this.distance = distance; + } + + public int getEstFee() { + return estFee; + } + + public void setEstFee(int estFee) { + this.estFee = estFee; + } + + public long getExpectedFinishedTime() { + return expectedFinishedTime; + } + + public void setExpectedFinishedTime(long expectedFinishedTime) { + this.expectedFinishedTime = expectedFinishedTime; + } + + public int getPromiseDeliveryTime() { + return promiseDeliveryTime; + } + + public void setPromiseDeliveryTime(int promiseDeliveryTime) { + this.promiseDeliveryTime = promiseDeliveryTime; + } +} diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaIntracityServiceImpleTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaIntracityServiceImpleTest.java index 9828542a4..e16fc424c 100644 --- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaIntracityServiceImpleTest.java +++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaIntracityServiceImpleTest.java @@ -254,8 +254,8 @@ public class WxMaIntracityServiceImpleTest { cargo.setCargoPrice(10000); cargo.setCargoWeight(1000); request.setCargo(cargo); - WxMaAddOrderResponse response = wxService.getIntracityService().preAddOrder(request); - logger.debug("查询运费返回 {}, 预估运费{}元", response, response.getFee() / 100.0); + WxMaPreAddOrderResponse response = wxService.getIntracityService().preAddOrder(request); + logger.debug("查询运费返回 {}, 预估运费{}元", response, response.getEstFee() / 100.0); } String wxOrderId = null; {