diff --git a/business/bidding/mt_activity.go b/business/bidding/mt_activity.go new file mode 100644 index 000000000..09bd6eca7 --- /dev/null +++ b/business/bidding/mt_activity.go @@ -0,0 +1,49 @@ +package bidding + +import ( + "git.rosy.net.cn/baseapi/platformapi/mtwmapi" + "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/business/model/dao" + "git.rosy.net.cn/jx-callback/globals" + "git.rosy.net.cn/jx-callback/globals/api" +) + +func GetMTInfo() { + // 获取当前一月有效订单的门店信息 + effectiveStores, err := dao.StoreInformationStatistics() + if err != nil { + return + } + + var mtApi *mtwmapi.API + for _, v := range effectiveStores { + if v.VendorOrgCode == globals.Mtwm2Code { + mtApi = api.Mtwm2API + mtApi.SetToken(v.MtwmToken) + } else { + mtApi = api.MtwmAPI + } + + statistics := &model.ActivityStation{ + StoreID: v.JxStoreID, + VendorID: model.VendorIDMTWM, + VendorStoreID: v.VendorStoreID, + BrandID: v.VendorOrgCode, + Activity1: 0, + Activity2: 0, + Activity: 0, + StoreSkuNum: 0, + StoreRating: "", + DeliveryFee: "", + DeliveryFee2: "", + PromotionFee: "", + BusinessHours: "", + } + dao.WrapAddIDCULEntity(statistics, "system") + // 获取美团活动 + mtApi.RetailDiscountList(v.VendorStoreID, mtwmapi.RetailActTypeDirectDown) // 折扣活动 + mtApi.RetailDiscountList(v.VendorStoreID, mtwmapi.RetailActTypeSecKill) // 爆品活动 + + } + +} diff --git a/business/model/dao/mt_avtivity_station.go b/business/model/dao/mt_avtivity_station.go new file mode 100644 index 000000000..6cea8af65 --- /dev/null +++ b/business/model/dao/mt_avtivity_station.go @@ -0,0 +1,29 @@ +package dao + +import ( + "git.rosy.net.cn/jx-callback/business/model" + "time" +) + +// StoreInformationStatistics 门店信息统计 +func StoreInformationStatistics() (result []*model.EffectiveStores, err error) { + sql := ` + SELECT + gs.jx_store_id, + MAX(sm.vendor_org_code) AS vendor_org_code, + MAX(sm.vendor_store_id) AS vendor_store_id, + MAX(sm.mtwm_token) AS mtwm_token + FROM goods_order gs + LEFT JOIN store_map sm ON gs.jx_store_id = sm.store_id AND gs.vendor_id = sm.vendor_id + WHERE gs.order_created_at >= ? + AND gs.vendor_id = ? + GROUP BY gs.jx_store_id; +` + parma := []interface{}{time.Now().AddDate(0, -1, 0), model.VendorIDMTWM} + + if err = GetRows(GetDB(), &result, sql, parma...); err != nil { + return nil, err + } + + return +} diff --git a/business/model/mt_avtivity_station.go b/business/model/mt_avtivity_station.go new file mode 100644 index 000000000..5b21c0a27 --- /dev/null +++ b/business/model/mt_avtivity_station.go @@ -0,0 +1,31 @@ +package model + +type ActivityStation struct { + ModelIDCUL + StoreID int `orm:"column(store_id);size(16)" json:"store_id"` // 门店ID + VendorID int `orm:"column(vendor_id);size(2)" json:"vendor_id"` // 平台ID + VendorStoreID string `orm:"column(vendor_store_id);size(48)" json:"vendor_store_id"` // 平台门店ID + BrandID string `orm:"column(brand_id);size(16)" json:"brand_id"` // 品牌ID + Activity1 int64 `orm:"column(activity_1);size(16)" json:"activity_1"` // 活动0-3折商品数量 + Activity2 int64 `orm:"column(activity_2);size(16)" json:"activity_2"` // 活动3-9折商品数量 + Activity int64 `orm:"column(activity);size(16)" json:"activity"` // 总的活动数量 + StoreSkuNum int64 `orm:"column(store_sku_num);size(48)" json:"store_sku_num"` // 门店商品数量 + StoreRating string `orm:"column(store_rating);size(16)" json:"store_rating"` // 评分 + DeliveryFee string `orm:"column(delivery_fee);size(4)" json:"delivery_fee"` // 超过1.5km起送价不大于20 + DeliveryFee2 string `orm:"column(delivery_fee2);size(4)" json:"delivery_fee2"` // 超过1.5km配送费不大于0 + PromotionFee string `orm:"column(promotion_fee);size(4)" json:"promotion_fee"` // 推广费超过三十五元 + BusinessHours string `orm:"column(business_hours);size(4)" json:"business_hours"` // 营业时间超过11小时 +} +type EffectiveStores struct { + JxStoreID int `orm:"column(jx_store_id)" json:"jxStoreID"` // 根据VendorStoreID在本地系统里查询出来的 jxstoreid + VendorOrgCode string `orm:"column(vendor_org_code);size(64)" json:"vendorOrgCode"` // 同一平台下不同的商户代码,如果只有一个,可以为空 + VendorStoreID string `orm:"column(vendor_store_id);size(64)" json:"vendorStoreID"` // 同一平台下不同的商户代码,如果只有一个,可以为空 + MtwmToken string `orm:"column(mtwm_token);size(512)" json:"mtwmToken"` //美团外卖商超token,有效期30天,每20天刷一次 +} + +func (o *ActivityStation) TableIndex() [][]string { + return [][]string{ + []string{"CreatedAt"}, + []string{"StoreID"}, + } +} diff --git a/business/partner/purchase/jx/localjx/tonglianpay.go b/business/partner/purchase/jx/localjx/tonglianpay.go index a0d45f315..b3c491a2e 100644 --- a/business/partner/purchase/jx/localjx/tonglianpay.go +++ b/business/partner/purchase/jx/localjx/tonglianpay.go @@ -190,7 +190,7 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) { } if err = api.WeixinMiniAPI2.SNSSendGoodsOrder(param); err != nil { - ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "物料发货推送", fmt.Sprintf("物料商城下单,发货错误:%s,请注意查看,err:%s", order.VendorOrderID, err.Error())) + ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", "物料发货推送", fmt.Sprintf("物料商城下单,发货错误:%s,请注意查看,err:%s,%s", order.VendorOrderID, err.Error(), utils.Format4Output(param, false))) } }