src/main/java/com/mzl/flower/dto/request/payment/OrderItemCheckCommitDTO.java
@@ -20,4 +20,7 @@ @ApiModelProperty(value = "备注") private String remarks; @ApiModelProperty(value = "订单商品图片") private List<String> pictureList; } src/main/java/com/mzl/flower/dto/request/payment/OrderItemCheckCommitReduceDTO.java
@@ -9,9 +9,6 @@ @Data public class OrderItemCheckCommitReduceDTO extends OrderItemCheckCommitDTO { @ApiModelProperty(value = "订单商品id") private List<String> pictureList; @ApiModelProperty(value = "处理类型") private String targetLevel;
@@ -39,4 +39,8 @@ @ApiModelProperty(value = "质检人") private String createName; @ApiModelProperty(value = "图片") private String pictures; private List<String> pictureList; } src/main/java/com/mzl/flower/dto/response/payment/OrderItemCheckReduceDTO.java
@@ -11,10 +11,6 @@ @Data public class OrderItemCheckReduceDTO extends OrderItemCheckNumDTO { @ApiModelProperty(value = "图片") private String pictures; private List<String> pictureList; @ApiModelProperty(value = "降级等级") @DictTrans(target = "targetLevelStr", codeType = "FLOWER_LEVEL") private String targetLevel; src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
@@ -631,6 +631,8 @@ User user = userMapper.selectById(c.getCreateBy()); dto.setCreateName(user.getNickName()); dto.setPictureList(parseArray(c.getPictures(), String.class)); if(Constants.CHECK_TYPE.lack.name().equals(c.getType()) && isSupplier){ OrderItem oi = orderItemMapper.selectById(itemId); BigDecimal lackFeeSupplier = oi.getSupplierPrice().multiply(new BigDecimal(c.getNum())); @@ -643,15 +645,19 @@ public void doReduceCheck(OrderItemCheckCommitReduceDTO dto){ dto.setType(Constants.CHECK_TYPE.reduce.name()); doCheck(dto, dto.getPictureList(), dto.getTargetLevel(), dto.getDeductAmount()); doCheck(dto, dto.getTargetLevel(), dto.getDeductAmount()); } public void doCheck(OrderItemCheckCommitDTO dto , List<String> pictureList, String targetLevel, BigDecimal deductAmount) { public void doCheck(OrderItemCheckCommitDTO dto, String targetLevel, BigDecimal deductAmount) { if(dto.getNum() == null || dto.getNum() == 0){ throw new ValidationException("处理数量不能为0"); } List<String> pictureList = dto.getPictureList(); if(pictureList == null || pictureList.size() == 0){ throw new ValidationException("质检图片不能为空"); } OrderItem oi = orderItemMapper.selectById(dto.getOrderItemId()); if(dto.getNum() > oi.getNum()){ throw new ValidationException("处理数量不能大于商品数量"); src/main/java/com/mzl/flower/web/payment/DeliveryOrderController.java
@@ -294,7 +294,7 @@ @ApiOperation(value = "补货操作") public ResponseEntity<ReturnDataDTO> doReplaceCheck(@RequestBody OrderItemCheckCommitDTO dto) { dto.setType(Constants.CHECK_TYPE.replace.name()); deliveryOrderService.doCheck(dto, null, null, null); deliveryOrderService.doCheck(dto, null, null); String orderId = deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId()); deliveryOrderService.checkOrderStatus(orderId); return returnData(R.SUCCESS.getCode(), null); @@ -304,7 +304,7 @@ @ApiOperation(value = "缺货操作") public ResponseEntity<ReturnDataDTO> doLackCheck(@RequestBody OrderItemCheckCommitDTO dto) { dto.setType(Constants.CHECK_TYPE.lack.name()); deliveryOrderService.doCheck(dto, null, null, null); deliveryOrderService.doCheck(dto, null, null); String orderId = deliveryOrderService.checkOrderItemStatus(dto.getOrderItemId()); deliveryOrderService.checkOrderStatus(orderId); return returnData(R.SUCCESS.getCode(), null);
