update adress|| order

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

@@ -16,7 +16,7 @@ import java.util.Optional;
 
 @RestController
 @RequestMapping("/address")
-public class AddressController extends Controller{
+public class AddressController extends Controller {
     private final TbCfAddressRepository repository;
     private final UserRepository userRepository;
     private final AuthenticationUser user;
@@ -38,18 +38,22 @@ public class AddressController extends Controller{
     public Result addUserInfo(@RequestBody TbCfAddress address) {
         ResultCodeEnum e = ResultCodeEnum.VALIDATE_ERROR;
         String userId = user.userId();
-        if( address == null )
-            return new Result(e.getCode(),e.getDesc());
-        if( address.getAddressDetail() == null || address.getAddressDetail().trim().isEmpty())
-            return new Result(e.getCode(),"Address is required");
-        if( address.getDeliveryName() == null || address.getDeliveryName().trim().isEmpty())
-            return new Result(e.getCode(),"Delivery name is required");
-        if( address.getPhone() == null || address.getPhone().trim().isEmpty())
-            return new Result(e.getCode(),"Phone is required");
-        if( repository.existsByAddressDetailAndUserId(address.getAddressDetail().trim(), userId))
-            return new Result(e.getCode(),"Address already existed");
-
-
+        if (address == null)
+            return new Result(e.getCode(), e.getDesc());
+        if (address.getAddressDetail() == null || address.getAddressDetail().trim().isEmpty())
+            return new Result(e.getCode(), "Address is required");
+        if (address.getDeliveryName() == null || address.getDeliveryName().trim().isEmpty())
+            return new Result(e.getCode(), "Delivery name is required");
+        if (address.getPhone() == null || address.getPhone().trim().isEmpty())
+            return new Result(e.getCode(), "Phone is required");
+        if (repository.existsByAddressDetailAndUserId(address.getAddressDetail().trim(), userId))
+            return new Result(e.getCode(), "Address already existed");
+
+
+        //客户新增第一条地址，设置为默认
+        if (!repository.existsByUserId(userId)) {
+            address.setDefaultFlag(1);
+        }
         address.setAddressDetail(address.getAddressDetail().trim());
         address.setUserId(userId);
         address.setCreateTime(new Date());
@@ -64,30 +68,30 @@ public class AddressController extends Controller{
     }
 
     @GetMapping("/findAddressById/{id}")
-    public Result findAddressById(@PathVariable("id") String id){
+    public Result findAddressById(@PathVariable("id") String id) {
 
         return new Result(repository.findById(id));
     }
 
     @PutMapping("/{addressId}")
-    public Result editAddressInfo(@PathVariable("addressId") String addressId,@RequestBody TbCfAddress address) {
+    public Result editAddressInfo(@PathVariable("addressId") String addressId, @RequestBody TbCfAddress address) {
 
         ResultCodeEnum e = ResultCodeEnum.VALIDATE_ERROR;
-        if( !repository.existsById(addressId) )
-            return new Result(e.getCode(),"Address doesn't exist");
+        if (!repository.existsById(addressId))
+            return new Result(e.getCode(), "Address doesn't exist");
 
         String userId = user.userId();
-        if( address == null )
-            return new Result(e.getCode(),e.getDesc());
-        if( address.getAddressDetail() == null || address.getAddressDetail().trim().isEmpty())
-            return new Result(e.getCode(),"Address is required");
-        if( address.getDeliveryName() == null || address.getDeliveryName().trim().isEmpty())
-            return new Result(e.getCode(),"Delivery name is required");
-        if( address.getPhone() == null || address.getPhone().trim().isEmpty())
-            return new Result(e.getCode(),"Phone is required");
-
-        if( repository.existsByAddressDetailAndUserIdAndAddressIdIsNot(address.getAddressDetail().trim(), userId,addressId))
-            return new Result(e.getCode(),"Address already existed");
+        if (address == null)
+            return new Result(e.getCode(), e.getDesc());
+        if (address.getAddressDetail() == null || address.getAddressDetail().trim().isEmpty())
+            return new Result(e.getCode(), "Address is required");
+        if (address.getDeliveryName() == null || address.getDeliveryName().trim().isEmpty())
+            return new Result(e.getCode(), "Delivery name is required");
+        if (address.getPhone() == null || address.getPhone().trim().isEmpty())
+            return new Result(e.getCode(), "Phone is required");
+
+        if (repository.existsByAddressDetailAndUserIdAndAddressIdIsNot(address.getAddressDetail().trim(), userId, addressId))
+            return new Result(e.getCode(), "Address already existed");
 
         address.setAddressDetail(address.getAddressDetail().trim());
         address.setAddressId(addressId);
@@ -99,13 +103,13 @@ public class AddressController extends Controller{
     @DeleteMapping("/{addressId}")
     public Result deleteAddressInfo(@PathVariable("addressId") String addressId) {
         Optional<TbCfAddress> byId = repository.findById(addressId);
-        if( byId.isPresent() ){
+        if (byId.isPresent()) {
             TbCfAddress address = byId.get();
 
             TbCfUserInfo user = this.user.user();
             TbCfAddress cfAddress = user.getAddress();
 
-            if( cfAddress != null && cfAddress.getAddressId().equals(address.getAddressId())){
+            if (cfAddress != null && cfAddress.getAddressId().equals(address.getAddressId())) {
                 user.setAddress(null);
                 userRepository.save(user);
             }
@@ -119,7 +123,7 @@ public class AddressController extends Controller{
     public Result configDefaultAddress(@PathVariable("addressId") String addressId) {
         Optional<TbCfAddress> byId = repository.findById(addressId);
 
-        if( byId.isPresent() ){
+        if (byId.isPresent()) {
             TbCfAddress address = byId.get();
             TbCfUserInfo user = this.user.user();
 
@@ -140,12 +144,10 @@ public class AddressController extends Controller{
     }
 
 
-
-
     @GetMapping(value = "/default")
     public Result getDefaultAddress() {
         TbCfAddress address = user.user().getAddress();
 
-        return new Result<>(address, address == null ? ResultCodeEnum.SERVICE_ERROR.getCode() : ResultCodeEnum.SUCCESS.getCode(),"");
+        return new Result<>(address, address == null ? ResultCodeEnum.SERVICE_ERROR.getCode() : ResultCodeEnum.SUCCESS.getCode(), "");
     }
 }

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

@@ -137,11 +137,18 @@ public class OrderController extends Controller {
         TbCfItemSkus itemSkus = skuOptional.get();
         BigDecimal orderPrice = itemSkus.getSkuPrice().multiply(new BigDecimal(itemNum));
         //校验优惠券是否可用
-        if (!StringUtils.isBlank(toitableId)) {
+        if (toitableId != null && !toitableId.isEmpty()) {
             boolean check = checkCoupon(toitableId, orderPrice);
             if (!check) {
                 return new Result<>(code, "Coupon invalid !");
             }
+            Optional<TbCfToicoupon> couponOptional = toicouponRepository.findById(toitableId);
+
+
+            if (couponOptional.isPresent()) {
+                TbCfCoupon coupon = couponOptional.get().getCoupon();
+                order.setCoupon(coupon);
+            }
         }
         Map<String, Object> map = queryUserAvailableCoupons(orderPrice);
         list.add(getCart(item, itemSku, itemNum, itemSkus.getSkuPrice(), itemSkus));
@@ -155,15 +162,15 @@ public class OrderController extends Controller {
         order.setCouponId(toitableId);
 
         //Check coupon availability
-        if (toitableId != null && !toitableId.isEmpty()) {
-            Optional<TbCfToicoupon> couponOptional = toicouponRepository.findById(toitableId);
-
-
-            if (couponOptional.isPresent()) {
-                TbCfCoupon coupon = couponOptional.get().getCoupon();
-                order.setCoupon(coupon);
-            }
-        }
+//        if (toitableId != null && !toitableId.isEmpty()) {
+//            Optional<TbCfToicoupon> couponOptional = toicouponRepository.findById(toitableId);
+//
+//
+//            if (couponOptional.isPresent()) {
+//                TbCfCoupon coupon = couponOptional.get().getCoupon();
+//                order.setCoupon(coupon);
+//            }
+//        }
         order.setOpen(open);
         order.setCouponMap(map);
         order.getItemOrderListFromCartList(list, itemRepository, activityRepository);
@@ -174,6 +181,7 @@ public class OrderController extends Controller {
     public boolean checkCoupon(String couponId, BigDecimal orderPrice) {
         logger.info("orderPrice:" + orderPrice);
         logger.info("user:" + user.userId());
+        logger.info("coupon:" + couponId);
         Optional<TbCfToicoupon> byId = toicouponRepository.checkCouponAvailable(user.userId(), couponId);
         if (byId.isPresent()) {
             TbCfToicoupon coupon = byId.get();
@@ -198,11 +206,19 @@ public class OrderController extends Controller {
         Map<String, Object> couponMap = queryUserAvailableCoupons(orderPrice);
         int code = ResultCodeEnum.VALIDATE_ERROR.getCode();
         //校验优惠券是否可用
-        if (!StringUtils.isBlank(toitableId)) {
+        TbCfOrder order = new TbCfOrder();
+        if (toitableId != null && !toitableId.isEmpty()) {
             boolean check = checkCoupon(toitableId, orderPrice);
             if (!check) {
                 return new Result<>(code, "Coupon invalid !");
             }
+            Optional<TbCfToicoupon> couponOptional = toicouponRepository.findById(toitableId);
+
+
+            if (couponOptional.isPresent()) {
+                TbCfCoupon coupon = couponOptional.get().getCoupon();
+                order.setCoupon(coupon);
+            }
         }
         if (allByUserId.isEmpty()) {
             return new Result<>(code, "There are no items in the shopping cart");
@@ -215,7 +231,6 @@ public class OrderController extends Controller {
 
         if (anyMatch) return new Result<>(code, "Items run out of stock");
 
-        TbCfOrder order = new TbCfOrder();
         order.setCouponMap(couponMap);
         Optional<TbCfExpressTemplate> templateOptional = templateRepository.findFirstByIsDefault(1);
         templateOptional.ifPresent(order::setDefaultTemplate);
@@ -223,15 +238,15 @@ public class OrderController extends Controller {
         order.setCouponId(toitableId);
 
         //Check if any coupon selected
-        if (toitableId != null && !toitableId.isEmpty()) {
-            Optional<TbCfToicoupon> couponOptional = toicouponRepository.findById(toitableId);
-
-
-            if (couponOptional.isPresent()) {
-                TbCfCoupon coupon = couponOptional.get().getCoupon();
-                order.setCoupon(coupon);
-            }
-        }
+//        if (toitableId != null && !toitableId.isEmpty()) {
+//            Optional<TbCfToicoupon> couponOptional = toicouponRepository.findById(toitableId);
+//
+//
+//            if (couponOptional.isPresent()) {
+//                TbCfCoupon coupon = couponOptional.get().getCoupon();
+//                order.setCoupon(coupon);
+//            }
+//        }
 
         order.setOpen(open);
         order.getItemOrderListFromCartList(allByUserId, itemRepository, activityRepository);
@@ -317,12 +332,20 @@ public class OrderController extends Controller {
                 orderPrice = orderPrice.add(cart.getItemPrice().multiply(new BigDecimal(cart.getItemNum())));
             }
         }
+        TbCfOrder order = new TbCfOrder();
         //校验优惠券是否可用
-        if (!StringUtils.isBlank(toitableId)) {
+        if (toitableId != null && !toitableId.isEmpty()) {
             boolean check = checkCoupon(toitableId, orderPrice);
             if (!check) {
                 return new Result<>(v_code, "Coupon invalid !");
             }
+            Optional<TbCfToicoupon> couponOptional = toicouponRepository.findById(toitableId);
+
+
+            if (couponOptional.isPresent()) {
+                TbCfCoupon coupon = couponOptional.get().getCoupon();
+                order.setCoupon(coupon);
+            }
         }
         Map<String, Object> map = queryUserAvailableCoupons(orderPrice);
 
@@ -347,7 +370,6 @@ public class OrderController extends Controller {
         }
 
 
-        TbCfOrder order = new TbCfOrder();
         order.setCouponMap(map);
         order.setUserName(user.display());
 
@@ -368,16 +390,16 @@ public class OrderController extends Controller {
         order.setCouponId(toitableId);
 
         TbCfToicoupon tbCfToicoupon = null;
-        if (toitableId != null && !toitableId.isEmpty()) {
-            Optional<TbCfToicoupon> couponOptional = toicouponRepository.findById(toitableId);
-
-
-            if (couponOptional.isPresent()) {
-                tbCfToicoupon = couponOptional.get();
-                TbCfCoupon coupon = tbCfToicoupon.getCoupon();
-                order.setCoupon(coupon);
-            } else logger.warn("Invalid Coupon " + toitableId);
-        }
+//        if (toitableId != null && !toitableId.isEmpty()) {
+//            Optional<TbCfToicoupon> couponOptional = toicouponRepository.findById(toitableId);
+//
+//
+//            if (couponOptional.isPresent()) {
+//                tbCfToicoupon = couponOptional.get();
+//                TbCfCoupon coupon = tbCfToicoupon.getCoupon();
+//                order.setCoupon(coupon);
+//            } else logger.warn("Invalid Coupon " + toitableId);
+//        }
 
 
         order.setUserId(userId);

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

@@ -10,15 +10,17 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
-public interface TbCfAddressRepository extends PagingAndSortingRepository<TbCfAddress,String> {
+public interface TbCfAddressRepository extends PagingAndSortingRepository<TbCfAddress, String> {
     List<TbCfAddress> findAllByUserId(String userId, Sort sort);
 
     @Transactional
     @Modifying
-    @Query(value = "update tb_cf_address set default_flag=0 where user_id=:user_id",nativeQuery = true)
+    @Query(value = "update tb_cf_address set default_flag=0 where user_id=:user_id", nativeQuery = true)
     void resetToDefault(@Param("user_id") String userId);
 
     boolean existsByAddressDetailAndUserId(String addressDetail, String userId);
 
     boolean existsByAddressDetailAndUserIdAndAddressIdIsNot(String addressDetail, String userId, String addressId);
+
+    boolean existsByUserId(String userId);
 }