From 7265489d49f986f147c0104ee12b7ffaf6795a8a Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 30 Mar 2020 11:14:20 +0800 Subject: [PATCH] =?UTF-8?q?[POS][=E4=BF=AE=E6=94=B9]:=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/PosController.java | 4 ++++ .../java/com/iformall/service/impl/PosServiceImpl.java | 10 +++++++++- .../src/main/java/com/iformall/pay/WxPayConstant.java | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java b/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java index 328ff0840..499d0e5e2 100644 --- a/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java +++ b/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java @@ -298,6 +298,10 @@ public class PosController extends BaseController { "\"order_amount\":\"string单位(分)(必填)\"," + "\"order_amount_left\":\"string单位(分)(选填)\"," + "\"order_create_sn\":\"string单位(分)(必填)\"," + + "\"payment_detail\":{支付时必填...." + + "}" + + "\"refund_detail\":{退款时必填...." + + "}" + "\"payment_info\":{" + "\"card_id\":\"string(必填)\"," + "\"card_spend_id\":\"string(必填)\"," + diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index f8de6e1c0..ffab6c2d6 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -1784,7 +1784,7 @@ public class PosServiceImpl implements PosService { String buUserIdStr = params.get(WxPayConstant.BUSER_ID); // POS操作员ID String cuUserIdStr = params.get(WxPayConstant.MEM_ID); // 富茂系统会员ID String cuPhoneStr = params.get(WxPayConstant.MEM_PHONE); // 富茂系统会员手机号 - String sceneTypeStr = params.get(WxPayConstant.SCENE_TYPE); // 场景类型 + String sceneTypeStr = params.get(WxPayConstant.SCENE_TYPE); // 场景类型 String posOrderIdStr = params.get(WxPayConstant.POS_ORDER_ID); // POS订单ID String posOrderTimeStr = params.get(WxPayConstant.POS_ORDER_TIME); // POS订单时间 String posAmountStr = params.get(WxPayConstant.ORDER_AMOUNT); // POS订单总额 @@ -1855,9 +1855,17 @@ public class PosServiceImpl implements PosService { WxMerchantBUser merchantBUser = checkAndGetMerchantUser(buUserId, merchantId); // 4. 同步 if (posStatusStr.equalsIgnoreCase(WxPayConstant.NEU_ORDER_PAY)) { + String payDetail = params.get(WxPayConstant.PAY_DETAIL); + if (StringUtils.isBlank(posStatusStr)) { + errParam(WxPayConstant.PAYMENT_DETAIL); + } // 4.1 支付同步 syncOrder(params, merchant, merchantBUser, iSceneType, posOrderId, memId, posAmount, orderTime, orderCreateSN); } else if (posStatusStr.equalsIgnoreCase(WxPayConstant.NEU_ORDER_REFUND)) { + String payDetail = params.get(WxPayConstant.NEU_REFUND_DETAIL); + if (StringUtils.isBlank(posStatusStr)) { + errParam(WxPayConstant.REFUND_DETAIL); + } // 退款同步 syncRefundOrder(params, merchantBUser, iSceneType, posOrderId, memId, posAmount, orderTime, orderCreateSN); } diff --git a/mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java b/mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java index 99d482895..ff0fb12d0 100644 --- a/mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java +++ b/mallinkService/src/main/java/com/iformall/pay/WxPayConstant.java @@ -114,6 +114,9 @@ public class WxPayConstant { public final static String REMAIN_AMOUNT = "remain_amount"; public final static String ORDER_STATUS = "order_status"; + public final static String PAYMENT_DETAIL = "payment_detail"; + public final static String REFUND_DETAIL = "refund_detail"; + public final static String POINT = "point"; public final static String CREDIT = "credit";