|
|
|
@@ -1086,7 +1086,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) |
|
|
|
public WxOrder saveMicroPayOrder(WxMerchantBUser user, String totalFeeStr,EnumPayWay payWay) { |
|
|
|
public WxOrder saveMicroPayOrder(WxMerchantBUser user, String totalFeeStr,EnumPayWay payWay,EnumPayVersion payVersion) { |
|
|
|
// 检查用户 |
|
|
|
if (user == null) { |
|
|
|
logger.error("用户不存在"); |
|
|
|
@@ -1121,6 +1121,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
order.updateTenantInfo(wxMerchant); |
|
|
|
order.setPayment(payment); |
|
|
|
order.setPayVendor(payWay.getCode()); |
|
|
|
order.setPayVersion(payVersion.getCode()); |
|
|
|
order.setOrderType(EnumComposeOrder.SINGLE.getCode()); |
|
|
|
order.setCreateDate(new Date()); |
|
|
|
wxBatchOrderMapper.insert(order); |
|
|
|
@@ -1137,8 +1138,8 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
record.updateTenantInfo(user); |
|
|
|
record.setOrderNumber(orderNumber); |
|
|
|
record.setType(EnumOrderType.MICROPAY.getCode()); |
|
|
|
record.setPayVendor(EnumPayWay.PAY_WAY_WECHAT_MA.getCode()); |
|
|
|
record.setPayVersion(EnumPayVersion.WX_PAY_V2.getCode()); |
|
|
|
record.setPayVendor(payWay.getCode()); |
|
|
|
record.setPayVersion(payVersion.getCode()); |
|
|
|
record.setProductId(user.getId()); |
|
|
|
record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); |
|
|
|
record.setPayment(payment); |
|
|
|
@@ -1194,6 +1195,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
order.updateTenantInfo(wxMerchant); |
|
|
|
order.setPayment(payment); |
|
|
|
order.setPayVendor(EnumPayWay.PAY_WAY_WECHAT_MA.getCode()); |
|
|
|
order.setPayVersion(EnumPayVersion.WX_PAY_V2.getCode()); |
|
|
|
order.setOrderType(EnumComposeOrder.SINGLE.getCode()); |
|
|
|
order.setCreateDate(new Date()); |
|
|
|
wxBatchOrderMapper.insert(order); |
|
|
|
@@ -1250,6 +1252,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
order.updateTenantInfo(merchant); |
|
|
|
order.setPayment(payment); |
|
|
|
order.setPayVendor(EnumPayWay.PAY_WAY_PREPAIDCARD.getCode()); |
|
|
|
order.setPayVersion(EnumPayVersion.NO_VERSION.getCode()); |
|
|
|
order.setOrderType(EnumComposeOrder.SINGLE.getCode()); |
|
|
|
order.setCreateDate(new Date()); |
|
|
|
wxBatchOrderMapper.insert(order); |
|
|
|
|