优化

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

@@ -42,7 +42,6 @@ public class FlutterWaveController extends Controller {
     private final BonusRepository bonusRepository;
     private final PostRepository postRepository;
     private final TbCfOrderRepository orderRepository;
-    private final Environment environment;
 
     @Value("${flutter.refund_url}")
     private String FLUTTERWAVE_REFUND_URL;
@@ -67,7 +66,7 @@ public class FlutterWaveController extends Controller {
 //    //    //校验API
 //    private String VERIFY_PAY_URL = "https://api.ravepay.co/flwv3-pug/getpaidx/api/v2/verify";
 
-    public FlutterWaveController(TbCfOrderRepository repository, TbCfFinanceRepository financeRepository, UserRepository userRepository, AuthenticationUser user, NetworkRepository networkRepository, BonusRepository bonusRepository, PostRepository postRepository, TbCfOrderRepository orderRepository, Environment environment) {
+    public FlutterWaveController(TbCfOrderRepository repository, TbCfFinanceRepository financeRepository, UserRepository userRepository, AuthenticationUser user, NetworkRepository networkRepository, BonusRepository bonusRepository, PostRepository postRepository, TbCfOrderRepository orderRepository) {
         this.repository = repository;
         this.financeRepository = financeRepository;
         this.userRepository = userRepository;
@@ -77,15 +76,13 @@ public class FlutterWaveController extends Controller {
         this.bonusRepository = bonusRepository;
         this.postRepository = postRepository;
         this.orderRepository = orderRepository;
-        this.environment = environment;
     }
 
     @PostMapping("/pay")
     public ResponseEntity<String> payForOrderByCard(@RequestParam("orderId") String orderId, @RequestBody FlutterWaveCard flutterWaveCard) {
         RaveConstant.PUBLIC_KEY = PUBLIC_KEY;
         RaveConstant.SECRET_KEY = SECRET_KEY;
-        RaveConstant.ENVIRONMENT = environment; //or STAGING
-        System.out.println("支付环境 --->"+environment);
+        RaveConstant.ENVIRONMENT = Environment.LIVE; //or STAGING
         // Result result = new Result();
         Optional<TbCfOrder> byId = repository.findById(orderId);
 
@@ -139,7 +136,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; //or STAGING
+        RaveConstant.ENVIRONMENT = Environment.LIVE; //or STAGING
         // Result result = new Result();
         Optional<TbCfOrder> byId = repository.findById(orderId);
 

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

@@ -514,7 +514,7 @@ public class OrderController extends Controller {
     @Transactional // transaction for rollback if something failed
     public Result cancelOrder(@RequestParam("orderId") String orderId,
                               @RequestParam("reason") String reason) {
-        logger.info("reason:"+reason);
+        logger.info("reason:" + reason);
 
         if ("Time out".equals(reason)) {
             return new Result();
@@ -710,4 +710,18 @@ public class OrderController extends Controller {
         return couponMap;
     }
 
+
+    @GetMapping("/getLastOrder")
+    public Result getLastOrder() {
+        Result result = new Result();
+        if (user.user() == null) {
+            return new Result(ResultCodeEnum.UN_LOGIN.getCode(), "need login");
+        }
+        String userId = user.userId();
+        String order = repository.getLastOrder(userId);
+        result.setData(order);
+        return result;
+    }
+
+
 }

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

@@ -17,11 +17,12 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Date;
 import java.util.List;
 
-public interface TbCfOrderRepository extends PagingAndSortingRepository<TbCfOrder,String> {
+public interface TbCfOrderRepository extends PagingAndSortingRepository<TbCfOrder, String> {
     @Query("select a as order, count(x) as commented from #{#entityName} a left join TbCfItemComment x on a.orderId=x.orderId and x.user=:user where a.userId=:userId group by a")
     Page<OrderCount> findAllByUserId(@Param("userId") String userId, @Param("user") TbCfUserInfo user, Pageable pageable);
+
     @Query("select a as order, count(x) as commented from #{#entityName} a left join TbCfItemComment x on a.orderId=x.orderId and x.user=:user where a.userId=:userId and a.orderStatus=:status group by a")
-    Page<OrderCount> findAllByUserIdWithStatus(@Param("userId") String userId, @Param("user") TbCfUserInfo user,@Param("status") Integer orderStatus, Pageable pageable);
+    Page<OrderCount> findAllByUserIdWithStatus(@Param("userId") String userId, @Param("user") TbCfUserInfo user, @Param("status") Integer orderStatus, Pageable pageable);
 //    @Query(value = "select a from #{#entityName} a where :now >  DATE_SUB(a.orderTime,interval -1 day) and order_status=10")
 //    List<TbCfOrder> getTimeoutOrders(@Param("now") Date date);
 
@@ -29,15 +30,18 @@ public interface TbCfOrderRepository extends PagingAndSortingRepository<TbCfOrde
 
 
     @Modifying
-    @Query(value = "update tb_cf_item_skus sk INNER JOIN tb_cf_item_order_r r ON r.item_sku_id=sk.id set sk.sku_count=sk.sku_count+r.item_num WHERE r.order_id = :orderId ",nativeQuery = true)
+    @Query(value = "update tb_cf_item_skus sk INNER JOIN tb_cf_item_order_r r ON r.item_sku_id=sk.id set sk.sku_count=sk.sku_count+r.item_num WHERE r.order_id = :orderId ", nativeQuery = true)
     void returnSkuQuantity(@Param("orderId") String orderId);
 
     @Modifying
-    @Query(value = "update tb_cf_station_item sk INNER JOIN tb_cf_item_order_r r ON r.item_id=sk.item_id set sk.item_count=sk.item_count+r.item_num WHERE r.order_id = :orderId ",nativeQuery = true)
+    @Query(value = "update tb_cf_station_item sk INNER JOIN tb_cf_item_order_r r ON r.item_id=sk.item_id set sk.item_count=sk.item_count+r.item_num WHERE r.order_id = :orderId ", nativeQuery = true)
     void returnItemQuantity(@Param("orderId") String orderId);
 
-    @Query(value = "SELECT t1.*,t2.order_item_id ordersId,t2.order_status orderStatus,t2.item_num itemNum FROM tb_cf_item_detail t1 LEFT JOIN tb_cf_item_order_r t2 ON t1.item_id = t2.item_id LEFT JOIN tb_cf_order t3 ON t2.order_id = t3.order_id WHERE t2.enable_flag = 1 AND t2.order_id =:orderId",nativeQuery = true)
+    @Query(value = "SELECT t1.*,t2.order_item_id ordersId,t2.order_status orderStatus,t2.item_num itemNum FROM tb_cf_item_detail t1 LEFT JOIN tb_cf_item_order_r t2 ON t1.item_id = t2.item_id LEFT JOIN tb_cf_order t3 ON t2.order_id = t3.order_id WHERE t2.enable_flag = 1 AND t2.order_id =:orderId", nativeQuery = true)
     List getAllByItemList(String orderId);
 
+    @Query(value = "SELECT order_id from tb_cf_order where user_id=:userId order by order_time desc limit 1 ", nativeQuery = true)
+    String getLastOrder(String userId);
+
 
 }

src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ spring:
     url: jdbc:mysql://159.138.48.71:3306/chinafrica_ref?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Africa/Johannesburg
     username: root
     driver-class-name: com.mysql.cj.jdbc.Driver
-    password: Diaoyunnuli.8
+    password: AfriShop_date@2#!&*8
 
   redis:
     #Redis数据库分片索引（默认为0）

src/main/resources/application-prod.yml

@@ -7,7 +7,7 @@ spring:
     url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Africa/Johannesburg
     username: root
     driver-class-name: com.mysql.cj.jdbc.Driver
-    password: Diaoyunnuli.8
+    password: AfriShop_date@2#!&*8
 
   redis:
     #Redis数据库分片索引（默认为0）

src/main/resources/application-test.yml

@@ -8,7 +8,7 @@ spring:
     url: jdbc:mysql://159.138.48.71:3306/test?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Africa/Johannesburg
     username: root
     driver-class-name: com.mysql.cj.jdbc.Driver
-    password: Diaoyunnuli.8
+    password: AfriShop_date@2#!&*8
   #  secondsource:
   #    url: jdbc:mysql://165.22.82.105:3306/chinafrica?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
   #    username: root

src/main/resources/application.properties

 server.servlet.context-path=/zion
 spring.jpa.hibernate.ddl-auto=update
 server.port=8083
-spring.profiles.active=test
+spring.profiles.active=prod
 #spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3306/afrishop_test?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
 #spring.datasource.username=root
 #spring.datasource.password=Diaoyunnuli.8