diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java index 3f5bc6355..1b2395c7f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java @@ -65,6 +65,9 @@ public class WxOrderController extends BaseController { @Autowired OrderFactory orderFactory; + @Autowired + MaUtil maUtil; + @ApiOperation("分页列表接口") @GetMapping("list") @@ -280,5 +283,21 @@ public class WxOrderController extends BaseController { } +// @ApiOperation("查看抖音订单状态") +// @GetMapping("/queryItemOrderInfo") +// @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) +// @SystemControllerLog(description = "订单管理-id查询") +// public ResultData queryItemOrderInfo(String orderid) { +// logger.debug("[" + getIpAddr() + "] WxOrderController::queryItemOrderInfo"); +// TtPayService ttPayServiceTest = maUtil.getTtPayServiceTest(); +// try { +// ttPayServiceTest.queryItemOrderInfo(orderid); +// } catch (TtPayException e) { +// e.printStackTrace(); +// } +// return new ResultData(); +// +// } + } diff --git a/mallinkService/src/main/java/com/iformall/douyin/pay/TtPayService.java b/mallinkService/src/main/java/com/iformall/douyin/pay/TtPayService.java index 0a0a70c70..d141e5612 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/pay/TtPayService.java +++ b/mallinkService/src/main/java/com/iformall/douyin/pay/TtPayService.java @@ -115,6 +115,12 @@ public interface TtPayService { */ TtPayOrderQueryV2Result queryOrderV2(TtPayOrderQueryV2Request request) throws TtPayException; + /** + *
+ * 不要问我干啥用的,我也不知道
+ */
+ void queryItemOrderInfo(String order_id) throws TtPayException;
+
/**
*
* 5. cps订单信息接口
diff --git a/mallinkService/src/main/java/com/iformall/douyin/pay/impl/BaseTtPayServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/pay/impl/BaseTtPayServiceImpl.java
index 4c8f12709..893f0c9de 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/pay/impl/BaseTtPayServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/pay/impl/BaseTtPayServiceImpl.java
@@ -162,6 +162,17 @@ public abstract class BaseTtPayServiceImpl implements TtPayService {
}
}
+ @Override
+ public void queryItemOrderInfo(String order_id) throws TtPayException{
+// String url = String.format("%s/api/apps/trade/v2/query_order", this.getPayBaseUrl());
+ String url = String.format("%s/api/apps/trade/v2/query_item_order_info", this.getPayBaseUrl());
+ Map request = new HashMap();
+// request.put("out_order_no",order_id);
+ request.put("order_id",order_id);
+ String response = this.postV2(url, GSON.toJson(request));
+ }
+
+ @Override
public TtPayCpsOrderQueryV2Result queryCpsOrderV2(String orderId, String outOrderNo) throws TtPayException{
String url = String.format("%s/api/apps/trade/v2/query_cps", this.getPayBaseUrl());
TtPayOrderQueryV2Request request = new TtPayOrderQueryV2Request();
@@ -182,7 +193,7 @@ public abstract class BaseTtPayServiceImpl implements TtPayService {
}
- @Override
+ @Override
public boolean pushDelivery(TtOrderPushDeliveryRequest request) throws TtPayException{
String url = String.format("%s/api/apps/trade/v2/push_delivery", this.getPayBaseUrl());
String response = this.postV2(url, GSON.toJson(request));
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebOrderService.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebOrderService.java
index f147afd67..248e8d00d 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebOrderService.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebOrderService.java
@@ -48,6 +48,12 @@ public interface TtWebOrderService {
*/
TtPayOrderQueryV2Result queryOrderV2(TtPayOrderQueryV2Request request) throws WxErrorException;
+ /**
+ *
+ * 不要问我干啥用的,我也不知道
+ */
+ void queryItemOrderInfo(String order_id) throws WxErrorException;
+
/**
*
* 5. cps订单信息接口
diff --git a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebOrderServiceImpl.java
index 16bcaab86..c7c2a0220 100644
--- a/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebOrderServiceImpl.java
@@ -63,6 +63,15 @@ public class TtWebOrderServiceImpl implements TtWebOrderService {
}
}
+ @Override
+ public void queryItemOrderInfo(String order_id) throws WxErrorException {
+ final TtWebPostRequestExecutor executor = new TtWebPostRequestExecutor(this.service.getRequestHttp());
+ String apiUrl = this.service.getTtWebConfig().getApiBegin().getPrefix() + this.QUERY_ITEM_ORDER_INFO;
+ Map map = new HashMap<>();
+ map.put("order_id",order_id);
+ this.service.execute(executor, apiUrl, GSON.toJson(map));
+ }
+
@Override
public TtPayCpsOrderQueryV2Result queryCpsOrderV2(String orderId, String outOrderNo) throws WxErrorException {
final TtWebPostRequestExecutor executor = new TtWebPostRequestExecutor(this.service.getRequestHttp());
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/PayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/PayAdapterService.java
index 6a3a48bbf..bf036e140 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/PayAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/PayAdapterService.java
@@ -107,6 +107,15 @@ public interface PayAdapterService {
*/
PayAdapterResult noCreatePay(WxPayOrder record, WxComposeOrder composeOrder, List childOrders);
+
+ /**
+ * 希望你看不到这个方法
+ * @param appinfo
+ * @param payAccount
+ * @param order
+ */
+ void queryItemOrderInfo(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order)throws Exception;
+
/**
* 查询cps 信息
* @param appinfo
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v2/miniApp/TtMiniAppPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v2/miniApp/TtMiniAppPayAdapterService.java
index aa861d0ba..71557369e 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v2/miniApp/TtMiniAppPayAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v2/miniApp/TtMiniAppPayAdapterService.java
@@ -477,6 +477,12 @@ public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implemen
return par;
}
+ @Override
+ public void queryItemOrderInfo(WxAppinfo appInfo, WxPayAccount payAccount, WxOrder order) throws Exception {
+ TtPayService ttPayService = maUtil.getTtPayService(appInfo, payAccount);
+ ttPayService.queryItemOrderInfo(order.getComposeOrderId().toString());
+ }
+
@Override
public PayAdapterResult queryCpsOrder(WxAppinfo appInfo, WxPayAccount payAccount, WxOrder order) throws Exception {
TtPayService ttPayService = maUtil.getTtPayService(appInfo, payAccount);
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v3/open/TtOpenPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v3/open/TtOpenPayAdapterService.java
index 0d988b91e..d958db656 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v3/open/TtOpenPayAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v3/open/TtOpenPayAdapterService.java
@@ -189,6 +189,12 @@ public class TtOpenPayAdapterService extends BaseTtPayAdapterService implements
return par;
}
+ @Override
+ public void queryItemOrderInfo(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {
+ TtWebPayService ttWebPayService = maUtil.getTtWebPayService(appinfo);
+ ttWebPayService.getTtWebOrderService().queryItemOrderInfo(order.getComposeOrderId().toString());
+ }
+
@Override
public PayAdapterResult queryCpsOrder(WxAppinfo appInfo, WxPayAccount payAccount, WxOrder order) throws Exception {
TtWebPayService ttWebPayService = maUtil.getTtWebPayService(appInfo);
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/h5/WxH5PaySFTService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/h5/WxH5PaySFTService.java
index ceb2f0a80..21152697f 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/h5/WxH5PaySFTService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/h5/WxH5PaySFTService.java
@@ -79,6 +79,11 @@ public class WxH5PaySFTService extends BaseWxPaySFTAdapterService implements CDr
throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR);
}
+ @Override
+ public void queryItemOrderInfo(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {
+
+ }
+
@Override
public PayAdapterResult queryCpsOrder(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {
return null;
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/miniApp/appPay/WxMiniAppPaySFTAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/miniApp/appPay/WxMiniAppPaySFTAdapterService.java
index 5205c9fa5..c4e8dc07e 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/miniApp/appPay/WxMiniAppPaySFTAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/miniApp/appPay/WxMiniAppPaySFTAdapterService.java
@@ -322,6 +322,11 @@ public class WxMiniAppPaySFTAdapterService extends BaseWxPaySFTAdapterService i
throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR);
}
+ @Override
+ public void queryItemOrderInfo(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {
+
+ }
+
@Override
public PayAdapterResult queryCpsOrder(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {
return null;
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/h5/WxH5PayService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/h5/WxH5PayService.java
index 003ad1ebb..ded1500c6 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/h5/WxH5PayService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/h5/WxH5PayService.java
@@ -75,6 +75,11 @@ public class WxH5PayService extends BaseWxPayV2AdapterService implements CDrivi
throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR);
}
+ @Override
+ public void queryItemOrderInfo(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {
+
+ }
+
@Override
public PayAdapterResult queryCpsOrder(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {
return null;
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/appPay/WxMiniAppPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/appPay/WxMiniAppPayAdapterService.java
index b69b5ef7d..cdc830df3 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/appPay/WxMiniAppPayAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/appPay/WxMiniAppPayAdapterService.java
@@ -348,6 +348,11 @@ public class WxMiniAppPayAdapterService extends BaseWxPayV2AdapterService implem
throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR);
}
+ @Override
+ public void queryItemOrderInfo(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {
+
+ }
+
@Override
public PayAdapterResult queryCpsOrder(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {
return null;
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/maPay/WxMiniMaPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/maPay/WxMiniMaPayAdapterService.java
index 38de01d87..7e60ddd89 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/maPay/WxMiniMaPayAdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/maPay/WxMiniMaPayAdapterService.java
@@ -297,6 +297,11 @@ public class WxMiniMaPayAdapterService extends BaseWxPayV2AdapterService impleme
throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR);
}
+ @Override
+ public void queryItemOrderInfo(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {
+
+ }
+
@Override
public PayAdapterResult queryCpsOrder(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {
return null;
diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/miniApp/appPay/WxMiniAppPayV3AdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/miniApp/appPay/WxMiniAppPayV3AdapterService.java
index 434cec305..fe0d5991e 100644
--- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/miniApp/appPay/WxMiniAppPayV3AdapterService.java
+++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/miniApp/appPay/WxMiniAppPayV3AdapterService.java
@@ -364,6 +364,11 @@ public class WxMiniAppPayV3AdapterService extends BaseWxPayV3AdapterService impl
throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR);
}
+ @Override
+ public void queryItemOrderInfo(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {
+
+ }
+
@Override
public PayAdapterResult queryCpsOrder(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {
return null;
diff --git a/mallinkService/src/main/java/com/iformall/utils/MaUtil.java b/mallinkService/src/main/java/com/iformall/utils/MaUtil.java
index ba7af0025..65c4b4b5a 100644
--- a/mallinkService/src/main/java/com/iformall/utils/MaUtil.java
+++ b/mallinkService/src/main/java/com/iformall/utils/MaUtil.java
@@ -186,6 +186,28 @@ public class MaUtil {
return service;
}
+// public TtPayService getTtPayServiceTest() {
+// //单商户模式
+// TtPayConfig config = new TtPayConfig();
+// config.setAppId("tt48a23e1fd79d648801");
+//
+// config.setPrivateKeyPath("C:/pkcs8.pem");//apiclient_key.pem 应用私钥证书
+// config.setCertSerialNo("1");//证书序列号
+// config.setApiKey("-----BEGIN PUBLIC KEY-----\n" +
+// "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6EoawHdHdB1XtAsjOAJo\n" +
+// "uda/PmNft4f77/9xWraZ8AiLGq7ypXfxh9DJq0nyjlmHjUb6ZthFgS5egsUo3n5+\n" +
+// "pCvw8s0mRKtIMbuORudpao7hT1KhOgkVZP6UgG/QDu4LR4xv70ZcpDqdskOAnpRY\n" +
+// "MEP+ZwfijOqII1DjYbm/xrcXGM7ETg0t/MFtBllZuiHrwquV2rJPR3XAzPdJ6uWz\n" +
+// "ahgaaKLWdtSYOp/Z1CSN11pQIUbr1VrH4HZ+GsHROLKl3pbM9BQQNWxp+BZGqf0h\n" +
+// "bNr8mb01pjzP+uH/8tt2iMdgZp+ZrXOiTlmWyDRVgXlnTWCuBrXk2aV6Flsc1V0f\n" +
+// "jQIDAQAB\n" +
+// "-----END PUBLIC KEY-----");//平台公钥
+//
+// TtPayService service = new TtPayServiceImpl();
+// service.setConfig(config);
+// return service;
+// }
+
private TtMaService getTtappService(WxAppinfo appinfo) {
WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
config.setAppid(appinfo.getAppId());