diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 70639c6db..50b067e09 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -358,7 +358,7 @@ func Init() { //103028, //103019, //102831, - 102751, + //102751, //上海 668462, 668276, @@ -411,27 +411,20 @@ func Init() { syncStoreSkuTao(beijin) }, []string{ "00:30:00", - "01:30:00", "02:30:00", - "03:30:00", "04:30:00", - "05:30:00", "07:30:00", - "09:55:00", + "09:00:00", "10:40:00", - "11:20:00", "12:55:00", "13:30:00", "14:30:00", "15:30:00", "16:30:00", "17:30:00", - "18:55:00", - "19:55:00", + "18:40:00", "20:30:00", - "21:30:00", "22:30:00", - "23:30:00", }) } diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index e6453aff7..afbdabf6f 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -132,17 +132,20 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve // 渠道活动 if v.ChannelActivityId != nil { activityId = append(activityId, utils.Str2Int64WithDefault(*v.ChannelActivityId, 999)) - activityName = append(activityName, *v.ChannelActivityId+":"+*v.ActivityName) + //activityName = append(activityName, *v.ChannelActivityId+":"+*v.ActivityName) + activityName = append(activityName, *v.ChannelActivityId) } // 业务活动 if v.BizActivityId != nil { activityId = append(activityId, utils.Str2Int64WithDefault(*v.BizActivityId, 999)) - activityName = append(activityName, *v.BizActivityId+":"+*v.ActivityName) + //activityName = append(activityName, *v.BizActivityId+":"+*v.ActivityName) + activityName = append(activityName, *v.BizActivityId) } // 商家erp活动 if v.MerchantActivityId != nil { activityId = append(activityId, utils.Str2Int64WithDefault(*v.MerchantActivityId, 999)) - activityName = append(activityName, *v.MerchantActivityId+":"+*v.ActivityName) + //activityName = append(activityName, *v.MerchantActivityId+":"+*v.ActivityName) + activityName = append(activityName, *v.MerchantActivityId) } } }