绑定记录

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

@@ -169,8 +169,10 @@ public class PaymentServiceImpl implements PaymentService {
 
                         userPrePaidBillingRepository.save(bill);
 
-                        if (more != 20 && more != 45 && more != 125 && more != 300)
+                        if (more != 20 && more != 45 && more != 125 && more != 300) {
                             more = 0;
+
+                        }
                         if ((more == 20 && byTradeNo.getAmount() != 100) || (more != 20 && byTradeNo.getAmount() == 100))
                             more = 0;
                         if ((more == 45 && byTradeNo.getAmount() != 200) || (more != 45 && byTradeNo.getAmount() == 200))

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

+package com.edgec.browserbackend.browser.domain;
+
+public class BindHistory {
+    private String shopName;
+    private String ip;
+    private String platform;
+    private String unbindTime;
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public String getIp() {
+        return ip;
+    }
+
+    public void setPlatform(String platform) {
+        this.platform = platform;
+    }
+
+    public String getPlatform() {
+        return platform;
+    }
+
+    public void setIp(String ip) {
+        this.ip = ip;
+    }
+
+    public String getUnbindTime() {
+        return unbindTime;
+    }
+
+    public void setUnbindTime(String unbindTime) {
+        this.unbindTime = unbindTime;
+    }
+}

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

@@ -25,7 +25,7 @@ public class IpResource {
     private long purchasedTime;
     private long validTime;
     private String details;
-    List<String> bindHistory = new ArrayList<>();
+    List<BindHistory> bindHistory = new ArrayList<>();
     private boolean isDeleted;
     private String username;
     private String owner;
@@ -83,11 +83,11 @@ public class IpResource {
         this.ipType = ipType;
     }
 
-    public List<String> getBindHistory() {
+    public List<BindHistory> getBindHistory() {
         return bindHistory;
     }
 
-    public void setBindHistory(List<String> bindHistory) {
+    public void setBindHistory(List<BindHistory> bindHistory) {
         this.bindHistory = bindHistory;
     }
 

src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java

@@ -299,7 +299,7 @@ public class IpResourceServiceImpl implements IpResourceService {
             ipTransactionRepository.save(ipTransaction);
         }
 
-        IpChargeRequestDto ipChargeRequestDto = buildIpChargeRequestDto(ipResourceRequestDto, 0);
+        IpChargeRequestDto ipChargeRequestDto = buildIpChargeRequestDto(ipResourceRequestDto, 1);
         accountService.chargeByMoney(username, newprice * ipChargeRequestDto.getAmount(), ipChargeRequestDto);
         return ipTransactionDto;
     }
@@ -360,7 +360,7 @@ public class IpResourceServiceImpl implements IpResourceService {
                         .map(vendorprice -> vendorprice.substring(vendorprice.lastIndexOf("-") + 1)).collect(Collectors.joining());
 
                 double newprice1 = ipResourceRequestDto.getUnit().equals("week") ? (Integer.valueOf(price)/3) : Integer.valueOf(price);
-                IpChargeRequestDto ipChargeRequestDto = buildIpChargeRequestDto(ipResourceRequestDto, 1);
+                IpChargeRequestDto ipChargeRequestDto = buildIpChargeRequestDto(ipResourceRequestDto, 2);
                 accountService.chargeByMoney(username, newprice1, ipChargeRequestDto);
 
                 ipResource.setValidTime(Instant.parse(x.getValidTill()).toEpochMilli());

src/main/java/com/edgec/browserbackend/browser/service/Impl/ShopServiceImpl.java

@@ -246,8 +246,6 @@ public class ShopServiceImpl implements ShopService {
             shop.setIpId(ipResource.getId());
             shop.setIpRegion(ipResource.getRegion());
             shopRepository.save(shop);
-            List<String> history = ipResource.getBindHistory();
-            history.add(shop.getShopId());
             ipResource.setShopId(shopId);
             if (shop.getShopName()!=null)
                 ipResource.setShopName(shop.getShopName());
@@ -287,6 +285,12 @@ public class ShopServiceImpl implements ShopService {
         if (!ipResource.getId().equals(shop.getIpId()))
             throw new ClientRequestException(BrowserErrorCode.IPNOTBINDTOSHOP);
         try {
+            List<BindHistory> history = ipResource.getBindHistory();
+            BindHistory bindHistory = new BindHistory();
+            bindHistory.setIp(ipResource.getAddr());
+            bindHistory.setPlatform(shop.getShopPlatform());
+            bindHistory.setShopName(shop.getShopName());
+            history.add(bindHistory);
             shop.setIp(null);
             shop.setIpId(null);
             shop.setIpRegion(null);

src/main/java/com/edgec/browserbackend/common/charge/ChargeType.java

@@ -4,8 +4,10 @@ package com.edgec.browserbackend.common.charge;
 
 public interface ChargeType {
 
-    int newip = 0;      // 购买vps， ip
-    int renew = 1;      // 续费ip
-    int payment = 2;    // 充值
+    //0 -- 充值, 1 -- newip, 2 --renew, 3 --ipkeptfee, 4 --deleteip,
+
+    int payment = 0;    // 充值
+    int newip = 1;      // 购买vps， ip
+    int renew = 2;      // 续费ip
 
 }