修改客户端配置查询报错问题

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/CouponModifyParam.java

@@ -5,6 +5,7 @@ import lombok.*;
 import lombok.experimental.SuperBuilder;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.util.Date;
 
@@ -24,13 +25,13 @@ public class CouponModifyParam {
     /**
      * 商家ID
      */
-    @NotEmpty(message = "商家ID不能为空")
+    @NotNull(message = "商家ID不能为空")
     private Long merchantId;
 
     /**
      * 优惠券类型
      */
-    @NotEmpty(message = "优惠券类型不能为空")
+    @NotNull(message = "优惠券类型不能为空")
     private CouponType type;
 
     /**
@@ -43,19 +44,19 @@ public class CouponModifyParam {
     /**
      * 优惠金额
      */
-    @NotEmpty(message = "优惠金额不能为空")
+    @NotNull(message = "优惠金额不能为空")
     private Double amount;
 
     /**
      * 满减金额
      */
-    @NotEmpty(message = "满减金额不能为空")
+    @NotNull(message = "满减金额不能为空")
     private Double reduce;
 
     /**
      * 优惠折扣
      */
-    @NotEmpty(message = "优惠折扣不能为空")
+    @NotNull(message = "优惠折扣不能为空")
     private Double discount;
 
     /**
@@ -73,6 +74,6 @@ public class CouponModifyParam {
     /**
      * 优惠券状态
      */
-    @NotEmpty(message = "优惠券状态不能为空")
+    @NotNull(message = "优惠券状态不能为空")
     private CouponStatus status;
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/GoodsModifyParam.java

@@ -6,6 +6,7 @@ import lombok.*;
 import lombok.experimental.SuperBuilder;
 
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.util.List;
 
@@ -25,21 +26,19 @@ public class GoodsModifyParam {
     /**
      * 分类类型
      */
-    @NotEmpty(message = "分类类型不能为空")
-    @Size(max = 100, message = "分类类型长度不能大于50")
+    @NotNull(message = "分类类型不能为空")
     private CategoryType type;
 
     /**
      * 分类ID
      */
-    @NotEmpty(message = "分类ID不能为空")
-    @Size(max = 100, message = "分类ID长度不能大于20")
+    @NotNull(message = "分类ID不能为空")
     private Long categoryId;
 
     /**
      * 商家ID
      */
-    @NotEmpty(message = "商家ID不能为空")
+    @NotNull(message = "商家ID不能为空")
     private Long merchantId;
 
     /**
@@ -70,16 +69,15 @@ public class GoodsModifyParam {
     /**
      * 商品原价
      */
-    @NotEmpty(message = "商品原价不能为空")
-    @Size(max = 100, message = "商品原价长度不能大于10")
+    @NotNull(message = "商品原价不能为空")
     private Double originalPrice;
 
     /**
      * 优惠价格
      */
-    @NotEmpty(message = "优惠价格不能为空")
-    @Size(max = 100, message = "优惠价格长度不能大于10")
+    @NotNull(message = "优惠价格不能为空")
     private Double specialPrice;
+    //
 
     /**
      * 优惠券ID列表
@@ -89,6 +87,6 @@ public class GoodsModifyParam {
     /**
      * 商品状态
      */
-    @NotEmpty(message = "商品状态不能为空")
+    @NotNull(message = "商品状态不能为空")
     private GoodsStatus status;
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/copier/CouponCopier.java

@@ -3,6 +3,8 @@ package com.chelvc.cloud.vehicle.server.copier;
 import com.chelvc.cloud.vehicle.api.dto.CouponDTO;
 import com.chelvc.cloud.vehicle.api.param.CouponModifyParam;
 import com.chelvc.cloud.vehicle.server.entity.Coupon;
+import org.mapstruct.Builder;
+import org.mapstruct.Mapper;
 import org.mapstruct.MappingTarget;
 import org.mapstruct.factory.Mappers;
 
@@ -15,6 +17,7 @@ import java.util.List;
  * @author liude
  * @date 2023/8/30
  */
+@Mapper(builder = @Builder(disableBuilder = true))
 public interface CouponCopier {
     /**
      * 对象拷贝接口实例

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/CouponServiceImpl.java

@@ -18,6 +18,9 @@ import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.database.context.DatabaseContextHolder;
 import com.chelvc.framework.database.util.PagingUtils;
 import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -26,7 +29,8 @@ import org.springframework.stereotype.Service;
  * @author liude
  * @date 2023/8/17
  */
-@Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@DubboService(interfaceClass = com.chelvc.cloud.vehicle.api.service.CouponService.class)
 public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> implements CouponService,
         com.chelvc.cloud.vehicle.api.service.CouponService {
     @Override

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/GoodsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.chelvc.cloud.vehicle.server.service.impl;
 
 import java.util.List;
+import java.util.Objects;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,6 +17,7 @@ import com.chelvc.cloud.vehicle.server.copier.GoodsCopier;
 import com.chelvc.cloud.vehicle.server.dao.GoodsMapper;
 import com.chelvc.cloud.vehicle.server.entity.Coupon;
 import com.chelvc.cloud.vehicle.server.entity.Goods;
+import com.chelvc.cloud.vehicle.server.entity.Merchant;
 import com.chelvc.cloud.vehicle.server.service.CommentService;
 import com.chelvc.cloud.vehicle.server.service.CouponService;
 import com.chelvc.cloud.vehicle.server.service.GoodsService;
@@ -107,7 +109,8 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     public Pagination<GoodsDTO> getGoodsPaging(@NonNull GoodsPagingParam param) {
         Page<Goods> page = this.lambdaQuery()
                 .like(StringUtils.nonEmpty(param.getName()), Goods::getName, param.getName())
-                .orderByAsc(Goods::getStatus).page(PagingUtils.convert(param.getPaging()));
+                .eq(Objects.nonNull(param.getStatus()), Goods::getStatus, param.getStatus())
+                .orderByAsc(Goods::getCreateTime).page(PagingUtils.convert(param.getPaging()));
         return PagingUtils.convert(page, GoodsCopier.INSTANCE::copying);
     }
 }