提交

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 live
+        RaveConstant.ENVIRONMENT = Environment.LIVE; //or live
         // Result result = new Result();
         Optional<TbCfOrder> byId = repository.findById(orderId);
 

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

 package com.example.afrishop_v3.repository;
 
 import com.example.afrishop_v3.inter_face.OrderCount;
+import com.example.afrishop_v3.models.TbCfItemOrderR;
 import com.example.afrishop_v3.models.TbCfOrder;
 import com.example.afrishop_v3.models.TbCfUserInfo;
 import org.springframework.data.domain.Page;
@@ -31,4 +32,7 @@ public interface TbCfOrderRepository extends PagingAndSortingRepository<TbCfOrde
     @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)
     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)
+    List getAllByItemList(String orderId);
 }

src/main/resources/application-prod.yml

+server:
+  servlet:
+    context-path: /afrishop
+  port: 8099
 spring:
   datasource:
-    url: jdbc:mysql://159.138.48.71:3306/chinafrica_ref?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
+    url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
     username: root
     driver-class-name: com.mysql.cj.jdbc.Driver
     password: Diaoyunnuli.8

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