commit

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

@@ -65,16 +65,16 @@ public class NetworkController {
     @GetMapping(value = "/networksByUserId/{userId}")
     //@PreAuthorize("hasAuthority('ADMIN_USER') or hasAuthority('STANDARD_USER')")
     public List<TbCfUserInfo> getList(@PathVariable(value = "userId") String id, @RequestParam(value = "pageNo") Integer pageNo, @RequestParam(value = "pageSize") Integer pageSize) {
-        
-            List<TbCfUserInfo> collect = repository.findAllByUserInfo_UserIdOrderByIdDesc(id, PageRequest.of(pageNo, pageSize)).toList().stream().map(Network::getNetworkInfo).collect(Collectors.toList());
 
-            for (TbCfUserInfo user : collect){
+            List<TbCfUserInfo> collect = repository.findAllByUserInfo_UserIdOrderByIdDesc(id, PageRequest.of(pageNo, pageSize)).toList().stream().map(Network::getNetworkInfo).collect(Collectors.toList());
 
-                Query nativeQuery = manager.createNativeQuery("select IFNULL(sum(b.amount),0.0) as data FROM bonus b where b.user_info_user_id=:me and b.user_info_user_id IN (SELECT x.user_info_user_id FROM network x WHERE x.network_info_user_id=:id) ");
-                nativeQuery.setParameter("id",user.getUserId());
-                nativeQuery.setParameter("me",id);
-                user.networkAmount = (BigDecimal) nativeQuery.getSingleResult();
-            }
+//            for (TbCfUserInfo user : collect){
+//
+//                Query nativeQuery = manager.createNativeQuery("select IFNULL(sum(b.amount),0.0) as data FROM bonus b where b.user_info_user_id=:me and b.user_info_user_id IN (SELECT x.user_info_user_id FROM network x WHERE x.network_info_user_id=:id) ");
+//                nativeQuery.setParameter("id",user.getUserId());
+//                nativeQuery.setParameter("me",id);
+//                user.networkAmount = (BigDecimal) nativeQuery.getSingleResult();
+//            }
 
             return collect;
     }

src/main/java/com/example/afrishop_v3/models/Bonus.java

 package com.example.afrishop_v3.models;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -81,8 +82,13 @@ public class Bonus extends Model {
         return productSharer;
     }
 
+    @JsonProperty(value = "realAmount")
     public BigDecimal getAmount() {
-        return amount == null ? BigDecimal.ZERO : amount.setScale(2,RoundingMode.UNNECESSARY);
+        return amount;
+    }
+    @JsonProperty(value = "amount")
+    public BigDecimal ceilAmount() {
+        return getAmount() == null ? BigDecimal.ZERO : getAmount().setScale(2, RoundingMode.CEILING);
     }
 
     public void setAmount(BigDecimal amount) {