update

src/main/java/com/example/afrishop_v3/controllers/FlutterWaveController.java

@@ -358,36 +358,35 @@ public class FlutterWaveController extends Controller {
         return result;
     }
 
-    public Result saveNetworkMarketing(Bonus bonus,String userId) {
+    public void saveNetworkMarketing(Bonus bonus, String userId) {
 
-        TbCfUserInfo info = user.user();
-
-//        Optional<String> userIdOptional = userId;
-        System.out.println("userId=="+userId);
         String orderId = bonus.getOrderId();
 
         if (orderId == null)
-            return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(), "Order is missing !!!");
+            logger.info("佣金：orderId为空");
 
         Optional<TbCfOrder> orderOptional = orderRepository.findById(orderId);
 
         if (!orderOptional.isPresent())
-            return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(), "Order is missing !!!");
+            logger.info("佣金：订单不存在");
 
         TbCfOrder order = orderOptional.get();
 
         if (!OrderStatusEnum.PAID.getValue().equals(order.getPayStatus())) {
-            return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(), "Invalid order status");
+            logger.info("佣金：订单未支付");
         }
 
-        if (bonusRepository.existsByOrderId(orderId)) {
-            return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(), "Transaction already done !!!");
-        }
+        boolean condition = orderId != null && orderOptional.isPresent() && OrderStatusEnum.PAID.getValue().equals(order.getPayStatus()) && !StringUtils.isBlank(userId);
+
+//        if (bonusRepository.existsByOrderId(orderId)) {
+//            return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(), "Transaction already done !!!");
+//        }
 
 
         BigDecimal amount = bonus.getAmount();
 
-        if (!StringUtils.isBlank(userId)) {
+        if (condition) {
+
 
             Optional<TbCfUserInfo> optionalUser = userRepository.findById(userId);
 
@@ -406,27 +405,28 @@ public class FlutterWaveController extends Controller {
                 if (productSharer != null) {
                     sharer = userRepository.findByCode(productSharer);
                 }
-
-
-                if (user.invited()) {
-                    BigDecimal v = amount.multiply(BigDecimal.valueOf(10)).divide(BigDecimal.valueOf(100), RoundingMode.CEILING);
-                    bonus.setAmount(v);
-                    bonus.setUserInfo(user);
-                    bonus.setPercentage(10);
-                    bonus = bonusRepository.save(bonus);
-                    if (user.hasFcm()) {
-                        sendNotification(user.getFcm(), "Bonus alert !!", user.display() + ", You received bonus of $" + formatter.format(v) + " in your account");
+                synchronized (this) {
+                    boolean exists = bonusRepository.existsByOrderId(orderId);
+                    if (!exists && user.invited()) {
+                        BigDecimal v = amount.multiply(BigDecimal.valueOf(10)).divide(BigDecimal.valueOf(100), RoundingMode.CEILING);
+                        bonus.setAmount(v);
+                        bonus.setUserInfo(user);
+                        bonus.setPercentage(10);
+                        bonus = bonusRepository.save(bonus);
+                        if (user.hasFcm()) {
+                            sendNotification(user.getFcm(), "Bonus alert !!", user.display() + ", You received bonus of $" + formatter.format(v) + " in your account");
+                        }
                     }
                 }
-
-
                 TbCfUserInfo bonusInc = runBonusInc(user, amount, 5, false, orderId);
                 runBonusInc(sharer.orElseGet(() -> postOptional.isPresent() ? postOptional.get().getRealUser() : bonusInc), amount, 5, postOptional.isPresent() || sharer.isPresent(), orderId);
                 //runBonusInc(bonusInc, amount, 0);
+
             }
+
         }
 
-        return new Result<>(bonus);
+
     }
 
     private TbCfUserInfo runBonusInc(TbCfUserInfo user, BigDecimal amount, int percent, boolean direct, String orderId) {

src/main/java/com/example/afrishop_v3/controllers/PaypalContoller.java

@@ -286,36 +286,35 @@ public class PaypalContoller extends Controller {
         return now;
     }
 
-    public Result saveNetworkMarketing(Bonus bonus, String userId) {
+    public void saveNetworkMarketing(Bonus bonus, String userId) {
 
-//        TbCfUserInfo info = user.user();
-
-//        Optional<String> userIdOptional = userId;
-        System.out.println("userId=="+userId);
         String orderId = bonus.getOrderId();
 
         if (orderId == null)
-            return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(), "Order is missing !!!");
+            logger.info("佣金：orderId为空");
 
         Optional<TbCfOrder> orderOptional = orderRepository.findById(orderId);
 
         if (!orderOptional.isPresent())
-            return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(), "Order is missing !!!");
+            logger.info("佣金：订单不存在");
 
         TbCfOrder order = orderOptional.get();
 
         if (!OrderStatusEnum.PAID.getValue().equals(order.getPayStatus())) {
-            return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(), "Invalid order status");
+            logger.info("佣金：订单未支付");
         }
 
-        if (bonusRepository.existsByOrderId(orderId)) {
-            return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(), "Transaction already done !!!");
-        }
+        boolean condition = orderId != null && orderOptional.isPresent() && OrderStatusEnum.PAID.getValue().equals(order.getPayStatus()) && !StringUtils.isBlank(userId);
+
+//        if (bonusRepository.existsByOrderId(orderId)) {
+//            return new Result(ResultCodeEnum.VALIDATE_ERROR.getCode(), "Transaction already done !!!");
+//        }
 
 
         BigDecimal amount = bonus.getAmount();
 
-        if (!StringUtils.isBlank(userId)) {
+        if (condition) {
+
 
             Optional<TbCfUserInfo> optionalUser = userRepository.findById(userId);
 
@@ -334,29 +333,29 @@ public class PaypalContoller extends Controller {
                 if (productSharer != null) {
                     sharer = userRepository.findByCode(productSharer);
                 }
-
-
-                if (user.invited()) {
-                    BigDecimal v = amount.multiply(BigDecimal.valueOf(10)).divide(BigDecimal.valueOf(100), RoundingMode.CEILING);
-                    bonus.setAmount(v);
-                    bonus.setUserInfo(user);
-                    bonus.setPercentage(10);
-                    bonus = bonusRepository.save(bonus);
-                    if (user.hasFcm()) {
-                        sendNotification(user.getFcm(), "Bonus alert !!", user.display() + ", You received bonus of $" + formatter.format(v) + " in your account");
+                synchronized (this) {
+                    boolean exists = bonusRepository.existsByOrderId(orderId);
+                    if (!exists && user.invited()) {
+                        BigDecimal v = amount.multiply(BigDecimal.valueOf(10)).divide(BigDecimal.valueOf(100), RoundingMode.CEILING);
+                        bonus.setAmount(v);
+                        bonus.setUserInfo(user);
+                        bonus.setPercentage(10);
+                        bonus = bonusRepository.save(bonus);
+                        if (user.hasFcm()) {
+                            sendNotification(user.getFcm(), "Bonus alert !!", user.display() + ", You received bonus of $" + formatter.format(v) + " in your account");
+                        }
                     }
                 }
-
-
                 TbCfUserInfo bonusInc = runBonusInc(user, amount, 5, false, orderId);
                 runBonusInc(sharer.orElseGet(() -> postOptional.isPresent() ? postOptional.get().getRealUser() : bonusInc), amount, 5, postOptional.isPresent() || sharer.isPresent(), orderId);
                 //runBonusInc(bonusInc, amount, 0);
+
             }
+
         }
 
-        return new Result<>(bonus);
-    }
 
+    }
     private TbCfUserInfo runBonusInc(TbCfUserInfo user, BigDecimal amount, int percent, boolean direct, String orderId) {
         if (user == null) return null;
         Optional<Network> userCode = networkRepository.findByNetworkInfoCode(user.getCode());