Merge remote-tracking branch 'origin/test' into test
This commit is contained in:
@@ -499,6 +499,7 @@ public class PayService {
|
|||||||
String userId = String.valueOf(TokenUtil.getUserId());
|
String userId = String.valueOf(TokenUtil.getUserId());
|
||||||
TbOrderPayment payment = createOrderPayment(orderInfo, payDTO.getPayType());
|
TbOrderPayment payment = createOrderPayment(orderInfo, payDTO.getPayType());
|
||||||
|
|
||||||
|
orderInfo.setPayType(payDTO.getPayType());
|
||||||
if ("ysk".equals(thirdPayType)) {
|
if ("ysk".equals(thirdPayType)) {
|
||||||
return Result.successWithData(yskPay(thirdApply, orderInfo, payment, openId, userId, ip));
|
return Result.successWithData(yskPay(thirdApply, orderInfo, payment, openId, userId, ip));
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user