Merge remote-tracking branch 'origin/main'

run/orderFlush/main.go

@@ -13,10 +13,11 @@ import (
 func main() {
 	//FlushReturnPlan(context.Background())
 	//FlushReturnTransfer(context.Background())
-	FlushSale(context.Background())
+	//FlushSale(context.Background())
+	FlushOrder(context.Background())
 }
 func FlushOrder(ctx context.Context) error {
-	res, err := g.DB().Query(ctx, "SELECT * FROM dataexport_order order by id asc")
+	res, err := g.DB().Query(ctx, "SELECT * FROM dataexport_order WHERE product_type=? order by id asc ", "VIP订阅")
 	if err != nil {
 		return err
 	}
@@ -44,21 +45,25 @@ func FlushOrder(ctx context.Context) error {
 		)
 		var (
 			newData = g.Map{
-				"order_code":        orderCode,
-				"product_type":      productType,
-				"phone":             user_phone,
-				"filter":            filter,
-				"user_id":           user_id,
-				"service_type":      vip_type,
-				"is_master":         1,
-				"service_starttime": vip_starttime,
-				"service_endtime":   vip_endtime,
+				"order_code":   orderCode,
+				"product_type": productType,
+				"phone":        user_phone,
+				"filter":       filter,
+				"user_id":      user_id,
+				"service_type": vip_type,
+				"is_master":    1,
 			}
 			product_code    string
 			newFilterMap    g.Map
 			is_service_open int
 			service_type    int
 		)
+		if vip_starttime != "" {
+			newData["service_starttime"] = vip_starttime
+		}
+		if vip_endtime != "" {
+			newData["service_endtime"] = vip_endtime
+		}
 
 		if is_backstage_order == 1 {
 			newData["original_price"] = order_money
@@ -267,7 +272,7 @@ var codeMapping = map[string]string{
 }
 
 func SaveToDB(ctx context.Context, data []g.Map) error {
-	_, err := g.DB().Save(ctx, "jy_order_detail", data, 100)
+	_, err := g.DB("jianyu2").Save(ctx, "jy_order_detail", data, 100)
 	if err != nil {
 		g.Log().Error(ctx, "批量插入异常 %s", err.Error())
 		return err

run/orderFlush/product/course.go

@@ -1,43 +0,0 @@
-package product
-
-import (
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/util/gconv"
-)
-
-func GetCourseFilter(filter string) (g.Map, string, error) {
-	if filterMap := gconv.Map(filter); filterMap != nil && len(filterMap) > 0 {
-		detail := map[string]interface{}{
-			"_id":          _id,
-			"s_fileUrl":    (*data)["s_fileUrl"],
-			"s_picUrl":     (*data)["s_picUrl"],
-			"s_courseDate": (*data)["s_courseDate"],
-			"l_endtime":    (*data)["l_endtime"],
-			"i_price":      price,
-			"phone":        order_phone,
-			"courseType":   "中标必听课",
-			"i_exist":      (*data)["i_exist"],
-			"i_num":        (*data)["i_num"],
-			"i_drawer":     (*data)["i_drawer"],
-			"s_name":       (*data)["s_name"],           //此处传课程展示的信息；比如课程名称 结束时间 图片之类的（"_id"课程mgo库id），
-			"source":       qu.ObjToString(m["source"]), //订单来源
-		}
-		g.Map{
-			"_id":          filterMap["_id"],
-			"s_fileUrl":    filterMap["s_fileUrl"],
-			"s_picUrl":     filterMap["s_picUrl"],
-			"s_courseDate": filterMap["s_courseDate"],
-			"l_endtime":    filterMap["l_endtime"],
-			"i_price":      price,
-			"phone":        order_phone,
-			"courseType":   "中标必听课",
-			"i_exist":      filterMap["i_exist"],
-			"i_num":        filterMap["i_num"],
-			"i_drawer":     filterMap["i_drawer"],
-			"s_name":       filterMap["s_name"],         //此处传课程展示的信息；比如课程名称 结束时间 图片之类的（"_id"课程mgo库id），
-			"source":       qu.ObjToString(m["source"]), //订单来源
-		}
-	}
-
-	return nil, "", nil
-}

run/orderFlush/product/vip.go

@@ -98,12 +98,20 @@ func GetVipFilter(filter string, buy_count, buy_subject int) (g.Map, string, err
 	if f.GiveCycle > 0 && f.SellerGiveType > 0 {
 		t, c = f.SellerGiveType, f.GiveCycle
 	}
+
+	var buyCount int
+	if f.NewBuyset != nil {
+		buyCount = f.NewBuyset.AreaCount
+	} else if f.OldBuyset != nil {
+		buyCount = f.OldBuyset.AreaCount
+	} else {
+		return gconv.Map(filter), "", nil
+	}
 	rData := g.Map{
-		"buyAccountCount":   f.NewBuyset.AreaCount - f.OldBuyset.AreaCount,
 		"buy_cycle":         f.Cyclecount,
 		"buy_type":          vipUnitConvert(f.Cycleunit), // 类型 1天 2月 3年 4季度
 		"finalAccountCount": 1,
-		"finalAreaCount":    f.NewBuyset.AreaCount,
+		"finalAreaCount":    buyCount,
 		"seller_give_type":  t,
 		"seller_give_cycle": c,
 	}
@@ -111,5 +119,5 @@ func GetVipFilter(filter string, buy_count, buy_subject int) (g.Map, string, err
 	if buy_subject == 2 { //企业版
 		rData["buyAccountCount"] = common.If(buy_count > 0, buy_count, 1)
 	}
-	return rData, getVipProductCode(f.NewBuyset.AreaCount), nil
+	return rData, getVipProductCode(buyCount), nil
 }