Browse Source

fix:修改任务时间未查询到物流信息则不修改物流信息

zoie 5 months ago
parent
commit
dc9912b0dd
2 changed files with 10 additions and 9 deletions
  1. 1 0
      app/admin/service/waybill_logistics.go
  2. 9 9
      app/admin/service/waybill_task.go

+ 1 - 0
app/admin/service/waybill_logistics.go

@@ -94,6 +94,7 @@ func (e *WaybillLogistics) Update(c *dto.WaybillLogisticsUpdateReq, p *actions.D
 				}
 				return errors.New(fmt.Sprintf("运单号%s查询失败", waybillLogisticsModel.WaybillNo))
 			}
+
 			waybillModel.ReceiptTime = logistics.Time
 			err = tx.Save(&waybillModel).Error
 			if err != nil {

+ 9 - 9
app/admin/service/waybill_task.go

@@ -535,19 +535,19 @@ func (e *WaybillTask) Update(c *dto.WaybillTaskUpdateReq, p *actions.DataPermiss
 			// 查询运单是否存在
 			err = e.Orm.Scopes(actions.Permission(waybillLogistics.TableName(), p)).
 				Where("created_at = ? and status != ?", oldEndTime, model.WaybillStatusReceipt).Last(&waybillLogistics).Error
-			if err != nil {
+			if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 				e.Log.Errorf("db error: %s", err)
-				if errors.Is(err, gorm.ErrRecordNotFound) {
-					return global.UpdateNotFoundOrNoPermissionErr
-				}
 				return global.UpdateFailedErr
 			}
-			waybillLogistics.CreatedAt = task.EndTime
-			err = tx.Save(&waybillLogistics).Error
-			if err != nil {
-				e.Log.Errorf("db error: %s", err)
-				return global.UpdateFailedErr
+			if waybillLogistics.Id > 0 {
+				waybillLogistics.CreatedAt = task.EndTime
+				err = tx.Save(&waybillLogistics).Error
+				if err != nil {
+					e.Log.Errorf("db error: %s", err)
+					return global.UpdateFailedErr
+				}
 			}
+
 		}
 
 		// 修改运单物流时间