flowerbackend-v2.git

			@@ -274,6 +274,8 @@

			dto.setParams(parseArray(oi.getFlowerParams(), ParamItemDTO.class));

			dto.setNum(oi.getNum());

			return dto;
			}

			@@ -308,6 +310,8 @@
			dto.setFlowerCategory(oi.getFlowerCategory());

			dto.setParams(parseArray(oi.getFlowerParams(), ParamItemDTO.class));

			dto.setNum(oi.getNum());

			return dto;
			}
			@@ -607,7 +611,7 @@
			return dto;
			}

			public OrderItemCheckNumDTO getOtherCheck(String itemId, String type){
			public OrderItemCheckNumDTO getOtherCheck(String itemId, String type, boolean isSupplier){
			OrderItemCheck c = orderItemCheckMapper.selectOne(new QueryWrapper<OrderItemCheck>()
			.eq("type", type)
			.eq("order_item_id", itemId)
			@@ -619,6 +623,12 @@
			BeanUtils.copyProperties(c, dto);
			User user = userMapper.selectById(c.getCreateBy());
			dto.setCreateName(user.getNickName());

			if(Constants.CHECK_TYPE.lack.name().equals(c.getType()) && isSupplier){
			OrderItem oi = orderItemMapper.selectById(itemId);
			BigDecimal lackFeeSupplier = oi.getSupplierPrice().multiply(new BigDecimal(c.getNum()));
			dto.setDeductAmount(lackFeeSupplier);
			}
			}

			return dto;
			@@ -640,6 +650,16 @@
			throw new ValidationException("处理数量不能大于商品数量");
			}

			Order o = orderMapper.selectById(oi.getOrderId());
			if(StringUtils.isNotEmpty(o.getTransferId())){
			throw new ValidationException("已质检退款，不可提交质检记录");
			}

			if(!Constants.ORDER_STATUS_BACKEND.COLLECTION.name().equals(o.getStatusBackend())
			&& !Constants.ORDER_STATUS_BACKEND.SEND.name().equals(o.getStatusBackend())){
			throw new ValidationException("订单状态异常，不可提交质检记录");
			}

			List<OrderItemCheck> cLs = orderItemCheckMapper.selectList(new QueryWrapper<OrderItemCheck>()
			.ne("type", dto.getType())
			.eq("order_item_id", dto.getOrderItemId())