fix:删除活动

internal/cron/task.go

@@ -7,7 +7,6 @@ import (
 	"log"
 	"recook/configs"
 	order3 "recook/internal/api/mobile/order"
-	"recook/internal/cache"
 	"recook/internal/dbc"
 	order4 "recook/internal/model/order"
 	"recook/internal/mq"
@@ -16,7 +15,6 @@ import (
 	"recook/internal/v2/lib/jcook"
 	"recook/internal/v2/lib/shama"
 	after2 "recook/internal/v2/logic/manage/after"
-	"recook/internal/v2/logic/manage/message"
 	order2 "recook/internal/v2/logic/manage/order"
 	"recook/internal/v2/model/recook/after"
 	goods2 "recook/internal/v2/model/recook/goods"
@@ -39,17 +37,12 @@ func Task(c *cron.Cron) {
 	_ = c.AddFunc("*/10 * * * * ?", func() {
 		fmt.Println("task live")
 	})
-	_ = c.AddFunc("0 */10 * * * ?", func() {
-		if err := cache.FlushNewerGoodsID(); err != nil {
-			fmt.Println("设置新人特惠集合 出错：", err)
-		}
-	})
 	_ = c.AddFunc("0 */10 * * * ?", func() {
 		NoticeDelete()
 	})
-	_ = c.AddFunc("0 */1 * * * ?", func() {
-		message.DeliveryTimeOut()
-	})
+	//_ = c.AddFunc("0 */1 * * * ?", func() {
+	//	message.DeliveryTimeOut()
+	//})
 	_ = c.AddFunc("0 */1 * * * ?", func() {
 		order3.PlanMonitorTradeSucOrderTask()
 	})

internal/v2/controller/app/jyy/jyy.go

@@ -96,3 +96,42 @@ func (o Proxy) OrderUpdate(c *gin.Context) {
 		back.Suc(c, "ok", "")
 	}
 }
+
+func (o Proxy) OrderCancel(c *gin.Context) {
+	var args jyy.OrderEntry
+	if err := tools.ParseParams(&args, c); err != nil {
+		back.Err(c, err.Error())
+		return
+	}
+	if err := jyy.Logic.OrderCancel(args); err != nil {
+		back.Fail(c, err.Error())
+	} else {
+		back.Suc(c, "ok", "")
+	}
+}
+
+func (o Proxy) OrderConfirm(c *gin.Context) {
+	var args jyy.OrderEntry
+	if err := tools.ParseParams(&args, c); err != nil {
+		back.Err(c, err.Error())
+		return
+	}
+	if err := jyy.Logic.OrderConfirm(args); err != nil {
+		back.Fail(c, err.Error())
+	} else {
+		back.Suc(c, "ok", "")
+	}
+}
+
+func (o Proxy) OrderMakeUp(c *gin.Context) {
+	var args jyy.OrderEntry
+	if err := tools.ParseParams(&args, c); err != nil {
+		back.Err(c, err.Error())
+		return
+	}
+	if err := jyy.Logic.OrderMakeUp(args); err != nil {
+		back.Fail(c, err.Error())
+	} else {
+		back.Suc(c, "ok", "")
+	}
+}

internal/v2/logic/app/jyy/jyy.go

@@ -403,3 +403,26 @@ func (o logic) OrderUpdate(args OrderAddrUpdate) (err error) {
 
 	return
 }
+
+type OrderEntry struct {
+	OrderID uint            `json:"order_id" validate:"required"`
+	Amount  decimal.Decimal `json:"amount"`
+	Reason  string          `json:"reason"`
+	Photo   string          `json:"photo"`
+}
+
+func (o logic) OrderCancel(args OrderEntry) (err error) {
+	// 发起未发货售后,并退款
+	return
+}
+
+func (o logic) OrderConfirm(args OrderEntry) (err error) {
+	// 发货, 只修改状态, 没有物流信息
+
+	return
+}
+
+func (o logic) OrderMakeUp(args OrderEntry) (err error) {
+	//
+	return
+}

internal/v2/logic/manage/jyy/activity.go

@@ -3,7 +3,6 @@ package jyy
 import (
 	"errors"
 	"recook/internal/libs/bean"
-	"recook/internal/model/activity"
 	"recook/internal/v2/model/jyy"
 	"recook/internal/v2/model/recook/goods"
 
@@ -100,10 +99,10 @@ type ArgsActivityDelete struct {
 
 func (o logic) DeleteActivity(args ArgsActivityDelete) error {
 	if err := mysql.Db.Transaction(func(tx *gorm.DB) error {
-		if err := tx.Delete(&activity.Info{}, "id = ?", args.ID).Error; err != nil {
+		if err := tx.Delete(&jyy.Activity{}, "id = ?", args.ID).Error; err != nil {
 			return err
 		}
-		if err := tx.Delete(&activity.Goods{}, "activity_id = ?", args.ID).Error; err != nil {
+		if err := tx.Delete(&jyy.ActivityGoods{}, "activity_id = ?", args.ID).Error; err != nil {
 			return err
 		}
 		return nil

internal/v2/router/app.go

@@ -239,6 +239,9 @@ func routerApp(appRouter *gin.RouterGroup) {
 		{
 			OrderRouter.POST("preview", proxy.OrderPreview)
 			OrderRouter.POST("update", proxy.OrderUpdate)
+			OrderRouter.POST("cancel", proxy.OrderCancel)
+			OrderRouter.POST("confirm", proxy.OrderConfirm)
+			orderRouter.POST("makeup", proxy.OrderMakeUp)
 		}
 	}
 }