|
|
|
@@ -1244,7 +1244,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) |
|
|
|
public WxPayOrder microPayPreVerify(WxOrder microOrder, WxCouponOrder couponOrder, WxMerchantBUser bUser, Integer payPrice, EnumPayWay payWay) { |
|
|
|
public WxPayOrder microPayPreVerify(WxOrder microOrder, WxCouponOrder couponOrder, WxMerchantBUser bUser, Integer payPrice, EnumPayWay payWay,String ipstr,String authCode) { |
|
|
|
// 1. 获取券信息 |
|
|
|
WxCoupon wxCoupon = wxCouponMapper.selectById(couponOrder.getCouponId()); |
|
|
|
if (wxCoupon == null) { |
|
|
|
@@ -1368,6 +1368,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
setPayTimeStart(curDate); |
|
|
|
setPayTimeEnd(curDate); |
|
|
|
setPayOrderNo(String.valueOf(payOrderId)); |
|
|
|
setIp(ipstr); |
|
|
|
setAuthCode(authCode); |
|
|
|
if (microOrder.getPayment() > wxCoupon.getPrice()) { |
|
|
|
setPayAmount(wxCoupon.getPrice()); |
|
|
|
} else { |
|
|
|
|