|
|
|
@@ -386,11 +386,11 @@ public class WxMicroPayController extends BaseController { |
|
|
|
String couponOrderIdStr = paramMap.get("couponOrderId"); |
|
|
|
String authCode = paramMap.get("authCode"); |
|
|
|
String payPriceStr = paramMap.get("payPrice"); |
|
|
|
return saveMicopayPayOrder(orderIdStr, couponOrderIdStr, authCode, payPriceStr, EnumPayWay.PAY_WAY_WECHAT_MA, request); |
|
|
|
return saveMicopayPayOrder(orderIdStr, couponOrderIdStr, authCode, payPriceStr, EnumPayWay.PAY_WAY_WECHAT_MA,EnumPayVersion.WX_PAY_V2, request); |
|
|
|
} |
|
|
|
|
|
|
|
private ResultData saveMicopayPayOrder(String orderIdStr,String couponOrderIdStr,String authCode,String payPriceStr, |
|
|
|
EnumPayWay payWay, HttpServletRequest request) { |
|
|
|
EnumPayWay payWay,EnumPayVersion payVersion, HttpServletRequest request) { |
|
|
|
WxMerchantBUser user = getLoginBUser(); |
|
|
|
if (StringUtils.isBlank(orderIdStr)) { |
|
|
|
logger.error("orderId不能为空"); |
|
|
|
@@ -456,7 +456,7 @@ public class WxMicroPayController extends BaseController { |
|
|
|
Integer remainPrice = payPrice; |
|
|
|
if (wxCouponOrder != null) { |
|
|
|
try { |
|
|
|
couponPayOrder = wxCouponOrderService.microPayPreVerify(composeOrder, wxCouponOrder, wxMerchantBUser, payPrice,payWay,ipStr,authCode); |
|
|
|
couponPayOrder = wxCouponOrderService.microPayPreVerify(composeOrder, wxCouponOrder, wxMerchantBUser, payPrice,payWay,payVersion,ipStr,authCode); |
|
|
|
//remainPrice = microOrder.getPayment() - couponPayOrder.getPayAmount(); |
|
|
|
remainPrice = couponPayOrder.getPayAmount(); |
|
|
|
// 更新实际支付金额 |
|
|
|
|