0225

db/info_pricing_strategy.go

@@ -11,7 +11,7 @@ import (
 func GetPricingStrategy(ctx context.Context, fansLow int64, fansUp int64, feeForm int64, platForm int64) (*gorm_model.InfoPricingStrategy, error) {
 	db := GetReadDB(context.Background())
 	var PricingStrategys []gorm_model.InfoPricingStrategy
-	whereStr := fmt.Sprintf("fee_form = %d and platform = %d and fans_low <= %d and fans_up >= %d", feeForm, platForm, fansLow, fansLow)
+	whereStr := fmt.Sprintf("fee_form = %d and platform = %d and fans_low <= %d and fans_up > %d", feeForm, platForm, fansLow, fansLow)
 	orStr := fmt.Sprintf("fee_form = %d and platform = %d and fans_low <= %d and fans_up >= %d", feeForm, platForm, fansUp, fansUp)
 	orStr1 := fmt.Sprintf("fee_form = %d and platform = %d and fans_low >= %d and fans_up <= %d", feeForm, platForm, fansLow, fansUp)
 	orStr2 := fmt.Sprintf("fee_form = %d and platform = %d and fans_low <= %d and fans_up >= %d", feeForm, platForm, fansLow, fansUp)
@@ -20,7 +20,7 @@ func GetPricingStrategy(ctx context.Context, fansLow int64, fansUp int64, feeFor
 		log.Println("DB GetLastAutoDefaultID:", err)
 		return nil, err
 	}
-	fmt.Printf("PricingStrategys%+v \n",PricingStrategys)
+	fmt.Printf("PricingStrategys%+v \n", PricingStrategys)
 	PricingStrategy := gorm_model.InfoPricingStrategy{}
 	if feeForm == 1 {
 		var maxCharge float64 = 0

db/invoice.go

@@ -134,6 +134,7 @@ func AddInvoiceRecord(ctx context.Context, enterpriseId string, req *http_model.
 	db2.Debug().Model(gorm_model.YounggeeInvoiceAddress{}).Where("address_id = ?", req.AddressID).First(&addressInfo)
 	addressInfoToJson, _ := json.Marshal(addressInfo)
 
+	req.RechargeIds = util.RemoveStrRepByMap(req.RechargeIds)
 	for _, rechargeId := range req.RechargeIds {
 		rechargeId1 := rechargeId
 		rechargeInfo := gorm_model.YounggeeRechargeRecord{}

service/logistics.go

@@ -44,6 +44,7 @@ func (*logistics) Create(ctx context.Context, newLogistics http_model.CreateLogi
 		ExplorestoreEndtime, _ := time.ParseInLocation("2006-01-02 15:04:05", newLogistics.ExplorestoreEndtime, time.Local)
 		Logistics.ExplorestoreStarttime = ExplorestoreStarttime
 		Logistics.ExplorestoreEndtime = ExplorestoreEndtime
+		Logistics.SignedTime = ExplorestoreEndtime
 		// Logistics.ExplorestorePeriod = newLogistics.ExplorestorePeriod
 	} else {
 		Logistics.CouponCodeInformation = newLogistics.CouponCodeInformation

service/product.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"context"
+	"fmt"
 	"youngee_b_api/consts"
 	"youngee_b_api/db"
 	"youngee_b_api/model/gorm_model"
@@ -51,6 +52,7 @@ func (*product) Create(ctx context.Context, newProduct http_model.CreateProductR
 }
 
 func (*product) Update(ctx context.Context, newProduct http_model.CreateProductRequest, enterpriseID string) (*http_model.CreateProductData, error) {
+	fmt.Println("newProduct.ProductUrl", newProduct.ProductUrl)
 	product := gorm_model.YounggeeProduct{
 		ProductID:     newProduct.ProductId,
 		ProductName:   newProduct.ProductName,
@@ -73,7 +75,7 @@ func (*product) Update(ctx context.Context, newProduct http_model.CreateProductR
 	}
 	if newProduct.ProductPhotos != nil {
 		// 新增图片
-		productPhotos := []gorm_model.YounggeeProductPhoto{}
+		var productPhotos []gorm_model.YounggeeProductPhoto
 		for _, photo := range newProduct.ProductPhotos {
 			productPhoto := gorm_model.YounggeeProductPhoto{
 				PhotoUrl:  photo.PhotoUrl,

service/project_pay.go

@@ -37,39 +37,44 @@ func (*projectPay) Pay(ctx context.Context, projectPay http_model.ProjectPayRequ
 	}
 
 	// 支付更新任务状态
-	project, err2 := db.GetProjectDetail(ctx, projectPay.ProjectID)
-	if err2 != nil {
-		logrus.WithContext(ctx).Errorf("[project service] call GetPorjectDetail error,err:%+v", err)
-		return nil, err2
-	}
+	//_, err2 := db.GetProjectDetail(ctx, projectPay.ProjectID)
+	//if err2 != nil {
+	//	logrus.WithContext(ctx).Errorf("[project service] call GetPorjectDetail error,err:%+v", err)
+	//	return nil, err2
+	//}
 	err = db.UpdateTaskSelectAtByProjectId(ctx, projectPay.ProjectID, 2)
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
 		return nil, err
 	}
-
-	if project.ProjectForm != 4 {
-		err = db.UpdateTaskStageByProjectId(ctx, projectPay.ProjectID, 2, 4)
-		if err != nil {
-			logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
-			return nil, err
-		}
-	} else {
-		if project.ContentType == 1 {
-			err = db.UpdateTaskStageByProjectId(ctx, projectPay.ProjectID, 2, 9) //修改为待传初稿
-			if err != nil {
-				logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
-				return nil, err
-			}
-		} else {
-			err = db.UpdateTaskStageByProjectId(ctx, projectPay.ProjectID, 2, 7) //修改为待传脚本
-			if err != nil {
-				logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
-				return nil, err
-			}
-		}
+	err = db.UpdateTaskStageByProjectId(ctx, projectPay.ProjectID, 2, 4)
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
+		return nil, err
 	}
 
+	//if project.ProjectForm != 4 {
+	//	err = db.UpdateTaskStageByProjectId(ctx, projectPay.ProjectID, 2, 4)
+	//	if err != nil {
+	//		logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
+	//		return nil, err
+	//	}
+	//} else {
+	//	if project.ContentType == 1 {
+	//		err = db.UpdateTaskStageByProjectId(ctx, projectPay.ProjectID, 2, 9) //修改为待传初稿
+	//		if err != nil {
+	//			logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
+	//			return nil, err
+	//		}
+	//	} else {
+	//		err = db.UpdateTaskStageByProjectId(ctx, projectPay.ProjectID, 2, 7) //修改为待传脚本
+	//		if err != nil {
+	//			logrus.WithContext(ctx).Errorf("[projectPay service] call UpdateTaskStatusPaying error,err:%+v", err)
+	//			return nil, err
+	//		}
+	//	}
+	//}
+
 	// 插入消息-任务申请成功
 	taskIds, err := db.GetTaskIds(ctx, projectPay.ProjectID) // 获取任务id列表
 	if err != nil {