Merge remote-tracking branch 'origin/master'

yiqi-admin/src/main/java/com/yiqi/admin/controller/order/OrderClothItemController.java

@@ -300,7 +300,6 @@ public class OrderClothItemController extends BaseController {
     @ApiOperation("工厂衣服检查")
     @GetMapping(value = "checkCloth")
     public R<OrderClothItemVO> checkCloth(@RequestParam @ApiParam("水洗唛") String washCode) throws Exception {
-
         OrderClothItemVO orderClothItemVO = new OrderClothItemVO();
         OrderClothItem orderClothItem = null;
         if (washCode.contains(OrderNoUtils.cloth_wash_code_header)) {
@@ -988,8 +987,6 @@ public class OrderClothItemController extends BaseController {
     @ApiOperation(value = "重洗衣服")
     public AjaxResult reFlowCloth(@RequestParam Long orderClothItemId) {
         orderClothItemService.reFlowCloth(orderClothItemId);
-        clothHangerOrderRelationService.remove(new QueryWrapper<ClothHangerOrderRelation>().lambda()
-                .eq(ClothHangerOrderRelation::getOrderClothItemId, orderClothItemId));
         return toAjax(true);
     }
 }

yiqi-common/src/main/java/com/yiqi/order/domain/OrderClothItem.java

@@ -77,6 +77,9 @@ public class OrderClothItem extends BaseEntity
     @ApiModelProperty("衣服品牌ID")
     private Long clothBrandId;
 
+    @ApiModelProperty("重洗次数")
+    private Integer repeatCount;
+
     @ApiModelProperty("衣服品牌名称")
     private String clothBrandName;
 

yiqi-common/src/main/java/com/yiqi/order/domain/vo/OrderClothItemVO.java

@@ -72,6 +72,10 @@ public class OrderClothItemVO extends BaseEntity {
     @ApiModelProperty("来源类型")
     private String sourceType;
 
+    @Excel(name = "重洗次数")
+    @ApiModelProperty("重洗次数")
+    private Integer repeatCount;
+
     /**
      * 工厂ID
      */

yiqi-core/src/main/java/com/yiqi/order/service/impl/OrderClothItemServiceImpl.java

@@ -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

yiqi-core/src/main/java/com/yiqi/order/service/impl/OrderClothServiceImpl.java

@@ -739,6 +739,7 @@ public class OrderClothServiceImpl extends ServiceImpl<OrderClothMapper, OrderCl
             orderClothItem.setFactoryId(orderCloth.getFactoryId());
             orderClothItem.setWashCode(orderNoUtils.getClothWashCode());
             orderClothItem.setClothItemId(orderClothItemDTO.getClothItemId());
+            orderClothItem.setRepeatCount(0);
             orderClothItem.setClothItemName(orderClothItemDTO.getClothItemName());
             orderClothItem.setClothBrandId(orderClothItemDTO.getClothBrandId());
             orderClothItem.setClothBrandName(orderClothItemDTO.getClothBrandName());

yiqi-core/src/main/resources/mapper/order/OrderClothItemMapper.xml

@@ -420,7 +420,7 @@
     </update>
     <update id="reFlowCloth">
         update order_cloth_item
-        set flow_status = '0',cloth_hanger_code = null ,cloth_hanger_id = null
+        set flow_status = '0', repeat_count = repeat_count + 1, cloth_hanger_code = null ,cloth_hanger_id = null
         where id = #{orderClothItemId}
 </update>