update activity

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

@@ -166,7 +166,6 @@ public class ActivityController {
             String type = activity.getType().toString();
             List<Condition> conList = JSONObject.parseArray(activity.getCondition(), Condition.class);
             Collections.sort(conList, Comparator.comparing(Condition::getKey));
-//            BigDecimal finalItemPrice = itemPrice;
 
             map.put("activity", activity);
             if ("1".equals(type) || "2".equals(type)) {
@@ -177,10 +176,11 @@ public class ActivityController {
                     discount = String.valueOf(value);
                     if (itemPrice.compareTo(threshold) < 0) {
                         lessAmount = threshold.subtract(itemPrice);
-                        map.put("discount", discount);
-                        map.put("lessAmount", lessAmount);
+                        map.put("message", "Spend " + lessAmount + " more to Enjoy " + discount + " off!");
+                        break;
+                    } else {
+                        map.put("message", "Congrats, you've got " + discount + " off!");
                     }
-                    break;
                 }
             } else if ("3".equals(type)) {
                 for (Condition con : conList) {
@@ -188,13 +188,15 @@ public class ActivityController {
                     double value = con.getValue();
                     discount = String.valueOf(value);
                     if (itemCount < key) {
-                        map.put("discount", discount);
-                        map.put("lessAmount", key - itemCount);
+                        map.put("message", "Buy " + lessAmount + " more item to Enjoy " + discount + " off!");
+                        break;
+                    } else {
+                        map.put("message", "Congrats, you've got " + discount + " off!");
                     }
-                    break;
                 }
             }
 
+
         }
 
         return new Result(map);