| @@ -447,7 +447,8 @@ public class WxMicroPayController extends BaseController { | |||||
| if (wxCouponOrder != null) { | if (wxCouponOrder != null) { | ||||
| try { | try { | ||||
| couponPayOrder = wxCouponOrderService.microPayPreVerify(microOrder, wxCouponOrder, wxMerchantBUser, payPrice,payWay,ipStr,authCode); | couponPayOrder = wxCouponOrderService.microPayPreVerify(microOrder, wxCouponOrder, wxMerchantBUser, payPrice,payWay,ipStr,authCode); | ||||
| remainPrice = microOrder.getPayment() - couponPayOrder.getPayAmount(); | |||||
| //remainPrice = microOrder.getPayment() - couponPayOrder.getPayAmount(); | |||||
| remainPrice = couponPayOrder.getPayAmount(); | |||||
| // 更新实际支付金额 | // 更新实际支付金额 | ||||
| WxOrder updateOrder = new WxOrder(); | WxOrder updateOrder = new WxOrder(); | ||||
| updateOrder.setId(microOrder.getId()); | updateOrder.setId(microOrder.getId()); | ||||
| @@ -1370,11 +1370,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| setPayOrderNo(String.valueOf(payOrderId)); | setPayOrderNo(String.valueOf(payOrderId)); | ||||
| setIp(ipstr); | setIp(ipstr); | ||||
| setAuthCode(authCode); | setAuthCode(authCode); | ||||
| if (microOrder.getPayment() > wxCoupon.getPrice()) { | |||||
| setPayAmount(wxCoupon.getPrice()); | |||||
| } else { | |||||
| setPayAmount(microOrder.getPayment()); | |||||
| } | |||||
| setPayAmount(microOrder.getPayment() - wxCoupon.getPrice()); | |||||
| // if (microOrder.getPayment() > wxCoupon.getPrice()) { | |||||
| // setPayAmount(wxCoupon.getPrice()); | |||||
| // } else { | |||||
| // setPayAmount(microOrder.getPayment()); | |||||
| // } | |||||
| setPayVendor(payWay.getCode()); | setPayVendor(payWay.getCode()); | ||||
| setPayOrderStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); | setPayOrderStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); | ||||
| setShare(EnumPayShare.NO.getCode()); | setShare(EnumPayShare.NO.getCode()); | ||||