diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessDealRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessDealRecord.java index 17e0770..45701f0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessDealRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessDealRecord.java @@ -25,6 +25,9 @@ private Long createUser; + @ApiModelProperty("操作类型") + private String dealType; + @ApiModelProperty("操作人名称") private String createUserName; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessDealRecord.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessDealRecord.java index 17e0770..45701f0 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessDealRecord.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessDealRecord.java @@ -25,6 +25,9 @@ private Long createUser; + @ApiModelProperty("操作类型") + private String dealType; + @ApiModelProperty("操作人名称") private String createUserName; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index 48742b4..4828151 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -103,6 +103,9 @@ */ @Override public ReturnDTO updateOrder(BusinessOrder businessOrder) { + if (CollectionUtils.isEmpty(businessOrder.getCustomerSampleInfoList())) { + return ReturnUtil.failed("样品列表不能为空"); + } AuthUser authUser = ShiroKit.getUser(); businessOrder.setUpdateUser(authUser.getId()); int updateFlag = this.baseMapper.updateById(businessOrder); @@ -199,7 +202,8 @@ @Override public ReturnDTO updateStatusById(OrderCancelRequest orderCancelRequest, String status) { int updateFlag = doUpdateStatusById(orderCancelRequest.getId(), status); - int addDealRecordFlag = addDealRecord(orderCancelRequest); + String dealType = "委托书" + ((status.equals("2")) ? "接收" : "退回"); + int addDealRecordFlag = addDealRecord(orderCancelRequest, dealType); if (updateFlag > 0 && addDealRecordFlag > 0) { return ReturnUtil.success(); } @@ -213,7 +217,7 @@ @Transactional public ReturnDTO cancelOrder(OrderCancelRequest orderCancelRequest) { int updateFlag = this.doUpdateStatusById(orderCancelRequest.getId(), "3"); - int addDealRecordFlag = addDealRecord(orderCancelRequest); + int addDealRecordFlag = addDealRecord(orderCancelRequest, "委托书取消"); if (updateFlag > 0 && addDealRecordFlag > 0) { return ReturnUtil.success(); } @@ -226,14 +230,15 @@ @Override public List optionRecord(Long id) { QueryWrapper dealRecordQueryWrapper = new QueryWrapper() - .eq("order_id", id); + .eq("order_id", id) + .orderByDesc("create_time"); return dealRecordMapper.selectList(dealRecordQueryWrapper); } /** * 新增操作记录 */ - private int addDealRecord(OrderCancelRequest orderCancelRequest) { + private int addDealRecord(OrderCancelRequest orderCancelRequest, String dealType) { AuthUser authUser = ShiroKit.getUser(); BusinessDealRecord businessDealRecord = BusinessDealRecord.builder() .createUser(authUser.getId())