修改地址

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

@@ -68,7 +68,7 @@ public class AddressController extends Controller {
 //        user.setAddress(address);
 //        userRepository.save(user);
 
-//        configDefaultAddress(save.getAddressId());
+        configDefaultAddress(save.getAddressId());
 
         return new Result<>(save);
     }
@@ -107,7 +107,7 @@ public class AddressController extends Controller {
         address.setUserId(userId);
         address.setDefaultFlag(address.getDefaultFlag());
         TbCfAddress save = repository.save(address);
-//        configDefaultAddress(save.getAddressId());
+        configDefaultAddress(save.getAddressId());
         return new Result<>(save);
     }
 
@@ -139,7 +139,7 @@ public class AddressController extends Controller {
             TbCfUserInfo user = this.user.user();
 
 
-            System.out.println("address1:" + address);
+//            System.out.println("address1:" + address);
 
 
             repository.resetToDefaultAndAddressIdIsNot(user.getUserId(), addressId);

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

@@ -383,8 +383,9 @@ public class OrderController extends Controller {
 
         TbCfAddress address = addressOptional.get();
 
-
+        String activityId = tbCfOrder.getActivityId();
         order.setDeliveryAddressId(addressId);
+        order.setActivityId(activityId);
         order.setDeliveryAddress(address.getAddressDetail());
         order.setDeliveryName(address.getDeliveryName());
         order.setDeliveryPhone(address.getPhone());

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

@@ -125,6 +125,10 @@ public class TbCfOrder {
      * 快递费
      */
     private BigDecimal expressCost;
+    /**
+     * 活动id
+     */
+    private String activityId;
     /**
      * 优惠券id
      */