寄售单详情

ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/ConsignSaleController.java

@@ -7,6 +7,7 @@ import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dto.request.ConsignSaleRecordRequestDto;
 import com.wwdz.ch.db.dto.request.ConsignSaleRequestDto;
 import com.xxdxxs.service.FormHandler;
+import com.xxdxxs.utils.StringUtils;
 import com.xxdxxs.validation.Validator;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -65,6 +66,9 @@ public class ConsignSaleController {
         if (!validator.isValid()) {
             return Result.failed(ResultCode.PARAM_ERROR.getCode(), validator.getErrorInfo());
         }
+        if (StringUtils.isEmpty(dto.getRemark())) {
+            return Result.failed("理由必填");
+        }
         return consignSaleService.imgValuate(dto);
     }
 
@@ -80,6 +84,9 @@ public class ConsignSaleController {
         if (!validator.isValid()) {
             return Result.failed(ResultCode.PARAM_ERROR.getCode(), validator.getErrorInfo());
         }
+        if (StringUtils.isEmpty(dto.getRemark())) {
+            return Result.failed("理由必填");
+        }
         return consignSaleService.identify(dto);
     }
 
@@ -95,6 +102,9 @@ public class ConsignSaleController {
         if (!validator.isValid()) {
             return Result.failed(ResultCode.PARAM_ERROR.getCode(), validator.getErrorInfo());
         }
+        if (StringUtils.isEmpty(dto.getRemark())) {
+            return Result.failed("成交平台必填");
+        }
         return consignSaleService.finish(dto);
     }
 
@@ -109,6 +119,9 @@ public class ConsignSaleController {
         if (!validator.isValid()) {
             return Result.failed(ResultCode.PARAM_ERROR.getCode(), validator.getErrorInfo());
         }
+        if (StringUtils.isEmpty(dto.getRemark())) {
+            return Result.failed("理由必填");
+        }
         return consignSaleService.cancel(dto);
     }
 }

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/ConsignSaleServiceImpl.java

@@ -26,6 +26,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -95,14 +97,20 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
     @Override
     public Result findDetail(ConsignSaleRequestDto dto) {
         try {
+            ConsignSaleDetailVo consignSaleDetailVo = new ConsignSaleDetailVo();
+            ConsignSale consignSale = consignSaleDao.findById(dto.getSaleId());
+            if (ObjectUtils.isEmpty(consignSale)) {
+                return Result.failed("寄售单不存在");
+            }
+            long itemId = consignSale.getItemId();
             CoinRequestDto coinRequestDto = new CoinRequestDto();
-            coinRequestDto.setId(dto.getItemId());
+            coinRequestDto.setId(itemId);
             Result<ItemVo> itemResult = itemService.findDetails(coinRequestDto);
             if (!itemResult.getSuccess()) {
                 return itemResult;
             }
-            ConsignSaleDetailVo consignSaleDetailVo = new ConsignSaleDetailVo();
             consignSaleDetailVo.setItemVo(itemResult.getData());
+
             //查询寄售单信息
             List<ConsignSaleRecord> consignSaleRecords = consignSaleRecordDao.find(dto.getSaleId());
             List<ConsignSaleRecordVo> consignSaleRecordVoList = new ArrayList<>();