fix: deal_id

internal/v2/controller/task/jcook.go

@@ -304,34 +304,40 @@ func ShaMaSyncPageData(page, size uint, categories []RecookShaMaCategory) error
 					if !j.SkuDetailBase.Status || !j.SkuDetailBase.Yn {
 						num = 0
 					}
-					gsk1[j.SkuDetailBase.SkuID] = goods.RecookGoodsSkuModel{
+					ojb := goods.RecookGoodsSkuModel{
 						GoodsId:   0,
 						Name:      name1,
 						CombineId: "",
 						PicURL:    j.SkuDetailBase.MainPhoto,
 						Code:      j.SkuDetailBase.UpcCode,
 						// PurchasePrice:     j.SkuDetailBase.SupplyPrice,
-						OriginalPrice:     j.SkuDetailBase.GuidePrice,
+						OriginalPrice:   j.SkuDetailBase.GuidePrice,
-						DiscountPrice:     decimal.Zero,
+						DiscountPrice:   decimal.Zero,
-						CommissionRate:    decimal.Zero,
+						CommissionRate:  decimal.Zero,
-						Commission:        decimal.Zero,
+						Commission:      decimal.Zero,
-						ControlPrice:      j.SkuDetailBase.SupplyPrice,
+						ControlPrice:    j.SkuDetailBase.SupplyPrice,
-						SalesVolume:       0,
+						SalesVolume:     0,
-						Inventory:         uint(num),
+						Inventory:       uint(num),
-						SalesVolumeInc:    0,
+						SalesVolumeInc:  0,
-						Coupon:            decimal.Decimal{},
+						Coupon:          decimal.Decimal{},
-						GoodsNum:          "",
+						GoodsNum:        "",
-						BmSkuId:           "",
+						BmSkuId:         "",
-						BmShopId:          "",
+						BmShopId:        "",
-						ThirdPartySkuId:   strconv.Itoa(int(j.SkuDetailBase.SkuID)),
+						ThirdPartySkuId: strconv.Itoa(int(j.SkuDetailBase.SkuID)),
-						ThirdPartyType:    4,
+						ThirdPartyType:  4,
-						TMallPrice:        "",
+						TMallPrice:      "",
-						TMallUrl:          "",
+						TMallUrl:        "",
-						JdPrice:           j.SkuDetailBase.GuidePrice.String(),
+						JdPrice:         j.SkuDetailBase.GuidePrice.String(),
-						JdUrl:             "",
+						JdUrl:           "",
-						SalePurchasePrice: j.SkuDetailBase.SupplyPrice,
+						// SalePurchasePrice: j.SkuDetailBase.SupplyPrice,
-						GysSkuID:          0,
+						GysSkuID: 0,
+					}
+					if j.SkuDetailBase.Kind == 1 {
+						ojb.PurchasePrice = j.SkuDetailBase.SupplyPrice
+					} else {
+						ojb.SalePurchasePrice = j.SkuDetailBase.SupplyPrice
 					}
+					gsk1[j.SkuDetailBase.SkuID] = ojb
 				}
 			}
 			if len(gsk1) == 0 {

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

@@ -84,7 +84,9 @@ func (o logic) WithdrawalApply(args ArgsWithdrawalApply) error {
 		// 拒绝
 		if args.Apply == 99 {
 			if e := tx.Table((&order.Profit{}).TableName()).
-				Where("user_id = ?", a.UserID).Where("deal_id = ?", a.ID).Update("apply_id", 0).Error; e != nil {
+				Where("user_id = ?", a.UserID).Where("deal_id = ?", a.ID).Updates(map[string]interface{}{
+				"deal_id": 0,
+			}).Error; e != nil {
 				return e
 			}
 			if e := tx.Model(&wallet).Update("balance", gorm.Expr("balance + ?", a.Balance)).Error; e != nil {

internal/v2/router/task.go

@@ -22,7 +22,7 @@ func routerTask(taskRouter *gin.RouterGroup) {
 
 	taskRouter.POST("zip/sync", goodsController.ZipSync)
 
-	taskRouter.GET("shaMaSync", goodsController.ShaMaSync)
+	taskRouter.GET("shaMaSync", goodsController.ShaMaSync) // 瑞库客供应链商品同步
 
 	taskRouter.GET("shaMaPriceSync", goodsController.ShaMaPrice)
 }