From c22a566f26705b68150068346c8365be2ce5c61a Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 15 Jul 2022 17:41:39 +0800 Subject: [PATCH] =?UTF-8?q?//=20tt=20=E8=AE=A2=E5=8D=9514=E5=88=86?= =?UTF-8?q?=E9=92=9F=E5=92=8Ctoken=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxOrderController.java | 2 +- .../web/api/TtWebGoodsGetRequestExecutor.java | 17 ++++++++----- .../api/TtWebGoodsPostRequestExecutor.java | 11 +++++++++ .../web/api/impl/TtWebGoodsServiceImpl.java | 8 ------- .../douyin/web/api/impl/TtWebServiceImpl.java | 15 +++--------- .../douyin/web/config/TtWebConstants.java | 24 +++++++++++++++++++ .../miniApp/TtMiniAppPayAdapterService.java | 2 +- 7 files changed, 51 insertions(+), 28 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/douyin/web/config/TtWebConstants.java diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index 77e66ebbd..a2c12602c 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -250,7 +250,7 @@ public class WxOrderController extends BaseController { WxComposeOrder order = (WxComposeOrder) resultData.data; Map data = new HashMap<>(); data.put("out_order_no",order.getMainOrderId().toString()); - data.put("pay_expire_seconds",10*60); + data.put("pay_expire_seconds",14*60); data.put("order_entry_schema",wxOrderService.getOrderEntrySchema(order.getMainOrderId())); // List> goodsValid = new ArrayList<>(); // for (Long couponChannelId:order.getCouponChannelMap().keySet()) { diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/TtWebGoodsGetRequestExecutor.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/TtWebGoodsGetRequestExecutor.java index 2c610be23..2c5115661 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/web/api/TtWebGoodsGetRequestExecutor.java +++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/TtWebGoodsGetRequestExecutor.java @@ -75,13 +75,18 @@ public class TtWebGoodsGetRequestExecutor implements RequestExecutor")) { diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/impl/TtWebGoodsServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/impl/TtWebGoodsServiceImpl.java index 80c6d6799..68ddf1ffd 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/web/api/impl/TtWebGoodsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/impl/TtWebGoodsServiceImpl.java @@ -1,21 +1,13 @@ package com.iformall.douyin.web.api.impl; -import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.google.gson.JsonObject; -import com.iformall.common.ErrorCode; -import com.iformall.douyin.pay.exception.TtPayException; -import com.iformall.douyin.payv2.request.CallBackSettingsRequest; -import com.iformall.douyin.payv2.result.BaseTtPayResult; import com.iformall.douyin.web.api.*; import com.iformall.douyin.web.bean.*; -import com.iformall.exception.MallinkException; import lombok.AllArgsConstructor; import me.chanjar.weixin.common.error.WxError; import me.chanjar.weixin.common.error.WxErrorException; -import me.chanjar.weixin.common.util.json.GsonHelper; import org.apache.commons.lang3.StringUtils; import java.util.HashMap; diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/impl/TtWebServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/impl/TtWebServiceImpl.java index 961869ae1..587d57fc7 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/web/api/impl/TtWebServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/impl/TtWebServiceImpl.java @@ -15,27 +15,20 @@ import me.chanjar.weixin.common.util.DataUtils; import me.chanjar.weixin.common.util.http.*; import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder; import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder; -import me.chanjar.weixin.common.util.json.WxGsonBuilder; -import org.apache.http.Consts; -import org.apache.http.HttpEntity; import org.apache.http.HttpHost; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.StringEntity; -import org.apache.http.entity.mime.MultipartEntityBuilder; import org.apache.http.impl.client.BasicResponseHandler; import org.apache.http.impl.client.CloseableHttpClient; import java.io.IOException; -import java.lang.reflect.Field; -import java.nio.charset.Charset; import java.util.HashMap; import java.util.Map; import java.util.concurrent.locks.Lock; -import static cn.binarywang.wx.miniapp.constant.WxMaConstants.ErrorCode.*; +import static com.iformall.douyin.web.config.TtWebConstants.ErrorCode.*; + /** * @author @@ -242,9 +235,7 @@ public class TtWebServiceImpl implements TtWebService, RequestHttp + * 小程序常量. + * + * + * @author Binary Wang + */ +public class TtWebConstants { + /** + * 微信接口返回的参数errcode. + */ + public static final String ERRCODE = "errcode"; + + public static final class ErrorCode { + /** + * 200104 token已过期 + */ + public static final int ERR_200104 = 200104; + + } + +} diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java index ca08c5ba6..4d15ec174 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/miniApp/TtMiniAppPayAdapterService.java @@ -119,7 +119,7 @@ public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implemen request.setTotalAmount(composeOrder.getPayment()); request.setOpenId(openId); request.setOutOrderNo(record.getPayOrderNo()); - request.setPayExpireSeconds(10*60); + request.setPayExpireSeconds(14*60); TtPayUnifiedOrderV2Request.PageEntry pageEntry = new TtPayUnifiedOrderV2Request.PageEntry(); pageEntry.setPath(Constant.mainPageUrl); Map paramMap = new HashMap<>();