用户基础商品校验是否确认过报价2

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

@@ -371,7 +371,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
                 if (diffInHours >= 24) {
                     consignSaleRecordVo.setIsTimeOut(true);
                     //超时了，但是当前寄售单不是取消状态，就更新寄售单状态
-                    if (consignSale.getCustomState().intValue() != ConsignSaleEnum.SaleForUserStateEnum.CANCEL.getCode()) {
+                    if (consignSale.getCustomState() != ConsignSaleEnum.SaleForUserStateEnum.CANCEL.getCode()) {
                         //超时取消
                         timeOutForCancel(dto);
                         consignSaleRecordVo.setCustomState(ConsignSaleEnum.SaleForUserStateEnum.CANCEL.getCode());
@@ -452,7 +452,6 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
         return Result.failed();
     }
 
-    @Transactional
     @Override
     public Result timeOutForCancel(ConsignSaleRequestDto dto) {
         try {
@@ -466,7 +465,6 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             return Result.success();
         } catch (Exception e) {
             logger.error("用户超时未确认，取消寄售单 error : {}", e);
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         }
         return Result.failed();
     }
@@ -506,6 +504,16 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
     }
 
 
+    @Override
+    public Result checkUserSend(ConsignSaleRequestDto dto) {
+        List<ConsignSaleRecord> consignSaleRecords = consignSaleRecordDao.find(dto.getSaleId());
+        long count = consignSaleRecords.stream().filter(consignSaleRecord -> consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.USER_CONFIRM_VALUATE.getCode()).count();
+        if (count == 0) {
+            return Result.failed(ResultCode.NOT_CONFIRM_PRICE_FOR_SEND);
+        }
+        return Result.success();
+    }
+
     @Override
     public Result userSend(ConsignSaleRequestDto dto) {
         try {
@@ -515,7 +523,6 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
             if (count == 0) {
                 return Result.failed(ResultCode.NOT_CONFIRM_PRICE_FOR_SEND);
             }
-
             //用户寄出商品，状态改为已寄出，后台为待收货
             ConsignSale consignSale = new ConsignSale();
             consignSale.setSaleId(dto.getSaleId());
@@ -561,7 +568,8 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
                 consignSale.setSystemState(ConsignSaleEnum.SaleForSysStateEnum.CANCEL.getCode());
                 consignSaleDao.update(consignSale);
                 //商品下架
-                itemDao.updateOnSale(dto.getItemId(), ItemStateEnum.SHELVE.getCode());
+                ConsignSale consignSaleInfo = consignSaleDao.findById(dto.getSaleId());
+                itemDao.updateOnSale(consignSaleInfo.getItemId(), ItemStateEnum.SHELVE.getCode());
 
                 //插入操作记录,用户不满意建议零售价
                 consignSaleRecordDao.insert(dto.getSaleId(), "取消类型:用户主动取消", ConsignSaleEnum.OperateTypeEnum.CUSTOM_CANCEL.getCode(), "理由:不满意建议寄售价");

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/ConsignSaleService.java

@@ -66,6 +66,14 @@ public interface ConsignSaleService {
      */
     Result timeOutForCancel(ConsignSaleRequestDto dto);
 
+
+    /**
+     * 检验用户是否可以寄出商品
+     * @param dto
+     * @return
+     */
+    Result checkUserSend(ConsignSaleRequestDto dto);
+
     /**
      * 用户寄出商品
      * @param dto

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

@@ -158,6 +158,21 @@ public class ConsignSaleController {
     }
 
 
+    @ApiOperation(value = "检验用户是否可以寄出商品")
+    @PostMapping("/userSend")
+    public Result checkUserSend(@RequestBody ConsignSaleRequestDto dto) {
+        logger.info("【请求开始】检验用户是否可以寄出商品,请求参数:{}", JSON.toJSONString(dto));
+        Validator validator = new Validator(FormHandler.ofEntity(dto));
+        validator.set("saleId", "寄售单号").must().string()
+                .end();
+        if (!validator.isValid()) {
+            return Result.failed(ResultCode.PARAM_ERROR.getCode(), validator.getErrorInfo());
+        }
+        return consignSaleService.checkUserSend(dto);
+    }
+
+
+
     @ApiOperation(value = "用户寄出商品")
     @PostMapping("/userSend")
     public Result userSend(@RequestBody ConsignSaleRequestDto dto) {