更新

app/svc/svc_order_track_save_create_update_zero.go

@@ -656,7 +656,6 @@ func OrderSaveCreateUpdateZero(eg *xorm.Engine, pvd string, ordData *[]md.OrderI
 			if user == nil || user.Uid == 0 { //判断免单的如果没有用户不跟这个订单
 				continue
 			}
-			//TODO
 			freeOrder := orderFourFreeCheck(eg, &v, oid, user.Uid, 1, dbName)
 			if freeOrder != nil {
 				fourPriceType = freeOrder.PriceType
@@ -674,6 +673,16 @@ func OrderSaveCreateUpdateZero(eg *xorm.Engine, pvd string, ordData *[]md.OrderI
 					freezeTime = gjson.Get(freeOrder.NewData, "freeze_time").String()
 				}
 			} else {
+				m, _ := db.FourFreeProductByID(eg, v.ItemId, v.SkuId, v.Pvd)
+				if m != nil {
+					fourPriceType = freeOrder.PriceType
+					// 切换免单活动的分佣方案, 如1元购等
+					optPvd = "fourFree_" + utils.IntToStr(freeOrder.PriceType)
+					opt = opts[optPvd]
+					if opt != nil {
+						PlanCommissionId = opt.PlanCommissionId
+					}
+				}
 				state = 4
 				v.State = 4
 			}