Merge remote-tracking branch 'origin/test' into test
This commit is contained in:
@@ -583,7 +583,7 @@ public class PayService {
|
|||||||
TbShopUserFlow flow = new TbShopUserFlow();
|
TbShopUserFlow flow = new TbShopUserFlow();
|
||||||
flow.setShopUserId(user.getId());
|
flow.setShopUserId(user.getId());
|
||||||
flow.setBizCode("accountPay");
|
flow.setBizCode("accountPay");
|
||||||
flow.setBizName("会员储值卡支付");
|
flow.setBizName("余额支付");
|
||||||
flow.setType("-");
|
flow.setType("-");
|
||||||
flow.setAmount(payAmount);
|
flow.setAmount(payAmount);
|
||||||
flow.setBalance(user.getAmount());
|
flow.setBalance(user.getAmount());
|
||||||
@@ -708,7 +708,7 @@ public class PayService {
|
|||||||
TbShopUserFlow flow = new TbShopUserFlow();
|
TbShopUserFlow flow = new TbShopUserFlow();
|
||||||
flow.setShopUserId(user.getId());
|
flow.setShopUserId(user.getId());
|
||||||
flow.setBizCode("accountPay");
|
flow.setBizCode("accountPay");
|
||||||
flow.setBizName("会员储值卡支付");
|
flow.setBizName("余额支付");
|
||||||
flow.setType("-");
|
flow.setType("-");
|
||||||
flow.setAmount(orderInfo.getOrderAmount());
|
flow.setAmount(orderInfo.getOrderAmount());
|
||||||
flow.setBalance(user.getAmount());
|
flow.setBalance(user.getAmount());
|
||||||
|
|||||||
Reference in New Issue
Block a user