update activity

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

@@ -150,7 +150,7 @@ public class ActivityController {
             Optional<TbCfCartRecordR> byId = cartRecordRRepository.findById(cartId);
             if (byId.isPresent()) {
                 TbCfCartRecordR cart = byId.get();
-                itemPrice = itemPrice.add(cart.getItemPrice());
+                itemPrice = itemPrice.add(cart.getItemPrice().multiply(new BigDecimal(cart.getItemNum())));
                 itemCount += cart.getItemNum();
 //                String itemId = cart.getItemId();
 //                activity = checkActivity(itemId);
@@ -183,10 +183,10 @@ public class ActivityController {
                     if (itemPrice.compareTo(threshold) < 0) {
                         lessAmount = threshold.subtract(itemPrice);
 
-                        map.put("message", "Spend " + lessAmount + " more to Enjoy " + msg + " off!");
+                        map.put("message", "Spend " + lessAmount + " more to Enjoy " + msg + " off !");
                         break;
                     } else {
-                        map.put("message", "Congrats, you've got " + msg + " off!");
+                        map.put("message", "Congrats, you've got " + msg + " off !");
                     }
                 }
             } else if ("3".equals(type)) {
@@ -195,10 +195,10 @@ public class ActivityController {
                     double value = con.getValue();
                     discount = String.valueOf(value);
                     if (itemCount < key) {
-                        map.put("message", "Buy " + key + " more item to Enjoy " + discount + "% off!");
+                        map.put("message", "Buy " + (key-itemCount) + " more item to Enjoy " + discount + "% off !");
                         break;
                     } else {
-                        map.put("message", "Congrats, you've got " + discount + "% off!");
+                        map.put("message", "Congrats, you've got " + discount + "% off !");
                     }
                 }
             }

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

@@ -208,6 +208,14 @@ public class TbCfOrder {
         this.orderTime = new Date();
     }
 
+    public BigDecimal getReduceAmount() {
+        return this.reduceAmount == null ? BigDecimal.ZERO : reduceAmount.setScale(2, BigDecimal.ROUND_HALF_UP);
+
+    }
+
+    public void setReduceAmount(BigDecimal reduceAmount) {
+        this.reduceAmount = reduceAmount;
+    }
 
     public void setCommentCount(Integer commentCount) {
         this.commentCount = commentCount;
@@ -739,7 +747,7 @@ public class TbCfOrder {
      * 获取：商品总价
      */
     public BigDecimal getItemsPrice() {
-        return itemsPrice == null ? BigDecimal.ZERO : itemsPrice.setScale(2, RoundingMode.CEILING);
+        return itemsPrice == null ? BigDecimal.ZERO : itemsPrice.setScale(2, RoundingMode.HALF_UP);
     }
 
     /**
@@ -753,7 +761,7 @@ public class TbCfOrder {
      * 获取：总价
      */
     public BigDecimal getTotalPrice() {
-        return totalPrice == null ? BigDecimal.ZERO : totalPrice.setScale(2, RoundingMode.CEILING);
+        return totalPrice == null ? BigDecimal.ZERO : totalPrice.setScale(2, RoundingMode.HALF_UP);
     }
 
     /**
@@ -767,7 +775,7 @@ public class TbCfOrder {
      * 获取：实际付款
      */
     public BigDecimal getRealityPay() {
-        return realityPay == null ? BigDecimal.ZERO : realityPay.setScale(2, RoundingMode.CEILING);
+        return realityPay == null ? BigDecimal.ZERO : realityPay.setScale(2, RoundingMode.HALF_UP);
     }
 
     /**
@@ -814,7 +822,7 @@ public class TbCfOrder {
      * 获取：快递费
      */
     public BigDecimal getExpressCost() {
-        return expressCost == null ? BigDecimal.ZERO : expressCost.setScale(2, RoundingMode.CEILING);
+        return expressCost == null ? BigDecimal.ZERO : expressCost.setScale(2, RoundingMode.HALF_UP);
     }
 
     /**