费用明细增加 chargeIp 字段

src/main/java/com/edgec/browserbackend/account/domain/IpChargeRequestDto.java

 package com.edgec.browserbackend.account.domain;
 
+import lombok.Data;
+
+@Data
 public class IpChargeRequestDto {
     private int period;
     private int amount;
     private String region;
-    private String unit="month";
+    private String unit = "month";
 
     private String target;
     //0 -- 充值, 1 -- newip, 2 --renew, 3 -- 退还
@@ -18,83 +21,10 @@ public class IpChargeRequestDto {
 
     private String services;
 
-    public String getServices() {
-        return services;
-    }
-
-    public void setServices(String services) {
-        this.services = services;
-    }
-
-    public String getTradeNo() {
-        return tradeNo;
-    }
-
-    public void setTradeNo(String tradeNo) {
-        this.tradeNo = tradeNo;
-    }
-
-    public float getDaysPerMonth() {
-        return daysPerMonth;
-    }
-
-    public void setDaysPerMonth(float daysPerMonth) {
-        this.daysPerMonth = daysPerMonth;
-    }
-
-    public String getTarget() {
-        return target;
-    }
-
-    public void setTarget(String target) {
-        this.target = target;
-    }
-
-    public int getChargeType() {
-        return chargeType;
-    }
-
-    public void setChargeType(int chargeType) {
-        this.chargeType = chargeType;
-    }
-
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
-    public String getRegion() {
-        return region;
-    }
-
-    public void setRegion(String region) {
-        this.region = region;
-    }
-
-    public int getPeriod() {
-        return period;
-    }
-
-    public void setPeriod(int period) {
-        this.period = period;
-    }
-
-    public int getAmount() {
-        return amount;
-    }
-
-    public void setAmount(int amount) {
-        this.amount = amount;
-    }
+    /**
+     * 续费ip
+     */
+    private String chargeIp;
 
-    public int getPayMethod() {
-        return payMethod;
-    }
 
-    public void setPayMethod(int payMethod) {
-        this.payMethod = payMethod;
-    }
 }

src/main/java/com/edgec/browserbackend/account/domain/IpChargeResultDto.java

 package com.edgec.browserbackend.account.domain;
 
+import lombok.Data;
+
+@Data
 public class IpChargeResultDto {
 
+    /**
+     * 充值状态
+     */
     private boolean success;
-    private int balance;
-    private int approvedAmount;
-
-    public boolean isSuccess() {
-        return success;
-    }
 
-    public void setSuccess(boolean success) {
-        this.success = success;
-    }
-
-    public int getBalance() {
-        return balance;
-    }
-
-    public void setBalance(int balance) {
-        this.balance = balance;
-    }
+    private int balance;
 
-    public int getApprovedAmount() {
-        return approvedAmount;
-    }
+    /**
+     * 到账金额
+     */
+    private int approvedAmount;
 
-    public void setApprovedAmount(int approvedAmount) {
-        this.approvedAmount = approvedAmount;
-    }
 }

src/main/java/com/edgec/browserbackend/account/domain/UserBalance.java

@@ -2,41 +2,27 @@ package com.edgec.browserbackend.account.domain;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
+@Getter
+@Setter
 @Document(collection = "userbalance")
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class UserBalance {
 
+    /**
+     * 用户手机号
+     */
     @Id
     private String username;
 
+    /**
+     * 账户余额
+     */
     private float balanced;
 
     private float used;
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public float    getBalanced() {
-        return balanced;
-    }
-
-    public void setBalanced(float balanced) {
-        this.balanced = balanced;
-    }
-
-    public float getUsed() {
-        return used;
-    }
-
-    public void setUsed(float used) {
-        this.used = used;
-    }
 }

src/main/java/com/edgec/browserbackend/account/domain/UserPrePaidBilling.java

 package com.edgec.browserbackend.account.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import org.apache.commons.lang3.StringUtils;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.index.CompoundIndex;
 import org.springframework.data.mongodb.core.mapping.Document;
@@ -9,6 +10,8 @@ import org.springframework.data.mongodb.core.mapping.Document;
 import java.util.ArrayList;
 import java.util.List;
 
+@Getter
+@Setter
 @Document(collection = "userprepaidbilling")
 @JsonIgnoreProperties(ignoreUnknown = true)
 @CompoundIndex(name = "idx_username_timestamp", def = "{'username': 1, 'timestamp': 1}")
@@ -52,161 +55,11 @@ public class UserPrePaidBilling {
 
     private float balanced;
 
-    private List<DeductionRecord> deductionRecords = new ArrayList<>();
-
-    public float getRate() {
-        return rate;
-    }
-
-    public float getTotal() {
-        return total;
-    }
-
-    public void setRate(float rate) {
-        this.rate = rate;
-    }
-
-    public void setTotal(float total) {
-        this.total = total;
-    }
-
-    public int getChargeType() {
-        return chargeType;
-    }
-
-    public void setChargeType(int chargeType) {
-        this.chargeType = chargeType;
-    }
-
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public int getYear() {
-        return year;
-    }
-
-    public void setYear(int year) {
-        this.year = year;
-    }
-
-    public int getMonth() {
-        return month;
-    }
-
-    public void setMonth(int month) {
-        this.month = month;
-    }
-
-    public long getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(long timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    public Services getServices() {
-        return services;
-    }
+    /**
+     * 购买或者续费的ip 号
+     */
+    private String chargeIp;
 
-    public void setServices(Services services) {
-        this.services = services;
-    }
-
-    public BillStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(BillStatus status) {
-        this.status = status;
-    }
-
-    public boolean isPrepaid() {
-        return isPrepaid;
-    }
-
-    public void setPrepaid(boolean prepaid) {
-        this.isPrepaid = prepaid;
-    }
-
-    public List<DeductionRecord> getDeductionRecords() {
-        return deductionRecords;
-    }
-
-    public void setDeductionRecords(List<DeductionRecord> deductionRecords) {
-        this.deductionRecords = deductionRecords;
-    }
-
-    public void addDeductionRecord(DeductionRecord record) {
-        this.deductionRecords.add(record);
-    }
-
-    public int getAmount() {
-        return amount;
-    }
-
-    public void setAmount(int amount) {
-        this.amount = amount;
-    }
-
-    public int getPeriod() {
-        return period;
-    }
-
-    public void setPeriod(int period) {
-        this.period = period;
-    }
-
-    public int getPayMethod() {
-        return payMethod;
-    }
-
-    public void setPayMethod(int payMethod) {
-        this.payMethod = payMethod;
-    }
-
-    public String getTradeNo() {
-        return tradeNo;
-    }
-
-    public void setTradeNo(String tradeNo) {
-        this.tradeNo = tradeNo;
-    }
-
-    public String getAdministrator() {
-        return administrator;
-    }
-
-    public void setAdministrator(String administrator) {
-        this.administrator = administrator;
-    }
-
-    public float getBalanced() {
-        return balanced;
-    }
+    private List<DeductionRecord> deductionRecords = new ArrayList<>();
 
-    public void setBalanced(float balanced) {
-        this.balanced = balanced;
-    }
 }

src/main/java/com/edgec/browserbackend/account/service/impl/AccountServiceImpl.java

@@ -21,6 +21,7 @@ import com.edgec.browserbackend.browser.service.ShopService;
 import com.edgec.browserbackend.common.commons.error.ClientRequestException;
 import com.edgec.browserbackend.common.utils.Aes;
 import com.edgec.browserbackend.common.utils.FileUtil;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -186,60 +187,77 @@ public class AccountServiceImpl implements AccountService {
     @Override
     public IpChargeResultDto chargeByMoney(String name, double money, IpChargeRequestDto requestDto) {
         IpChargeResultDto charge = new IpChargeResultDto();
-        CompletableFuture.runAsync(() -> {
-            charge.setApprovedAmount(0);
-            charge.setSuccess(true);
+        CompletableFuture.runAsync(
+                () -> {
+                    charge.setApprovedAmount(0);
+                    charge.setSuccess(true);
 
-            Account account = accountRepository.findByName(name).orElseThrow(() -> new ClientRequestException(AccountErrorCode.NAMENOTEXIST));
-            if (account != null) {
-                UserBalance userBalance = userBalanceRepository.findById(name).orElse(null);
-                if (userBalance == null) {
-                    userBalance = new UserBalance();
-                    userBalance.setBalanced(0);
-                    userBalance.setUsed(0);
-                    userBalance.setUsername(name);
-                    userBalanceRepository.save(userBalance);
-                }
+                    Account account = accountRepository.findByName(name).orElseThrow(() -> new ClientRequestException(AccountErrorCode.NAMENOTEXIST));
+                    UserBalance userBalance = userBalanceRepository.findById(name).orElse(null);
 
-                userBalanceRepository.incrementBalance(userBalance, -(float) money, (float) money);
-                userBalance = userBalanceRepository.findById(name).orElse(null);
-
-                charge.setBalance(Math.round(userBalance.getBalanced()));
-                charge.setSuccess(true);
-
-                UserPrePaidBilling bill = new UserPrePaidBilling();
-                if (account.getParent() != null)
-                    bill.setAdministrator(account.getParent());
-                else
-                    bill.setAdministrator(account.getName());
-                bill.setTradeNo(new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + SmsUtils.createRandom(true, 4));
-                bill.setChargeType(requestDto.getChargeType());
-                bill.setAmount(requestDto.getAmount());
-                bill.setUnit(requestDto.getUnit());
-                bill.setPeriod(requestDto.getPeriod());
-                bill.setPayMethod(requestDto.getPayMethod());
-                bill.setUsername(name);
-                bill.setTotal((float) money);
-                bill.setStatus(BillStatus.PAID);
-                bill.setPrepaid(true);
-                bill.setTimestamp(Instant.now().toEpochMilli());
-
-                final YearMonth lastmonth = YearMonth.now();
-
-                int monthValue = lastmonth.getMonthValue();
-                int year = lastmonth.getYear();
-                bill.setYear(year);
-                bill.setMonth(monthValue);
-                bill.setBalanced(userBalance.getBalanced());
-
-                prePaidBillingRepository.save(bill);
-            }
+                    // 如果 userBalance 不存在，则创建
+                    if (userBalance == null) {
+                        userBalance = new UserBalance();
+                        userBalance.setBalanced(0);
+                        userBalance.setUsed(0);
+                        userBalance.setUsername(name);
+                        userBalanceRepository.save(userBalance);
+                    }
 
-        }, AccountServicePool.taskPool).join();
+                    // 更新 userbalance
+                    userBalanceRepository.incrementBalance(userBalance, -(float) money, (float) money);
+
+                    // 获取更新后的 userbalance
+                    userBalance = userBalanceRepository.findById(name).orElse(null);
+
+                    charge.setBalance(Math.round(userBalance.getBalanced()));
+                    charge.setSuccess(true);
+
+                    // 封装 userprepaidbilling 信息 并保存
+                    UserPrePaidBilling bill = getUserPrePaidBilling(name, (float) money, requestDto, account, userBalance);
+                    prePaidBillingRepository.save(bill);
+
+                },
+                AccountServicePool.taskPool
+        ).join();
 
         return charge;
     }
 
+    @NotNull
+    private UserPrePaidBilling getUserPrePaidBilling(String name, float money, IpChargeRequestDto requestDto, Account account, UserBalance userBalance) {
+        UserPrePaidBilling bill = new UserPrePaidBilling();
+        if (account.getParent() != null) {
+            bill.setAdministrator(account.getParent());
+        } else {
+            bill.setAdministrator(account.getName());
+        }
+
+        bill.setTradeNo(new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + SmsUtils.createRandom(true, 4));
+        bill.setChargeType(requestDto.getChargeType());
+        if (requestDto.getChargeIp() != null) {
+            bill.setChargeIp(requestDto.getChargeIp());
+        }
+        bill.setAmount(requestDto.getAmount());
+        bill.setUnit(requestDto.getUnit());
+        bill.setPeriod(requestDto.getPeriod());
+        bill.setPayMethod(requestDto.getPayMethod());
+        bill.setUsername(name);
+        bill.setTotal(money);
+        bill.setStatus(BillStatus.PAID);
+        bill.setPrepaid(true);
+        bill.setTimestamp(Instant.now().toEpochMilli());
+
+        final YearMonth lastmonth = YearMonth.now();
+
+        int monthValue = lastmonth.getMonthValue();
+        int year = lastmonth.getYear();
+        bill.setYear(year);
+        bill.setMonth(monthValue);
+        bill.setBalanced(userBalance.getBalanced());
+        return bill;
+    }
+
     private static final String DEFAULT_REGION_KEY = "--default";
 
     @Override
@@ -253,27 +271,37 @@ public class AccountServiceImpl implements AccountService {
         return "success";
     }
 
+    /**
+     * 封装 预充值扣费 信息
+     */
     @Override
     public IpChargeResultDto preChargeByMoney(String name, double money) {
         IpChargeResultDto precharge = new IpChargeResultDto();
-        CompletableFuture.runAsync(() -> {
-            precharge.setApprovedAmount(0);
-            precharge.setSuccess(false);
-            Account account = accountRepository.findByName(name).orElseThrow(() -> new ClientRequestException(AccountErrorCode.NAMENOTEXIST));
-            if (account != null) {
-                UserBalance userBalance = userBalanceRepository.findById(name).orElse(null);
-                float balance = 0;
-                if (userBalance != null)
-                    balance = userBalance.getBalanced();
-
-                if (balance >= money) {
-                    precharge.setBalance((int) Math.round(balance - money));
-                    precharge.setSuccess(true);
-                } else {
-                    precharge.setBalance(Math.round(balance));
-                }
-            }
-        }, AccountServicePool.taskPool).join();
+        CompletableFuture.runAsync(
+                () -> {
+                    precharge.setApprovedAmount(0);
+                    precharge.setSuccess(false);
+
+                    Account account = accountRepository.findByName(name).orElseThrow(() -> new ClientRequestException(AccountErrorCode.NAMENOTEXIST));
+                    if (account != null) {
+                        UserBalance userBalance = userBalanceRepository.findById(name).orElse(null);
+                        float balance = 0;
+                        if (userBalance != null) {
+                            balance = userBalance.getBalanced();
+                        }
+
+                        // 如果账户余额 比 扣费的 多，则设置为成功，并重新设置账户余额
+                        if (balance >= money) {
+                            precharge.setBalance((int) Math.round(balance - money));
+                            precharge.setSuccess(true);
+                        } else {
+                            // todo 钱不够了，不是应该提示该充值么
+                            precharge.setBalance(Math.round(balance));
+                        }
+                    }
+                },
+                AccountServicePool.taskPool
+        ).join();
 
         return precharge;
     }

src/main/java/com/edgec/browserbackend/browser/domain/IpResource.java

@@ -21,42 +21,129 @@ public class IpResource implements Serializable {
 
     @Id
     private String id;
+
+    /**
+     * ip 地址
+     */
     private String addr;
+
+    /**
+     * ip 类型，默认是 ip代理 模式
+     */
     private IpType ipType = IpType.VENDOR;
+
+    /**
+     * ip 的具体代理使用
+     */
     private Vendor vendor;
     private String vendorCn;
+
+    /**
+     * ip 地域
+     */
     private String region;
     private String regionCn;
-    //0:正常, 1:已过期, 2:即将过期, 3:正在分配, 4:未使用, 5:已失效, 6:未分配, 7:未缴费, 8:分配成功
+
+    /**
+     * ip 的状态
+     * 0:正常, 1:已过期, 2:即将过期, 3:正在分配, 4:未使用, 5:已失效, 6:未分配, 7:未缴费, 8:分配成功
+     */
     private int status;
+
+    /**
+     * ip 端口号
+     */
     private List<String> port;
+
+    /**
+     * ip的购买时间点
+     */
     private long purchasedTime;
+
+    /**
+     * ip的过期的时间点
+     */
     private long validTime;
+
     private String details;
+
+    /**
+     * ip的绑定历史
+     */
     private List<BindHistory> bindHistory = new ArrayList<>();
+
+    /**
+     * ip的状态
+     * 当 ip 资源过期的时候，系统不会直接删除 ip 资源，而是将 isDeleted 设置为 true
+     * 过期7天后再删除这个ip资源
+     */
     private boolean isDeleted;
+
+    /**
+     * 如果 使用的 ip 资源 是在我们系统申请的，则默认为 fangguanlianbrowser
+     */
     private String username;
+
+    /**
+     * ip 资源的购买者（拥有者）
+     */
     private String owner;
+
     private String userParent;
+
+    /**
+     * ip访问协议
+     */
     private List<String> protocol;
     private String password;
     private double price;
 
-    private boolean specialLine; //是否使用专线
-    private boolean usingSpecialLine; //是否正在使用专线
-    //专线数据
-    private String proxyUsername; //专线的代理用户名
-    private String proxyPassword; //专线的代理密码
+    /**
+     * 是否使用专线
+     */
+    private boolean specialLine;
 
+    /**
+     * 是否正在使用专线
+     */
+    private boolean usingSpecialLine;
+
+    /**
+     * 专线的代理用户名
+     */
+    private String proxyUsername;
+
+    /**
+     * 专线的代理密码
+     */
+    private String proxyPassword;
+
+    /**
+     * ip 资源绑定的 商铺号
+     */
     private String shopId;
     private List<String> shopIds = new ArrayList<>();
+
+    /**
+     * 绑定状态
+     */
     private boolean bind;
 
     private boolean isLocked;
     private long lockTimestamp;
     private long healthLockTimestamp;
 
+    /**
+     * 购买方式（按月、按周）
+     */
     private String unit;
+
+    /**
+     * 购买数量
+     * 例如 购买了 2 个月 的 ip资源，则
+     * period：2
+     * unit：month
+     */
     private int period;
 
     @Override

src/main/java/com/edgec/browserbackend/browser/domain/IpType.java

@@ -14,5 +14,5 @@ public enum IpType {
     /**
      * 自有ip，即该ip不是从我们系统购买的
      */
-    OWN;
+    OWN
 }

src/main/java/com/edgec/browserbackend/browser/dto/IpOperationResultDto.java

 package com.edgec.browserbackend.browser.dto;
 
-import java.util.ArrayList;
+import lombok.Data;
+
 import java.util.List;
 
+@Data
 public class IpOperationResultDto {
-    List<String> successList = new ArrayList<>();
-    List<String> failList = new ArrayList<>();
-
-    public List<String> getSuccessList() {
-        return successList;
-    }
-
-    public void setSuccessList(List<String> successList) {
-        this.successList = successList;
-    }
-
-    public List<String> getFailList() {
-        return failList;
-    }
-
-    public void setFailList(List<String> failList) {
-        this.failList = failList;
-    }
+    List<String> successList;
+    List<String> failList;
 }

src/main/java/com/edgec/browserbackend/browser/dto/IpResourceRequestDto.java

@@ -12,7 +12,7 @@ public class IpResourceRequestDto {
     private String name;
     private String region;
     private String regionCn;
-    private String vendor="aliyun";
+    private String vendor = "aliyun";
     private String logintype = "password";
 
     private String shopId;
@@ -23,7 +23,7 @@ public class IpResourceRequestDto {
     @Max(12)
     @Min(1)
     private int period = 1;
-    private String unit="month";
+    private String unit = "month";
     private int amount = 1;
     private boolean autorenew = false;
     private int ipkeptperiod = 7;
@@ -44,6 +44,7 @@ public class IpResourceRequestDto {
 
     private List<String> ipId = new ArrayList<>();
 
+
     public String getName() {
         return name;
     }