'合并'

src/main/java/com/futu/course/cupons/service/impl/CouponServiceImpl.java

@@ -20,6 +20,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 import static org.springframework.data.elasticsearch.annotations.DateFormat.date;
 
@@ -58,13 +59,13 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon>
 
         for (Long i:objects){
             Date date1=new Date();
-            list.add(this.baseMapper.selectOne(new QueryWrapper<Coupon>().eq("id",i).ge("condition_amount",course.getPrice()).ge("start_time",date1)));
+            list.add(this.baseMapper.selectOne(new QueryWrapper<Coupon>().eq("id",i).ge("condition_amount",course.getPrice()).apply("start_time <= now()")));
             System.err.println(list);
         }
-        if (list!=null){
-            return R.ok(list);
+        if (list.stream().allMatch(Objects::isNull)) {
+            return R.failed("没有可用的优惠券");
         }
-        return R.failed("没有可用的优惠券");
+        return R.ok(list);
     }
 
 

src/main/java/com/futu/course/user/controller/UserAddressController.java

@@ -1,6 +1,7 @@
 package com.futu.course.user.controller;
 
 import com.futu.course.user.domain.UserAddress;
+import com.futu.course.user.dto.UserAddressDto;
 import com.futu.course.user.service.impl.UserAddressServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -35,11 +36,12 @@ public class UserAddressController {
        return userAddressService.updateUserAddress(userAddress);
     }
     @PostMapping("DelUserAddress")
-    public String DelUserAddress(@RequestParam("id") Long id) {
-        return userAddressService.DelUserAddress(id);
+    public String DelUserAddress(@RequestBody UserAddressDto userAddressDto) {
+        return userAddressService.DelUserAddress(userAddressDto.getUserAddressId());
     }
     @PostMapping("AltUserAddressDefault")
-    public String AltUserAddressDefault(@RequestParam("id") Long id) {
-        return userAddressService.AltUserAddressDefault(id);
+    public String AltUserAddressDefault(@RequestBody UserAddressDto userAddressDto) {
+
+        return userAddressService.AltUserAddressDefault(userAddressDto.getUserAddressId());
     }
 }

src/main/java/com/futu/course/user/dto/UserAddressDto.java

@@ -0,0 +1,15 @@
+package com.futu.course.user.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserAddressDto {
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long UserAddressId;
+
+}