微信，支付宝充值

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

@@ -10,11 +10,13 @@ import com.alipay.api.response.AlipayTradeQueryResponse;
 import com.edgec.browserbackend.account.exception.AccountErrorCode;
 import com.edgec.browserbackend.account.repository.UserBalanceRepository;
 import com.edgec.browserbackend.account.repository.UserPaymentRepository;
+import com.edgec.browserbackend.account.repository.UserPrePaidBillingRepository;
 import com.edgec.browserbackend.account.service.AccountService;
 import com.edgec.browserbackend.account.service.PaymentService;
 import com.edgec.browserbackend.account.controller.AccountController;
 import com.edgec.browserbackend.account.domain.*;
 import com.edgec.browserbackend.account.service.SmsUtils;
+import com.edgec.browserbackend.account.service.UserPrePaidBillingService;
 import com.edgec.browserbackend.alipay.AlipayConfig;
 import com.edgec.browserbackend.alipay.CloudamAlipayConfig;
 import com.edgec.browserbackend.alipay.VpsAlipayConfig;
@@ -26,6 +28,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.stereotype.Service;
 
+import java.time.Instant;
+import java.time.YearMonth;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -43,6 +47,9 @@ public class PaymentServiceImpl implements PaymentService {
     @Autowired
     private AccountService accountService;
 
+    @Autowired
+    private UserPrePaidBillingRepository userPrePaidBillingRepository;
+
     @Override
     public String wechatPayCallback(String tradno) {
 
@@ -140,6 +147,28 @@ public class PaymentServiceImpl implements PaymentService {
                             balance.setUsername(byTradeNo.getUsername());
                         }
 
+                        UserPrePaidBilling bill = new UserPrePaidBilling();
+                        bill.setChargeType(0);
+                        bill.setAmount(0);
+                        bill.setUnit(null);
+                        bill.setPeriod(0);
+                        bill.setPayMethod(2);
+                        bill.setUsername(byTradeNo.getUsername());
+                        bill.setTotal((float) byTradeNo.getAmount());
+                        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);
+
+                        userPrePaidBillingRepository.save(bill);
+
                         balance.setBalanced(balance.getBalanced() + byTradeNo.getAmount());
                         userBalanceRepository.save(balance);
                     }
@@ -222,6 +251,26 @@ public class PaymentServiceImpl implements PaymentService {
                         balance.setUsername(byTradeNo.getUsername());
                     }
 
+                    UserPrePaidBilling bill = new UserPrePaidBilling();
+                    bill.setChargeType(0);
+                    bill.setAmount(0);
+                    bill.setUnit(null);
+                    bill.setPeriod(0);
+                    bill.setPayMethod(1);
+                    bill.setUsername(byTradeNo.getUsername());
+                    bill.setTotal((float) byTradeNo.getAmount());
+                    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);
+
                     balance.setBalanced(balance.getBalanced() + byTradeNo.getAmount());
                     userBalanceRepository.save(balance);
                 }

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

@@ -199,7 +199,7 @@ public class IpResourceServiceImpl implements IpResourceService {
         }
 
 
-        IpChargeRequestDto ipChargeRequestDto = buildIpChargeRequestDto(ipResourceRequestDto, 0);
+        IpChargeRequestDto ipChargeRequestDto = buildIpChargeRequestDto(ipResourceRequestDto, 1);
         accountService.chargeByMoney(username, Double.valueOf(price), ipChargeRequestDto);
         return ipResourceDtos;
     }
@@ -244,7 +244,7 @@ public class IpResourceServiceImpl implements IpResourceService {
                     .filter(vendorprice -> Vendor.valueOf(ipResourceRequestDto.getVendor()).getValue().equals(vendorprice.substring(0, vendorprice.indexOf("-"))))
                     .map(vendorprice -> vendorprice.substring(vendorprice.lastIndexOf("-") + 1)).collect(Collectors.joining());
 
-            IpChargeRequestDto ipChargeRequestDto = buildIpChargeRequestDto(ipResourceRequestDto, 0);
+            IpChargeRequestDto ipChargeRequestDto = buildIpChargeRequestDto(ipResourceRequestDto, 2);
             accountService.chargeByMoney(username, Double.valueOf(price), ipChargeRequestDto);
 
             ipResource.setValidTime(Instant.parse(x.getValidTill()).toEpochMilli());