Merge branch 'dev_v1.3.4_20220902' of http://git.dayaedu.com/yonge/cooleshow into dev_v1.3.4_20220902

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/coupon/CouponInfoController.java

@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -41,7 +42,7 @@ import java.util.Objects;
  * @author Eric
  * @since 2022-09-02
  */
-@Controller
+@RestController
 @RequestMapping("/couponInfo")
 @Api(value = "优惠券信息", tags = "优惠券信息")
 public class CouponInfoController extends BaseController {
@@ -56,7 +57,7 @@ public class CouponInfoController extends BaseController {
      * @param request CouponInfoVO.RequestInfo
      * @return HttpResponseResult<PageInfo<CouponInfoVO.ResponseInfo>>
      */
-    @PostMapping("/page")
+    @PostMapping(value = "/page", consumes="application/json", produces="application/json")
     @ApiOperation(value = "查询优惠券分页", notes = "传入CouponInfoVO.PageRequest")
     public HttpResponseResult<PageInfo<CouponInfoVO.CouponPageInfo>> queryCouponPageInfo(@RequestBody CouponInfoVO.PageRequest request) {
 
@@ -97,7 +98,7 @@ public class CouponInfoController extends BaseController {
      * @param info CouponInfoVO.CouponInfo
      * @return HttpResponseResult<CouponInfoVO.CouponInfo>
      */
-    @PostMapping("/save")
+    @PostMapping(value = "/save", consumes="application/json", produces="application/json")
     @ApiOperation(value = "新增或修改", notes = "CouponInfoVO.CouponInfo")
     public HttpResponseResult<CouponInfoVO.CouponQueryInfo> saveOrUpdate(@Valid @RequestBody CouponInfoVO.CouponInfo info) {
 

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/io/request/coupon/CouponInfoVO.java

@@ -52,6 +52,14 @@ public class CouponInfoVO {
         public String jsonString() {
             return JSON.toJSONString(this);
         }
+
+        public String getName() {
+
+            if (StringUtils.isEmpty(this.name)) {
+                return null;
+            }
+            return name;
+        }
     }
 
     /**
@@ -221,7 +229,7 @@ public class CouponInfoVO {
         @ApiModelProperty("领取次数限制")
         private Integer quantityLimit;
 
-        @ApiModelProperty("启禁状态")
+        @ApiModelProperty(value = "启禁状态", hidden = true)
         private Integer status;
 
         @ApiModelProperty(value = "更新用户", hidden = true)
@@ -264,7 +272,7 @@ public class CouponInfoVO {
                 }
 
                 if (Optional.ofNullable(getValidDay()).orElse(0) <= 0
-                        || (Optional.ofNullable(getStartTime()).orElse(0L) == 0
+                        && (Optional.ofNullable(getStartTime()).orElse(0L) == 0
                             || Optional.ofNullable(getEndTime()).orElse(0L) == 0)) {
                     throw new BizException("优惠券时间有效期不合法");
                 }