payback

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

@@ -266,7 +266,7 @@ public class PaymentServiceImpl implements PaymentService {
 
             boolean isVpsClient = true;
 
-            AlipayConfig alipayConfig = isVpsClient ? new VpsAlipayConfig() : new CloudamAlipayConfig();
+            AlipayConfig alipayConfig = new VpsAlipayConfig();
             AlipayClient alipayClient = new DefaultAlipayClient(alipayConfig.getURL(), alipayConfig.getAPPID(), alipayConfig.getAPP_PRIVATE_KEY(),
                     "json", alipayConfig.getCHARSET(), alipayConfig.getALIPAY_PUBLIC_KEY(), alipayConfig.getSIGN_TYPE());
 
@@ -757,9 +757,12 @@ public class PaymentServiceImpl implements PaymentService {
                             balance = new UserBalance();
                             balance.setUsername(byTradeNo.getUsername());
                         }
-
-                        balance.setBalanced(balance.getBalanced() + byTradeNo.getAmount());
-                        userBalanceRepository.save(balance);
+                        // 充值返现
+                        PayBack payBack = payBackRepository.findByPay(byTradeNo.getAmount());
+                        if (payBack == null)
+                            payBack = new PayBack();
+                        balance.setBalanced(balance.getBalanced() + byTradeNo.getAmount() + payBack.getBack());
+                        balance = userBalanceRepository.save(balance);
                     }
 
                     result.setBalance(Math.round(balance.getBalanced()));
@@ -800,7 +803,7 @@ public class PaymentServiceImpl implements PaymentService {
 
             boolean isVpsClient = true;
 
-            AlipayConfig alipayConfig = isVpsClient ? new VpsAlipayConfig() : new CloudamAlipayConfig();
+            AlipayConfig alipayConfig = new VpsAlipayConfig();
             AlipayClient alipayClient = new DefaultAlipayClient(alipayConfig.getURL(), alipayConfig.getAPPID(), alipayConfig.getAPP_PRIVATE_KEY(),
                     "json", alipayConfig.getCHARSET(), alipayConfig.getALIPAY_PUBLIC_KEY(), alipayConfig.getSIGN_TYPE());
 
@@ -821,13 +824,17 @@ public class PaymentServiceImpl implements PaymentService {
                 boolean b = userPaymentRepository.updatePaymentResult(byTradeNo, true);
 
                 if (b) {
+
                     if (balance == null) {
                         balance = new UserBalance();
                         balance.setUsername(byTradeNo.getUsername());
                     }
-
-                    balance.setBalanced(balance.getBalanced() + byTradeNo.getAmount());
-                    userBalanceRepository.save(balance);
+                    // 充值返现
+                    PayBack payBack = payBackRepository.findByPay(byTradeNo.getAmount());
+                    if (payBack == null)
+                        payBack = new PayBack();
+                    balance.setBalanced(balance.getBalanced() + byTradeNo.getAmount() + payBack.getBack());
+                    balance = userBalanceRepository.save(balance);
                 }
 
                 result.setBalance(Math.round(balance.getBalanced()));