From 4d458e0f1e89d1cebe1be02fafb54455eb4b6343 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 15 Jun 2022 14:22:29 +0800 Subject: [PATCH] //tt product --- .../controller/WxOrderController.java | 9 ++++--- .../controller/callback/TtPayController.java | 27 ++++++++++++++----- 2 files changed, 27 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 07bb123fe..f5201464b 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -172,12 +172,15 @@ public class WxOrderController extends BaseController { logger.info("支付2.0预下单回调---body{}"+body); JSONObject jsonObject = JSONObject.parseObject(body); - String app_id = jsonObject.getString("app_id"); - String open_id = jsonObject.getString("open_id"); + String msg = jsonObject.getString("msg"); + + JSONObject msgObject = JSONObject.parseObject(msg); + String app_id = msgObject.getString("app_id"); + String open_id = msgObject.getString("open_id"); //透传字段 Map couponMap = new HashMap<>(); try{ - String cp_extra = jsonObject.getString("cp_extra"); + String cp_extra = msgObject.getString("cp_extra"); if(StringUtils.isBlank(cp_extra)){ map.put("err_no",ErrorCode.SYS_PARAMETER_NOT_NULL.getCode()); map.put("err_tips","缺少透传字段"); diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java index ad61419aa..3d8c83f04 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java @@ -102,9 +102,10 @@ public class TtPayController extends BaseController { String appid; WxAppinfo appinfo; WxPayAccount payAccount; - String out_order_no; + Boolean is2_0 = false; if(StringUtils.isNotBlank(version) && "2.0".equals(version)){//支付2.0 回调 + is2_0 = true; String msgSignature = request.getHeader("Byte-Signature"); String timestamp = request.getHeader("Byte-Timestamp"); String nonce = request.getHeader("Byte-Nonce-Str"); @@ -126,7 +127,6 @@ public class TtPayController extends BaseController { } logger.info("抖音通知(2.0)-----{}签名效验成功"); - out_order_no = (String)pMap.get("out_order_no"); }else{ String msgSignature = (String) parameterMap.get("msg_signature"); @@ -150,11 +150,16 @@ public class TtPayController extends BaseController { } logger.info("抖音通知-----{}签名效验成功"); - out_order_no = (String) pMap.get("cp_orderno"); } if("payment".equals(type)){//支付回调 + String out_order_no; + if(is2_0){ + out_order_no = (String)pMap.get("out_order_no"); + }else{ + out_order_no = (String) pMap.get("cp_orderno"); + } String way = (String) pMap.get("way");//2-支付宝,1-微信 if (!StringUtils.isNotBlank(out_order_no)) { try { @@ -187,9 +192,17 @@ public class TtPayController extends BaseController { resultMap.put("err_no",0); resultMap.put("err_tips","success"); }else if("refund".equals(type)){//退款回调 - String cp_refundno = (String) pMap.get("cp_refundno"); - String status = (String) pMap.get("status"); - Integer refund_amount = (Integer) pMap.get("refund_amount"); + String cp_refundno,status; + Integer refund_amount; + if(is2_0){ + cp_refundno = (String) pMap.get("out_refund_no"); + status = (String) pMap.get("status"); + refund_amount = (Integer) pMap.get("refund_total_amount"); + }else{ + cp_refundno = (String) pMap.get("cp_refundno"); + status = (String) pMap.get("status"); + refund_amount = (Integer) pMap.get("refund_amount"); + } Map map = new HashMap<>(); map.put("appid",appid); @@ -211,6 +224,8 @@ public class TtPayController extends BaseController { resultMap.put("err_no",0); resultMap.put("err_tips","success"); + }else if("settle".equals(type)){ + } return resultMap;