|
@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
+import com.qcloud.cos.common_utils.CommonFileUtils;
|
|
|
import com.yiqi.common.exception.ServiceException;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.yiqi.app.domain.AppUser;
|
|
@@ -16,8 +17,10 @@ import com.yiqi.common.utils.DateUtils;
|
|
|
import com.yiqi.common.utils.SecurityUtils;
|
|
|
import com.yiqi.common.utils.StringUtils;
|
|
|
import com.yiqi.core.domain.ClothHanger;
|
|
|
+import com.yiqi.core.domain.ClothHangerOrderRelation;
|
|
|
import com.yiqi.core.domain.SettlementManageBill;
|
|
|
import com.yiqi.core.domain.dto.SettlementBillAddDTO;
|
|
|
+import com.yiqi.core.service.IClothHangerOrderRelationService;
|
|
|
import com.yiqi.core.service.IClothHangerService;
|
|
|
import com.yiqi.order.domain.*;
|
|
|
import com.yiqi.order.domain.dto.*;
|
|
@@ -29,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import com.yiqi.order.mapper.OrderClothItemMapper;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
/**
|
|
|
* 洗衣订单衣服明细Service业务层处理
|
|
@@ -58,6 +62,8 @@ public class OrderClothItemServiceImpl extends ServiceImpl<OrderClothItemMapper,
|
|
|
private IAppUserService appUserService;
|
|
|
@Autowired
|
|
|
private IOrderClothItemFlowRecordService orderClothItemFlowRecordService;
|
|
|
+ @Autowired
|
|
|
+ private IClothHangerOrderRelationService clothHangerOrderRelationService;
|
|
|
|
|
|
@Override
|
|
|
public OrderClothItemCountStatisticVO getUnFinishedOrderClothCountGroupByStatus() {
|
|
@@ -306,8 +312,11 @@ public class OrderClothItemServiceImpl extends ServiceImpl<OrderClothItemMapper,
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
public void reFlowCloth(Long orderClothItemId) {
|
|
|
baseMapper.reFlowCloth(orderClothItemId);
|
|
|
+ clothHangerOrderRelationService.remove(new QueryWrapper<ClothHangerOrderRelation>().lambda()
|
|
|
+ .eq(ClothHangerOrderRelation::getOrderClothItemId, orderClothItemId));
|
|
|
}
|
|
|
|
|
|
@Override
|