参数校验

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/SupplierItemServiceImpl.java

@@ -796,13 +796,19 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                 supplierItemVo.setItemId(supplierItem.getId());
                 supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
                 supplierItemVo.setShareId(map.get(supplierItem.getId())== null?"":map.get(supplierItem.getId()).getShareId());
+
+
                 //竞拍商品需要展示当前价
                 if (supplierItem.getType() == DistributionEnum.DistributionTypeEnum.AUCTION.getCode()) {
                     AuctionRecord lastedRecord = auctionRecordDao.findLastedRecord(supplierItem.getId());
                     if (lastedRecord != null && lastedRecord.getPrice() != null) {
                         supplierItemVo.setCurrentPrice(PriceUtil.convertPriceFenToYuan(lastedRecord.getPrice()));
+                        supplierItemVo.setUserState(DistributionEnum.AuctionUserStateEnum.END.getCode());
+                        supplierItemVo.setUserStateName(DistributionEnum.AuctionUserStateEnum.END.getDes());
                     } else {
                         supplierItemVo.setCurrentPrice("0");
+                        supplierItemVo.setUserState(DistributionEnum.AuctionUserStateEnum.PROCESS.getCode());
+                        supplierItemVo.setUserStateName(DistributionEnum.AuctionUserStateEnum.PROCESS.getDes());
                     }
                     AuctionConfig auctionConfig = auctionConfigDao.findByItemId(supplierItem.getId());
                     supplierItemVo.setRealEndTime(auctionConfig.getRealEndTime());
@@ -819,7 +825,6 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                         if (auctionConfig.getIsValid()) {
                             auctionConfigDao.setEnd(supplierItem.getId());
                         }
-
                         if (lastedRecord != null) {
                             //如果是该用户竞拍成功，还没生成订单则用户状态为立即支付
                             if (lastedRecord.getUserId().longValue() == dto.getUserId().longValue()) {
@@ -845,7 +850,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                             }
                         }
                     } else {
-                        if (lastedRecord != null) {
+                        if (lastedRecord != null && lastedRecord.getPrice() != null) {
                             if (lastedRecord.getUserId().longValue() == dto.getUserId().longValue()) {
                                 supplierItemVo.setUserState(DistributionEnum.AuctionUserStateEnum.LEAD.getCode());
                                 supplierItemVo.setUserStateName(DistributionEnum.AuctionUserStateEnum.LEAD.getDes());

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/distribution/SupplierItemController.java

@@ -86,12 +86,11 @@ public class SupplierItemController {
     @PostMapping("/upload")
     public Result upload(@RequestBody SupplierItemRequestDto dto) {
         logger.info("上传藏品,请求参数:{}", JSON.toJSONString(dto));
-        Validator validator = new Validator(FormHandler.ofEntity(dto));
-        validator.set("name", "商品名称").must().string()
-                .set("images", "图片").must().string()
-                .end();
-        if (!validator.isValid()) {
-            return Result.failed(validator.getErrorInfo());
+        if (StringUtils.isEmpty(dto.getName())) {
+            return Result.failed("商品名称必填");
+        }
+        if (StringUtils.isEmpty(dto.getImages())) {
+            return Result.failed("至少上传一张图片");
         }
         return supplierItemService.create(dto);
     }