小程序订单详情页新增信息展示

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

@@ -269,7 +269,6 @@ public class SysIdentifyOrderServiceImpl implements SysIdentifyOrderService {
     }
 
     @Override
-    @Transactional
     public Result sendBack(IdentifyOrderRequestDto dto) {
         try {
             //修改鉴定单状态
@@ -282,7 +281,6 @@ public class SysIdentifyOrderServiceImpl implements SysIdentifyOrderService {
             return Result.success();
         } catch (Exception e) {
             logger.info("审核不通过退回商品失败 error: {}", e);
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
         }
         return Result.failed();
     }

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/DistributionOrderRequestDto.java

@@ -52,6 +52,12 @@ public class DistributionOrderRequestDto extends BaseRequestDto implements Entit
      */
     private String distributionOrderId;
 
+
+    /**
+     * 鉴定单号
+     */
+    private String identifyOrderId;
+
     /**
      * 买方id
      */

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

@@ -954,6 +954,17 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             distributionOrderDetailVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(distributionOrder.getType()));
             distributionOrderDetailVo.setLogisticsName(LogisticsEnum.getNameByCode(distributionOrder.getLogisticsCode()));
 
+            if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.COLLECT.getCode()
+                    && distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.CANCEL.getCode()) {
+                //如果藏家订单是取消状态，查询对应鉴定单信息
+                IdentifyOrder identifyOrder = identifyOrderDao.findByDistributionOrderId(dto.getDistributionOrderId());
+                distributionOrderDetailVo.setOutLogisticsCode(identifyOrder.getOutLogisticsCode());
+                distributionOrderDetailVo.setOutLogisticsName(LogisticsEnum.getNameByCode(identifyOrder.getOutLogisticsCode()));
+                distributionOrderDetailVo.setOutWaybill(identifyOrder.getOutWaybill());
+                distributionOrderDetailVo.setTransferState(identifyOrder.getState());
+                distributionOrderDetailVo.setApproved(distributionOrderDetailVo.getApproved());
+                distributionOrderDetailVo.setApprovedRemark(identifyOrder.getRemark());
+            }
             //一口价支付截止时间为下单半小时后，竞拍为24小时
             Date date = distributionOrder.getCreateTime();
             if (type == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode()) {
@@ -1059,6 +1070,15 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             distributionOrderDetailVo.setIntroduceRebate(PriceUtil.convertPriceFromStr(String.valueOf(rebate)).toString());
             distributionOrderDetailVo.setProfit(PriceUtil.convertPriceFenToYuan(distributorProfit.getProfit()));
 
+            //如果藏家订单是取消状态，查询对应鉴定单状态
+            IdentifyOrder identifyOrder = identifyOrderDao.findByDistributionOrderId(dto.getDistributionOrderId());
+            distributionOrderDetailVo.setOutLogisticsCode(identifyOrder.getOutLogisticsCode());
+            distributionOrderDetailVo.setOutLogisticsName(LogisticsEnum.getNameByCode(identifyOrder.getOutLogisticsCode()));
+            distributionOrderDetailVo.setOutWaybill(identifyOrder.getOutWaybill());
+            distributionOrderDetailVo.setTransferState(identifyOrder.getState());
+            distributionOrderDetailVo.setApproved(distributionOrderDetailVo.getApproved());
+            distributionOrderDetailVo.setApprovedRemark(identifyOrder.getRemark());
+
             //一口价支付截止时间为下单半小时后，竞拍为24小时
             Date date = distributionOrder.getCreateTime();
             if (type == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode() || type == DistributionEnum.DistributionTypeEnum.COLLECT.getCode()) {
@@ -1252,4 +1272,19 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
         return Result.failed("创建折扣商品订单失败");
     }
 
+
+    @Override
+    public Result collectorConfirmReturn(DistributionOrderRequestDto dto) {
+        try {
+            //修改鉴定单状态
+            IdentifyOrder identifyOrder = new IdentifyOrder();
+            identifyOrder.setIdentifyOrderId(dto.getIdentifyOrderId());
+            identifyOrder.setState(DistributionEnum.IdentifyOrderStateEnum.RETURN_SIGNED.getCode());
+            identifyOrderDao.update(identifyOrder);
+            return Result.success();
+        } catch (Exception e) {
+            logger.info("藏家已确认退回商品收货 error: {}", e);
+        }
+        return Result.failed();
+    }
 }

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

@@ -115,7 +115,12 @@ public interface DistributionOrderService {
      */
     Result refund(DistributionOrderRequestDto dto);
 
-
+    /**
+     * 藏家确认收到退货
+     * @param dto
+     * @return
+     */
+    Result collectorConfirmReturn(DistributionOrderRequestDto dto);
 
 
 }

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

@@ -276,4 +276,17 @@ public class DistributionOrderController {
         return distributionOrderService.refund(dto);
     }
 
+
+    @ApiOperation(value = "藏家确认商品已退回")
+    @PostMapping("/collectorConfirmReturn")
+    public Result collectorConfirmReturn(@RequestBody DistributionOrderRequestDto dto) {
+        logger.info("藏家确认商品已退回,请求参数:{}", JSON.toJSONString(dto));
+        Validator validator = new Validator(FormHandler.ofEntity(dto));
+        validator.set("identifyOrderId", "鉴定单号").must().string()
+                .end();
+        if (!validator.isValid()) {
+            return Result.failed(validator.getErrorInfo());
+        }
+        return distributionOrderService.collectorConfirmReturn(dto);
+    }
 }