提交

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

@@ -22,6 +22,8 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -58,13 +60,13 @@ public class BraintreeController extends Controller {
     }
 
     @GetMapping("/getToken")
-    public com.example.afrishop_v3.base.Result getToken() {
-        com.example.afrishop_v3.base.Result result = new com.example.afrishop_v3.base.Result();
+    public Map<String, String> getToken() {
+        Map<String, String> map = new HashMap<>();
         //官方写new ClientTokenRequest().customerId("customerId")可以不要。
         ClientTokenRequest clientTokenRequest = new ClientTokenRequest();
         String clientToken = gateway.clientToken().generate(clientTokenRequest);
-        result.setData(clientToken);
-        return result;
+        map.put("token", clientToken);
+        return map;
     }
 
     @PostMapping("/pay")
@@ -90,9 +92,9 @@ public class BraintreeController extends Controller {
                 .done();
 
         Result<Transaction> result = gateway.transaction().sale(request);
-        System.err.println(JSONObject.fromObject(result));
-        System.out.println("=============================================");
-        System.out.println("支付状态：" + result.isSuccess());
+        logger.info((JSONObject.fromObject(result).toString()));
+        logger.info("=============================================");
+        logger.info("支付状态：" + result.isSuccess());
         String orderId1 = result.getTarget().getOrderId();
         String id = result.getTarget().getId();
         if (result.isSuccess()) {
@@ -115,7 +117,7 @@ public class BraintreeController extends Controller {
                 bonus.setOrderId(orderId);
                 bonus.setAmount(order1.getItemsPrice());
 
-                System.out.println("佣金-----》》》订单号：" + orderId + "=user=" + order1.getUserId() + "=price=" + order1.getItemsPrice());
+                logger.info("佣金-----》》》订单号：" + orderId + "=user=" + order1.getUserId() + "=price=" + order1.getItemsPrice());
                 saveNetworkMarketing(bonus, order1.getUserId());
             }
             resp.sendRedirect(PAYPAL_SUCCESS_PAGE);
@@ -148,8 +150,8 @@ public class BraintreeController extends Controller {
         Result<CreditCard> result = gateway.creditCard().create(request);
         if (result.isSuccess()) {
             logger.info("paypal支付，订单[" + order.getOrderNo() + "]支付成功");
-            System.out.println("=============================================");
-            System.out.println("支付状态：" + result.isSuccess());
+            logger.info("=============================================");
+            logger.info("支付状态：" + result.isSuccess());
             String customerId = result.getTarget().getCustomerId();
             String id = result.getTarget().getToken();
             String imageUrl = result.getTarget().getImageUrl();
@@ -170,7 +172,7 @@ public class BraintreeController extends Controller {
                 bonus.setOrderId(orderId);
                 bonus.setAmount(order1.getItemsPrice());
 
-                System.out.println("佣金-----》》》订单号：" + orderId + "=user=" + order1.getUserId() + "=price=" + order1.getItemsPrice());
+                logger.info("佣金-----》》》订单号：" + orderId + "=user=" + order1.getUserId() + "=price=" + order1.getItemsPrice());
                 saveNetworkMarketing(bonus, order1.getUserId());
             }
             resp.sendRedirect(PAYPAL_SUCCESS_PAGE);

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

@@ -81,7 +81,7 @@ public class FlutterWaveController extends Controller {
     public ResponseEntity<String> payForOrderByCard(@RequestParam("orderId") String orderId, @RequestBody FlutterWaveCard flutterWaveCard) {
         RaveConstant.PUBLIC_KEY = PUBLIC_KEY;
         RaveConstant.SECRET_KEY = SECRET_KEY;
-        RaveConstant.ENVIRONMENT = Environment.STAGING; //or STAGING
+        RaveConstant.ENVIRONMENT = Environment.LIVE; //or LIVE
         // Result result = new Result();
         Optional<TbCfOrder> byId = repository.findById(orderId);
 
@@ -135,7 +135,7 @@ public class FlutterWaveController extends Controller {
     public ResponseEntity<String> payForOrderByPhone(@RequestParam("orderId") String orderId, @RequestBody FlutterWaveCard flutterWaveCard) {
         RaveConstant.PUBLIC_KEY = PUBLIC_KEY;
         RaveConstant.SECRET_KEY = SECRET_KEY;
-        RaveConstant.ENVIRONMENT = Environment.STAGING; //or STAGING
+        RaveConstant.ENVIRONMENT = Environment.LIVE; //or LIVE
         // Result result = new Result();
         Optional<TbCfOrder> byId = repository.findById(orderId);
 

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

@@ -27,9 +27,11 @@ public class TbCfHomePageEntityController extends Controller {
     private final UserRepository userRepository;
     private final VisitRepository visitRepository;
     private final PostRepository postRepository;
+    private final TbCfGoodstwotypeRepository goodstwotypeRepository;
+    private final TbCfDescripitonRepository descripitonRepository;
     private static Logger logger = LoggerFactory.getLogger(UploadController.class);
 
-    public TbCfHomePageEntityController(TbCfHomePageRepository repository, TbCfSortRepository sortRepository, TbCfClassificationRepository classificationRepository, TbCfStoreRepository storeRepository, TbCfPosterRepository posterRepository, TbCfColumnRepository columnRepository, UserRepository userRepository, VisitRepository visitRepository, PostRepository postRepository) {
+    public TbCfHomePageEntityController(TbCfHomePageRepository repository, TbCfSortRepository sortRepository, TbCfClassificationRepository classificationRepository, TbCfStoreRepository storeRepository, TbCfPosterRepository posterRepository, TbCfColumnRepository columnRepository, UserRepository userRepository, VisitRepository visitRepository, PostRepository postRepository, TbCfGoodstwotypeRepository goodstwotypeRepository, TbCfDescripitonRepository descripitonRepository) {
         this.repository = repository;
         this.sortRepository = sortRepository;
         this.classificationRepository = classificationRepository;
@@ -39,6 +41,9 @@ public class TbCfHomePageEntityController extends Controller {
         this.userRepository = userRepository;
         this.visitRepository = visitRepository;
         this.postRepository = postRepository;
+        this.goodstwotypeRepository = goodstwotypeRepository;
+        this.descripitonRepository = descripitonRepository;
+
     }
 
     @GetMapping("/startPage/img")
@@ -126,6 +131,15 @@ public class TbCfHomePageEntityController extends Controller {
                             classificationList.forEach(c -> {
                                 String[] ids = c.getCategoryId().split(",");
                                 int length = ids.length;
+                                int count = 0;
+                                if (length == 1) {
+                                    count = goodstwotypeRepository.countByGoodstypeId(ids[0]);
+                                } else if (length == 2) {
+                                    count = descripitonRepository.countByGoodstwotypeId(ids[1]);
+                                }
+                                if (count > 0) {
+                                    c.setParent(true);
+                                }
                                 c.setNum(length);
                                 c.setCategoryId(ids[length - 1]);
                             });

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

@@ -54,6 +54,9 @@ public class TbCfClassification {
     @Transient
     private Integer num;
 
+    @Transient
+    private boolean isParent;
+
     /**
      * 设置：首页分类导航ID
      */

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

@@ -8,4 +8,6 @@ import java.util.List;
 
 public interface TbCfDescripitonRepository extends PagingAndSortingRepository<TbCfDescripiton,String> {
     List<TbCfDescripiton> findAllByGoodstwotypeIdOrderBySort(String categoryTwo);
+
+    int countByGoodstwotypeId(String id);
 }

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

@@ -5,6 +5,9 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 
 import java.util.List;
 
-public interface TbCfGoodstwotypeRepository extends PagingAndSortingRepository<TbCfGoodstwotype,String> {
+public interface TbCfGoodstwotypeRepository extends PagingAndSortingRepository<TbCfGoodstwotype, String> {
     List<TbCfGoodstwotype> findAllByGoodstypeIdOrderBySort(String id);
+
+    int countByGoodstypeId(String id);
+
 }