From 4905d22d9e070a68b8bfcf547200cabb079e333c Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 7 Jul 2022 15:57:08 +0800 Subject: [PATCH] //msg ttpay --- .../com/iformall/controller/WxOrderController.java | 6 +++--- .../pay/service/share/douyin/TtPayShareService.java | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index 523e37e88..fef6d7219 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -151,9 +151,9 @@ public class WxOrderController extends BaseController { } catch (Exception e) { return new ResultData(Result.ERROR,e.getMessage()); } - if(EnumPayWay.PAY_WAY_TT.equals(getPayWay())){ - return new ResultData(Result.ERROR,"测试阶段,暂无法支付"); - } +// if(EnumPayWay.PAY_WAY_TT.equals(getPayWay())){ +// return new ResultData(Result.ERROR,"测试阶段,暂无法支付"); +// } List list = new ArrayList<>(); OrderComposeSaveDto dto = new OrderComposeSaveDto(); dto.setSignleOrder(orderSaveDto); diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java index 76f18e3a6..31dc5e1d4 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java @@ -127,12 +127,12 @@ public class TtPayShareService extends PayShareBaseAdapterService{ list.add(settleParams); mall_account += jo.getInteger("amount") - (jo.getInteger("rateAmount") == null?0:jo.getInteger("rateAmount")); } - if(mall_account > 0){ - Map settleParams = new HashMap<>(); - settleParams.put("merchant_uid",payAccount.getSubMchId()); - settleParams.put("amount",mall_account); - list.add(settleParams); - } +// if(mall_account > 0){ +// Map settleParams = new HashMap<>(); +// settleParams.put("merchant_uid",payAccount.getSubMchId()); +// settleParams.put("amount",mall_account); +// list.add(settleParams); +// } request.setSettleParams(JSON.toJSONString(list)); String settleId = ttPayService.getProfitSharingV2Service().profitSharing(request); return new PayShareResult(true, null,"success", null,settleId);