修改地址

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

@@ -59,6 +59,7 @@ public class AddressController extends Controller {
         address.setUserId(userId);
         address.setCreateTime(new Date());
         address.setAddressId(uid());
+        address.setDefaultFlag(address.getDefaultFlag());
 
         TbCfAddress save = repository.save(address);
 
@@ -104,6 +105,7 @@ public class AddressController extends Controller {
         address.setUpdateTime(new Date());
         address.setDefaultFlag(address.getDefaultFlag());
         address.setUserId(userId);
+        address.setDefaultFlag(address.getDefaultFlag());
         TbCfAddress save = repository.save(address);
 //        configDefaultAddress(save.getAddressId());
         return new Result<>(save);

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

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

@@ -5,6 +5,7 @@ import org.apache.commons.lang3.StringUtils;
 public class OrderRequest {
     private String[] ids;
     private String deliveryAddressId;
+    private String activityId;
 
 
     public String getDeliveryAddressId() {
@@ -16,4 +17,11 @@ public class OrderRequest {
         return ids;
     }
 
+    public String getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(String activityId) {
+        this.activityId = activityId;
+    }
 }

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

@@ -5,6 +5,7 @@ import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.Formula;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -87,6 +88,12 @@ public class TbCfAddress {
      */
     private Date updateTime;
 
+    private String countryCode;
+    private String userPhone;
+    private String countryFlag;
+
+
+
     public String getAddress2() {
         if (address2 == null) {
             address2 = "";

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

@@ -26,5 +26,7 @@ public interface TbCfAddressRepository extends PagingAndSortingRepository<TbCfAd
 
     TbCfAddress findFirstByUserIdAndDefaultFlag(String userId,Integer flag);
 
+    Integer countAllByUserId(String userId);
+
 
 }