update activity

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

@@ -362,22 +362,34 @@ public class TbCfOrder {
          */
         boolean fullAct = activityRepository.existsByUseType(1);
         if (this.open && fullAct) {
-            Activity activity = activityRepository.findAllByUseType(1).get(0);
-
-            String type = String.valueOf(activity.getType());
-            if ("1".equals(type)) {
-                reduceAmount = caculateActFee(false, false, activity, itemsPrice, null);
-                System.out.println("减免金额：" + reduceAmount);
-            } else if ("2".equals(type)) {
-                rate = caculateActFee(false, true, activity, itemsPrice, null);
-                System.out.println("折扣比例：" + rate);
-                itemsPrice = rate.multiply(itemsPrice);
-            } else if ("3".equals(type)) {
-                rate = caculateActFee(true, true, activity, itemsPrice, itemSum);
-                System.out.println("购买件数：" + itemSum);
-                System.out.println("折扣比例：" + rate);
-                itemsPrice = rate.multiply(itemsPrice);
+
+            Activity act = null;
+            List<Activity> alist = activityRepository.findAllByUseType(1);
+            if (alist != null && alist.size() > 0) {
+                act = alist.get(0);
             }
+            Optional<Activity> optional = Optional.ofNullable(act);
+            if (optional.isPresent()) {
+                Activity activity = optional.get();
+                String type = String.valueOf(activity.getType());
+                if ("1".equals(type)) {
+                    reduceAmount = caculateActFee(false, false, activity, itemsPrice, null);
+                    System.out.println("减免金额：" + reduceAmount);
+                } else if ("2".equals(type)) {
+                    rate = caculateActFee(false, true, activity, itemsPrice, null);
+                    System.out.println("折扣比例：" + rate);
+//                itemsPrice = rate.multiply(itemsPrice);
+                    reduceAmount = itemsPrice.multiply(rate);
+                } else if ("3".equals(type)) {
+                    rate = caculateActFee(true, true, activity, itemsPrice, itemSum);
+                    System.out.println("购买件数：" + itemSum);
+                    System.out.println("折扣比例：" + rate);
+//                itemsPrice = rate.multiply(itemsPrice);
+                    reduceAmount = itemsPrice.multiply(rate);
+                }
+                reduceAmount = reduceAmount.setScale(BigDecimal.ROUND_HALF_UP, 2);
+            }
+
         } /*else {
             //按活动类型计算优惠价格
             Integer sum = 0;
@@ -444,7 +456,7 @@ public class TbCfOrder {
             }
         }
         if (discount) {
-            result = new BigDecimal(1).subtract(result.divide(new BigDecimal(100)));
+            result = result.divide(new BigDecimal(100));
         }
 
         return result;