Commit ba666a93 authored by xuxin's avatar xuxin

修改用户使用赠送的16元的支付方式

parent b9eb3cb1
...@@ -101,7 +101,7 @@ public class AdministratorController { ...@@ -101,7 +101,7 @@ public class AdministratorController {
public HashMap bankTransferInsert(@RequestBody UserBalance userBalance) { public HashMap bankTransferInsert(@RequestBody UserBalance userBalance) {
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
try { try {
map.put("userbalance", paymentService.bankTransferInsertion(userBalance.getUsername(), (int) userBalance.getBalanced())); map.put("userbalance", paymentService.bankTransferInsertion(userBalance.getUsername(), (int) userBalance.getBalanced(), 3));
map.put("status", "success"); map.put("status", "success");
} catch (Exception e) { } catch (Exception e) {
map.put("status", "failed"); map.put("status", "failed");
......
...@@ -41,7 +41,7 @@ public class UserPrePaidBilling { ...@@ -41,7 +41,7 @@ public class UserPrePaidBilling {
private BillStatus status; private BillStatus status;
/** /**
* 0 -- 余额, 1 -- 支付宝, 2 -- 微信, 3 -- 银行转账 * 0 -- 余额, 1 -- 支付宝, 2 -- 微信, 3 -- 银行转账, 4--注册时赠送
*/ */
private int payMethod; private int payMethod;
......
...@@ -18,7 +18,7 @@ public interface PaymentService { ...@@ -18,7 +18,7 @@ public interface PaymentService {
void alipaCallback(String tradno); void alipaCallback(String tradno);
UserBalance bankTransferInsertion(String username, int amount); UserBalance bankTransferInsertion(String username, int amount, int payMethod);
UserPaymentDto h5wxPayOrder(String ip, String username, int amount); UserPaymentDto h5wxPayOrder(String ip, String username, int amount);
......
...@@ -477,7 +477,7 @@ public class AccountServiceImpl implements AccountService { ...@@ -477,7 +477,7 @@ public class AccountServiceImpl implements AccountService {
list.add("184"); list.add("184");
list.add("170"); list.add("170");
if (!StringUtils.isEmpty(account.getPhoneNumber()) && !list.contains(account.getPhoneNumber().substring(0, 3)) && inviter != null) { if (!StringUtils.isEmpty(account.getPhoneNumber()) && !list.contains(account.getPhoneNumber().substring(0, 3)) && inviter != null) {
paymentService.bankTransferInsertion(account.getName(), globalFieldRepository.findAll().get(0).getRegisterGift()); paymentService.bankTransferInsertion(account.getName(), globalFieldRepository.findAll().get(0).getRegisterGift(), 4);
} }
log.info("new account has been created: " + account.getName()); log.info("new account has been created: " + account.getName());
......
...@@ -310,7 +310,7 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -310,7 +310,7 @@ public class PaymentServiceImpl implements PaymentService {
} }
@Override @Override
public UserBalance bankTransferInsertion(String username, int amount) { public UserBalance bankTransferInsertion(String username, int amount, int payMethod) {
UserPayment bankOrder = new UserPayment(); UserPayment bankOrder = new UserPayment();
bankOrder.setUsername(username); bankOrder.setUsername(username);
...@@ -332,7 +332,7 @@ public class PaymentServiceImpl implements PaymentService { ...@@ -332,7 +332,7 @@ public class PaymentServiceImpl implements PaymentService {
bill.setAmount(0); bill.setAmount(0);
bill.setUnit(null); bill.setUnit(null);
bill.setPeriod(0); bill.setPeriod(0);
bill.setPayMethod(3); bill.setPayMethod(payMethod);
bill.setUsername(username); bill.setUsername(username);
bill.setTotal((float) amount); bill.setTotal((float) amount);
bill.setStatus(BillStatus.PAID); bill.setStatus(BillStatus.PAID);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment