update activity

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

@@ -136,7 +136,7 @@ public class ActivityController {
         return t;
     }
 
-    @GetMapping("/caculateCartDiscount")
+    @PostMapping("/caculateCartDiscount")
     public Result caculateCartDiscount(@RequestBody String[] cartIds) {
 //        Activity activity = null;
 //        List<Activity> activityList = new ArrayList<>();

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

@@ -421,11 +421,10 @@ public class DpoPayController extends Controller {
                             sendNotification(user.getFcm(), "Bonus alert !!", user.display() + ", You received bonus of $" + formatter.format(v) + " in your account");
                         }
                     }
-                }
                     TbCfUserInfo bonusInc = runBonusInc(user, amount, 5, false, orderId);
                     runBonusInc(sharer.orElseGet(() -> postOptional.isPresent() ? postOptional.get().getRealUser() : bonusInc), amount, 5, postOptional.isPresent() || sharer.isPresent(), orderId);
                     //runBonusInc(bonusInc, amount, 0);
-
+                }
             }
 
         }

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

@@ -97,7 +97,7 @@ public class FlutterWaveController extends Controller {
             if (OrderStatusEnum.PAID.getValue().equals(orderEntity.getPayStatus())) {
                 json.put("message", "Order paid!");
                 json.put("code", ResultCodeEnum.ORDER_PAY_ERROR.getCode());
-            }else {
+            } else {
                 try {
                     String orderPrice = orderEntity.getRealityPay().toString();
                     CardCharge ch = new CardCharge();
@@ -106,7 +106,7 @@ public class FlutterWaveController extends Controller {
                             .setCurrency("USD")
                             .setCountry("NG")
                             .setAmount(orderPrice)
-                            .setRedirect_url(REDIRECT_URL+"/"+orderId)
+                            .setRedirect_url(REDIRECT_URL + "/" + orderId)
                             .setExpiryyear(flutterWaveCard.getYear())
                             .setExpirymonth(flutterWaveCard.getMonth())
                             .setEmail(flutterWaveCard.getEmail())
@@ -151,7 +151,7 @@ public class FlutterWaveController extends Controller {
             if (OrderStatusEnum.PAID.getValue().equals(orderEntity.getPayStatus())) {
                 json.put("message", "Order paid!");
                 json.put("code", ResultCodeEnum.ORDER_PAY_ERROR.getCode());
-            }else {
+            } else {
                 try {
                     CardCharge ch = new CardCharge();
                     ch.setCardno(flutterWaveCard.getCard())
@@ -159,7 +159,7 @@ public class FlutterWaveController extends Controller {
                             .setCurrency("ZMW")
                             .setCountry("NG")
                             .setAmount(orderEntity.getRealityPay().toString())
-                            .setRedirect_url(REDIRECT_URL+"/"+orderId)
+                            .setRedirect_url(REDIRECT_URL + "/" + orderId)
                             .setExpiryyear(flutterWaveCard.getYear())
                             .setExpirymonth(flutterWaveCard.getMonth())
                             .setPhonenumber(flutterWaveCard.getPhone())
@@ -220,7 +220,7 @@ public class FlutterWaveController extends Controller {
             String authurl = results.getString("authurl");
             if ("success".equalsIgnoreCase(statusFlag) && "successful".equalsIgnoreCase(status)) {
                 TbCfUserInfo user = this.user.user();
-                if( user.hasFcm() ){
+                if (user.hasFcm()) {
                     sendNotification(user.getFcm(), "Order alert !!", "Order of $" + tbCfOrderVo.getRealityPay() + " has been successfully paid !!");
                 }
                 logger.info("订单号" + orderId + "[flutterwave支付]校验成功时间：" + new Date());
@@ -245,8 +245,8 @@ public class FlutterWaveController extends Controller {
                     bonus.setOrderId(orderId);
                     bonus.setAmount(tbCfOrder.getItemsPrice());
 
-                    System.out.println("佣金-----》》》订单号："+orderId+"=user="+tbCfOrder.getUserId()+"=price="+tbCfOrder.getItemsPrice());
-                    saveNetworkMarketing(bonus,tbCfOrder.getUserId());
+                    System.out.println("佣金-----》》》订单号：" + orderId + "=user=" + tbCfOrder.getUserId() + "=price=" + tbCfOrder.getItemsPrice());
+                    saveNetworkMarketing(bonus, tbCfOrder.getUserId());
                 }
 //                TbCfFinanceVo tbCfFinanceVo = new TbCfFinanceVo();
 //                BeanUtils.copyProperties(finance, tbCfFinanceVo);
@@ -417,11 +417,11 @@ public class FlutterWaveController extends Controller {
                             sendNotification(user.getFcm(), "Bonus alert !!", user.display() + ", You received bonus of $" + formatter.format(v) + " in your account");
                         }
                     }
-                }
+
                     TbCfUserInfo bonusInc = runBonusInc(user, amount, 5, false, orderId);
                     runBonusInc(sharer.orElseGet(() -> postOptional.isPresent() ? postOptional.get().getRealUser() : bonusInc), amount, 5, postOptional.isPresent() || sharer.isPresent(), orderId);
                     //runBonusInc(bonusInc, amount, 0);
-
+                }
             }
 
         }
@@ -441,7 +441,7 @@ public class FlutterWaveController extends Controller {
             bonus.setAmount(v);
             bonus.setPercentage(percent);
             bonus.setOrderId(orderId);
-            if (userInfo!=null&&userInfo.invited()&&!"000000".equals(userInfo.getCode())) {
+            if (userInfo != null && userInfo.invited() && !"000000".equals(userInfo.getCode())) {
                 bonusRepository.save(bonus);
 //                bonus = repository.save(bonus);
                 if (userInfo.hasFcm()) {

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

@@ -225,8 +225,8 @@ public class PaypalContoller extends Controller {
                     bonus.setOrderId(orderId);
                     bonus.setAmount(order1.getItemsPrice());
 
-                    System.out.println("佣金-----》》》订单号："+orderId+"=user="+order1.getUserId()+"=price="+order1.getItemsPrice());
-                    saveNetworkMarketing(bonus,order1.getUserId());
+                    System.out.println("佣金-----》》》订单号：" + orderId + "=user=" + order1.getUserId() + "=price=" + order1.getItemsPrice());
+                    saveNetworkMarketing(bonus, order1.getUserId());
                 }
 
             }
@@ -345,17 +345,18 @@ public class PaypalContoller extends Controller {
                             sendNotification(user.getFcm(), "Bonus alert !!", user.display() + ", You received bonus of $" + formatter.format(v) + " in your account");
                         }
                     }
-                }
+
                     TbCfUserInfo bonusInc = runBonusInc(user, amount, 5, false, orderId);
                     runBonusInc(sharer.orElseGet(() -> postOptional.isPresent() ? postOptional.get().getRealUser() : bonusInc), amount, 5, postOptional.isPresent() || sharer.isPresent(), orderId);
                     //runBonusInc(bonusInc, amount, 0);
-
+                }
             }
 
         }
 
 
     }
+
     private TbCfUserInfo runBonusInc(TbCfUserInfo user, BigDecimal amount, int percent, boolean direct, String orderId) {
         if (user == null) return null;
         Optional<Network> userCode = networkRepository.findByNetworkInfoCode(user.getCode());
@@ -368,7 +369,7 @@ public class PaypalContoller extends Controller {
             bonus.setAmount(v);
             bonus.setPercentage(percent);
             bonus.setOrderId(orderId);
-            if (userInfo!=null&&userInfo.invited()&&!"000000".equals(userInfo.getCode())) {
+            if (userInfo != null && userInfo.invited() && !"000000".equals(userInfo.getCode())) {
                 bonusRepository.save(bonus);
 //                bonus = repository.save(bonus);
                 if (userInfo.hasFcm()) {

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

@@ -30,7 +30,7 @@ public class ProblemController {
 
     @GetMapping("/{type}")
     public Result getShippingClause(@PathVariable Integer type) throws Exception {
-        TbCfProblem clause = repository.findFirstByType(type);
+        TbCfProblem clause = repository.findFirstByTypeOrderByCreateTimeDesc(type);
         String shippingClause = URLDecoder.decode(clause.getAnswer(), "utf-8");
         TbCfProblem problem = new TbCfProblem();
         problem.setQuestion(clause.getQuestion());

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

@@ -2,6 +2,7 @@ package com.example.afrishop_v3.models;
 
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.annotations.Where;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
@@ -10,6 +11,7 @@ import java.util.Date;
 @Entity
 @Getter
 @Setter
+@Where(clause = "enable_flag=1")
 public class TbCfProblem {
     /**
      * 问题id

src/main/java/com/example/afrishop_v3/repository/TbCfProblemRepository.java

@@ -5,5 +5,5 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 
 public interface TbCfProblemRepository extends PagingAndSortingRepository<TbCfProblem, String> {
 
-    TbCfProblem findFirstByType(Integer type);
+    TbCfProblem findFirstByTypeOrderByCreateTimeDesc(Integer type);
 }