Merge branch 'dev'

src/main/java/com/example/afrishop_v3/config/FlutterConfig.java

+package com.example.afrishop_v3.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+/**
+ * @Auther: wudepeng
+ * @Date: 2021/03/22
+ * @Description:Flutterwave配置
+ */
+@Configuration
+public class FlutterConfig {
+
+    @Bean
+    @Profile("prod")
+    public Environment prodMode() {
+        System.out.println("支付环境 --->prod");
+        return Environment.LIVE;
+    }
+
+    @Bean
+    @Profile("dev")
+    public Environment devMode() {
+        System.out.println("支付环境 --->dev");
+        return Environment.LIVE;
+    }
+
+    @Bean
+    @Profile("test")
+    public Environment testMode() {
+        System.out.println("支付环境 --->test");
+        return Environment.STAGING;
+    }
+}

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

@@ -167,7 +167,7 @@ public class AddressController extends Controller {
     public Result getDefaultAddress() {
 //        TbCfAddress address = user.user().getAddress();
         if (user.userId() == null) {
-            return new Result<>();
+            return new Result(ResultCodeEnum.UN_LOGIN.getCode(), "need login");
         }
         TbCfAddress address = repository.findFirstByUserIdAndDefaultFlag(user.userId(), StateConstant.VALID);
         return new Result<>(address, address == null ? ResultCodeEnum.SERVICE_ERROR.getCode() : ResultCodeEnum.SUCCESS.getCode(), "");

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

@@ -42,6 +42,7 @@ 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;
@@ -66,7 +67,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) {
+    public FlutterWaveController(TbCfOrderRepository repository, TbCfFinanceRepository financeRepository, UserRepository userRepository, AuthenticationUser user, NetworkRepository networkRepository, BonusRepository bonusRepository, PostRepository postRepository, TbCfOrderRepository orderRepository, Environment environment) {
         this.repository = repository;
         this.financeRepository = financeRepository;
         this.userRepository = userRepository;
@@ -76,13 +77,15 @@ 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.LIVE; //or STAGING
+        RaveConstant.ENVIRONMENT = environment; //or STAGING
+        System.out.println("支付环境 --->"+environment);
         // Result result = new Result();
         Optional<TbCfOrder> byId = repository.findById(orderId);
 
@@ -136,7 +139,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.LIVE; //or STAGING
+        RaveConstant.ENVIRONMENT = environment; //or STAGING
         // Result result = new Result();
         Optional<TbCfOrder> byId = repository.findById(orderId);