|
|
@@ -1784,7 +1784,7 @@ public class PosServiceImpl implements PosService { |
|
|
String buUserIdStr = params.get(WxPayConstant.BUSER_ID); // POS操作员ID |
|
|
String buUserIdStr = params.get(WxPayConstant.BUSER_ID); // POS操作员ID |
|
|
String cuUserIdStr = params.get(WxPayConstant.MEM_ID); // 富茂系统会员ID |
|
|
String cuUserIdStr = params.get(WxPayConstant.MEM_ID); // 富茂系统会员ID |
|
|
String cuPhoneStr = params.get(WxPayConstant.MEM_PHONE); // 富茂系统会员手机号 |
|
|
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 posOrderIdStr = params.get(WxPayConstant.POS_ORDER_ID); // POS订单ID |
|
|
String posOrderTimeStr = params.get(WxPayConstant.POS_ORDER_TIME); // POS订单时间 |
|
|
String posOrderTimeStr = params.get(WxPayConstant.POS_ORDER_TIME); // POS订单时间 |
|
|
String posAmountStr = params.get(WxPayConstant.ORDER_AMOUNT); // POS订单总额 |
|
|
String posAmountStr = params.get(WxPayConstant.ORDER_AMOUNT); // POS订单总额 |
|
|
@@ -1855,9 +1855,17 @@ public class PosServiceImpl implements PosService { |
|
|
WxMerchantBUser merchantBUser = checkAndGetMerchantUser(buUserId, merchantId); |
|
|
WxMerchantBUser merchantBUser = checkAndGetMerchantUser(buUserId, merchantId); |
|
|
// 4. 同步 |
|
|
// 4. 同步 |
|
|
if (posStatusStr.equalsIgnoreCase(WxPayConstant.NEU_ORDER_PAY)) { |
|
|
if (posStatusStr.equalsIgnoreCase(WxPayConstant.NEU_ORDER_PAY)) { |
|
|
|
|
|
String payDetail = params.get(WxPayConstant.PAY_DETAIL); |
|
|
|
|
|
if (StringUtils.isBlank(posStatusStr)) { |
|
|
|
|
|
errParam(WxPayConstant.PAYMENT_DETAIL); |
|
|
|
|
|
} |
|
|
// 4.1 支付同步 |
|
|
// 4.1 支付同步 |
|
|
syncOrder(params, merchant, merchantBUser, iSceneType, posOrderId, memId, posAmount, orderTime, orderCreateSN); |
|
|
syncOrder(params, merchant, merchantBUser, iSceneType, posOrderId, memId, posAmount, orderTime, orderCreateSN); |
|
|
} else if (posStatusStr.equalsIgnoreCase(WxPayConstant.NEU_ORDER_REFUND)) { |
|
|
} 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); |
|
|
syncRefundOrder(params, merchantBUser, iSceneType, posOrderId, memId, posAmount, orderTime, orderCreateSN); |
|
|
} |
|
|
} |
|
|
|