aa

business/jxstore/cms/job.go

@@ -1077,17 +1077,17 @@ func CancelJdDelivery(ctx *jxcontext.Context, vendorWaybillID, reason string) (e
 		dOrder = &model.DeliveryOrder{
 			VendorWaybillID: vendorWaybillID,
 		}
-		DayTimeBegin, DayTimeEnd = jxutils.GetDayTime()
+		// DayTimeBegin, DayTimeEnd = jxutils.GetDayTime()
 	)
 	err = dao.GetEntity(db, dOrder, "VendorWaybillID")
 	userBill, err := dao.GetUserBill(db, ctx.GetUserID(), "")
-	dOrders, err := dao.GetDeliveryOrdersNoPage(db, []string{ctx.GetUserID()}, []int{model.OrderStatusCanceled}, DayTimeBegin, DayTimeEnd, nil)
-	if err != nil {
-		return err
-	}
-	if len(dOrders) > 0 {
-		return fmt.Errorf("抱歉，您已经在今天取消过京东物流订单！")
-	}
+	// dOrders, err := dao.GetDeliveryOrdersNoPage(db, []string{ctx.GetUserID()}, []int{model.OrderStatusCanceled}, DayTimeBegin, DayTimeEnd, nil)
+	// if err != nil {
+	// 	return err
+	// }
+	// if len(dOrders) > 0 {
+	// 	return fmt.Errorf("抱歉，您已经在今天取消过京东物流订单！")
+	// }
 	if dOrder.ID == 0 {
 		return fmt.Errorf("未找到该运单！")
 	}
@@ -1484,3 +1484,28 @@ func AddressDistinguish(ctx *jxcontext.Context, address string) (result *txcloud
 	}
 	return result, err
 }
+
+func UpdateJob(ctx *jxcontext.Context, payload map[string]interface{}) (err error) {
+	var (
+		db  = dao.GetDB()
+		job = &model.Job{}
+	)
+	job.ID = payload["id"].(int)
+	err = dao.GetEntity(db, job)
+	valid := dao.StrictMakeMapByStructObject(payload, job, ctx.GetUserName())
+	if len(valid) > 0 {
+		dao.Begin(db)
+		defer func() {
+			if r := recover(); r != nil {
+				dao.Rollback(db)
+				panic(r)
+			}
+		}()
+		if _, err = dao.UpdateEntityByKV(db, job, valid, nil); err != nil {
+			dao.Rollback(db)
+			return err
+		}
+		dao.Commit(db)
+	}
+	return err
+}