|
|
@@ -438,7 +438,7 @@ public class LiveOrderServiceImpl extends ServiceImpl<LiveOrderMapper, LiveOrder
|
|
|
// o.setOpenId(user.getMpOpenId());
|
|
|
o.setOrderType(5);
|
|
|
o.setOrderId(order.getOrderId().toString());
|
|
|
- o.setPayType(Arrays.asList(PayType.支付宝条码支付.getCode()));
|
|
|
+ o.setPayType(Arrays.asList(PayType.ALIPAY_BARCODE_PAYMENT.getCode()));
|
|
|
TzBankResult<PayCreateOrderResult> result = tzBankService.createOrder(o);
|
|
|
LiveOrderPayment mt=new LiveOrderPayment();
|
|
|
mt.setPaymentId(storePayment.getPaymentId());
|
|
|
@@ -488,11 +488,11 @@ public class LiveOrderServiceImpl extends ServiceImpl<LiveOrderMapper, LiveOrder
|
|
|
paymentMap.setStatus(1);
|
|
|
paymentMap.setPayTime(new Date());
|
|
|
paymentMap.setTradeNo(tradeNo);
|
|
|
- if(payType.equals(PayType.微信小程序支付.getCode())){
|
|
|
- paymentMap.setPayTypeCode(PayType.微信小程序支付.name());
|
|
|
+ if(payType.equals(PayType.WECHAT_MINI_PROGRAM_PAYMENT.getCode())){
|
|
|
+ paymentMap.setPayTypeCode(PayType.WECHAT_MINI_PROGRAM_PAYMENT.name());
|
|
|
}
|
|
|
- else if(payType.equals(PayType.支付宝条码支付.getCode())){
|
|
|
- paymentMap.setPayTypeCode(PayType.支付宝条码支付.name());
|
|
|
+ else if(payType.equals(PayType.ALIPAY_BARCODE_PAYMENT.getCode())){
|
|
|
+ paymentMap.setPayTypeCode(PayType.ALIPAY_BARCODE_PAYMENT.name());
|
|
|
}
|
|
|
liveOrderPaymentMapper.updateLiveOrderPayment(paymentMap);
|
|
|
order=baseMapper.selectFsUserVipOrderByOrderCode(storePayment.getPayCode());
|