|
@@ -70,8 +70,20 @@ func (self *ProductController) Latest() {
|
|
|
if pd.Package {
|
|
if pd.Package {
|
|
|
pd.PackageList = product_model.GetPackageList(pd.Id, true)
|
|
pd.PackageList = product_model.GetPackageList(pd.Id, true)
|
|
|
}
|
|
}
|
|
|
|
|
+ //判断是否预售
|
|
|
|
|
+ pd.IsDeliver = false
|
|
|
pd.DeliverStartTime = pd.DeliverStartAt.Unix()
|
|
pd.DeliverStartTime = pd.DeliverStartAt.Unix()
|
|
|
pd.DeliverStopTime = pd.DeliverStopAt.Unix()
|
|
pd.DeliverStopTime = pd.DeliverStopAt.Unix()
|
|
|
|
|
+ if pd.DeliverStartTime > 0 {
|
|
|
|
|
+ pd.IsDeliver = true
|
|
|
|
|
+ if time.Now().Unix() <= pd.DeliverStartTime {
|
|
|
|
|
+ pd.DeliverState = product_model.DELIVER_STATE_1
|
|
|
|
|
+ } else if time.Now().Unix() > pd.DeliverStopTime {
|
|
|
|
|
+ pd.DeliverState = product_model.DELIVER_STATE_3
|
|
|
|
|
+ } else {
|
|
|
|
|
+ pd.DeliverState = product_model.DELIVER_STATE_2
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
pd.HaveSize = false
|
|
pd.HaveSize = false
|
|
|
//店铺列表专区商品增加规格显示
|
|
//店铺列表专区商品增加规格显示
|
|
|
if ptype == product_model.SHOP_SALE && product_model.GetProductAttrConfig(pd.RelateProductId) != nil {
|
|
if ptype == product_model.SHOP_SALE && product_model.GetProductAttrConfig(pd.RelateProductId) != nil {
|
|
@@ -162,8 +174,21 @@ func (self *ProductController) Get() {
|
|
|
pd.HaveSize = true
|
|
pd.HaveSize = true
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ //判断是否预售
|
|
|
|
|
+ pd.IsDeliver = false
|
|
|
pd.DeliverStartTime = pd.DeliverStartAt.Unix()
|
|
pd.DeliverStartTime = pd.DeliverStartAt.Unix()
|
|
|
pd.DeliverStopTime = pd.DeliverStopAt.Unix()
|
|
pd.DeliverStopTime = pd.DeliverStopAt.Unix()
|
|
|
|
|
+ if pd.DeliverStartTime > 0 {
|
|
|
|
|
+ pd.IsDeliver = true
|
|
|
|
|
+ if time.Now().Unix() <= pd.DeliverStartTime {
|
|
|
|
|
+ pd.DeliverState = product_model.DELIVER_STATE_1
|
|
|
|
|
+ } else if time.Now().Unix() > pd.DeliverStopTime {
|
|
|
|
|
+ pd.DeliverState = product_model.DELIVER_STATE_3
|
|
|
|
|
+ } else {
|
|
|
|
|
+ pd.DeliverState = product_model.DELIVER_STATE_2
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// ret.Product = pd
|
|
// ret.Product = pd
|
|
|
self.Data["json"] = pd
|
|
self.Data["json"] = pd
|
|
|
self.ServeJSON()
|
|
self.ServeJSON()
|
|
@@ -219,8 +244,20 @@ func (self *ProductController) GetPdDetail() {
|
|
|
if pd.Package {
|
|
if pd.Package {
|
|
|
pd.PackageList = product_model.GetPackageList(pd.Id, true)
|
|
pd.PackageList = product_model.GetPackageList(pd.Id, true)
|
|
|
}
|
|
}
|
|
|
|
|
+ //判断是否预售
|
|
|
|
|
+ pd.IsDeliver = false
|
|
|
pd.DeliverStartTime = pd.DeliverStartAt.Unix()
|
|
pd.DeliverStartTime = pd.DeliverStartAt.Unix()
|
|
|
pd.DeliverStopTime = pd.DeliverStopAt.Unix()
|
|
pd.DeliverStopTime = pd.DeliverStopAt.Unix()
|
|
|
|
|
+ if pd.DeliverStartTime > 0 {
|
|
|
|
|
+ pd.IsDeliver = true
|
|
|
|
|
+ if time.Now().Unix() <= pd.DeliverStartTime {
|
|
|
|
|
+ pd.DeliverState = product_model.DELIVER_STATE_1
|
|
|
|
|
+ } else if time.Now().Unix() > pd.DeliverStopTime {
|
|
|
|
|
+ pd.DeliverState = product_model.DELIVER_STATE_3
|
|
|
|
|
+ } else {
|
|
|
|
|
+ pd.DeliverState = product_model.DELIVER_STATE_2
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
ret := &Ret{}
|
|
ret := &Ret{}
|
|
|
ret.Product = pd
|
|
ret.Product = pd
|
|
@@ -289,8 +326,20 @@ func (self *ProductController) GetProductsByCat() {
|
|
|
if pd.Package {
|
|
if pd.Package {
|
|
|
pd.PackageList = product_model.GetPackageList(pd.Id, true)
|
|
pd.PackageList = product_model.GetPackageList(pd.Id, true)
|
|
|
}
|
|
}
|
|
|
|
|
+ //判断是否预售
|
|
|
|
|
+ pd.IsDeliver = false
|
|
|
pd.DeliverStartTime = pd.DeliverStartAt.Unix()
|
|
pd.DeliverStartTime = pd.DeliverStartAt.Unix()
|
|
|
pd.DeliverStopTime = pd.DeliverStopAt.Unix()
|
|
pd.DeliverStopTime = pd.DeliverStopAt.Unix()
|
|
|
|
|
+ if pd.DeliverStartTime > 0 {
|
|
|
|
|
+ pd.IsDeliver = true
|
|
|
|
|
+ if time.Now().Unix() <= pd.DeliverStartTime {
|
|
|
|
|
+ pd.DeliverState = product_model.DELIVER_STATE_1
|
|
|
|
|
+ } else if time.Now().Unix() > pd.DeliverStopTime {
|
|
|
|
|
+ pd.DeliverState = product_model.DELIVER_STATE_3
|
|
|
|
|
+ } else {
|
|
|
|
|
+ pd.DeliverState = product_model.DELIVER_STATE_2
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
self.Data["json"] = &Ret{List: list, ListCount: count}
|
|
self.Data["json"] = &Ret{List: list, ListCount: count}
|
|
|
self.ServeJSON()
|
|
self.ServeJSON()
|