commit

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

@@ -8,6 +8,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.util.*;
@@ -176,7 +178,7 @@ public class BonusController extends Controller {
                     bonus.setPercentage(10);
                     bonus = repository.save(bonus);
                     if( user.hasFcm() ){
-                        sendNotification(user.getFcm(),"Bonus alert !!","Received bonus of $"+v+" in your account");
+                        sendNotification(user.getFcm(),"Bonus alert !!","Received bonus of $"+formatter.format(v)+" in your account");
                     }
                 }
 
@@ -193,10 +195,9 @@ public class BonusController extends Controller {
     private TbCfUserInfo runBonusInc(TbCfUserInfo user, double amount, int percent,boolean direct,String orderId) {
         if (user == null) return null;
         Optional<Network> userCode = networkRepository.findByNetworkInfoCode(user.getCode());
-        if (userCode.isPresent()) {
-            TbCfUserInfo me = userCode.get().getUserInfo();
+        if (userCode.isPresent() || direct) {
+            TbCfUserInfo userInfo = direct ? user : userCode.get().getUserInfo();
             Bonus bonus = new Bonus();
-            TbCfUserInfo userInfo = direct ? user : me;
             bonus.setUserInfo(userInfo);
             double v = amount * percent / 100;
             bonus.setAmount(v);
@@ -206,10 +207,10 @@ public class BonusController extends Controller {
                 repository.save(bonus);
                 bonus = repository.save(bonus);
                 if( userInfo.hasFcm() ){
-                    sendNotification(userInfo.getFcm(),"Bonus alert !!","Received bonus of $"+v+" in your account");
+                    sendNotification(userInfo.getFcm(),"Bonus alert !!","Received bonus of $"+formatter.format(v)+" in your account");
                 }
             }
-            return me;
+            return userInfo;
         }
 
         return null;

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

@@ -8,6 +8,8 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.web.client.RestTemplate;
 
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
 import java.util.HashMap;
 
 class Controller {
@@ -17,6 +19,7 @@ class Controller {
     }
 
     static int id = 0;
+    NumberFormat formatter = new DecimalFormat("#0.00");
 
     final String serverToken = "AAAAg-FJSfc:APA91bHr7OgmwmcP401YFBJZK_hkeeSO2qbMHXZaJa7Zup9U8dZ8XQqlFnF_z5q5fa9wskRu4PNiK8IMn0lYBjxJgi8srcafC1Mc-p2GU6T8v5kAQKvjwZoDJ_R0PVCvfroX09muIwln";