diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 1582b61be..8e253a88d 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -243,7 +243,7 @@ func Init() { ScheduleTimerFunc("LoadingStoreOrderSettleAmount", func() { delivery.LoadingStoreOrderSettleAmount(0, 0, nil) }, []string{ - "19:50:00", + "02:50:00", }) ScheduleTimerFunc("UpdateStoreName ", func() { diff --git a/business/model/store_score.go b/business/model/store_score.go index 9fedba442..ec4470250 100644 --- a/business/model/store_score.go +++ b/business/model/store_score.go @@ -76,3 +76,21 @@ type OrderPickupTime struct { StatusTime time.Time PickDeadline time.Time } + +type StoreFine struct { + ID int `orm:"column(id)" json:"id"` + CreatedAt time.Time `orm:"auto_now_add;type(datetime)" json:"createdAt"` // 数据时间 + StoreID int `orm:"column(store_id);size(16)" json:"storeID"` // 门店ID + VendorID int `orm:"column(vendor_id);size(4)" json:"vendor_id"` // 平台ID + SettleAmount int64 `orm:"column(settle_amount);size(16)" json:"settle_amount"` // 罚没金额 + BillType int `orm:"column(bill_type);size(16)" json:"bill_type"` // 罚没类型 + BillDesc string `orm:"column(bill_desc);size(64)" json:"bill_desc"` // 罚没描述 + BillId string `orm:"column(bill_id);size(32)" json:"bill_id"` // 数据ID + FinishTime time.Time `orm:"column(finish_time);size(32)" json:"finish_time"` // 归账日期 +} + +func (*StoreScore) StoreFine() [][]string { + return [][]string{ + []string{"StoreID"}, + } +} diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 190947ad9..17f83a3f0 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -581,7 +581,7 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er var ( db = dao.GetDB() now = time.Now() - from = time.Date(now.Year(), now.Month(), now.Day()-4, 0, 0, 0, 0, time.Local).Unix() + from = time.Date(now.Year(), now.Month(), now.Day()-1, 0, 0, 0, 0, time.Local).Unix() to = time.Date(now.Year(), now.Month(), now.Day()-1, 23, 59, 59, 59, time.Local).Unix() ) @@ -604,7 +604,11 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er Offset: 0, Limit: 200, } - storeOrder, settleId, err := mtwm.GetAPI(storeListValue.VendorOrgCode, storeListValue.StoreID, storeListValue.VendorStoreID).GetStoreBillList(billListParam) + globals.SugarLogger.Debugf("-----:LoadingStoreOrderSettleAmount") + storeOrder, fineList, settleId, err := mtwm.GetAPI(storeListValue.VendorOrgCode, storeListValue.StoreID, storeListValue.VendorStoreID).GetStoreBillList(billListParam) + globals.SugarLogger.Debugf("-----:LoadingStoreOrderSettleAmount storeOrder := %s ", utils.Format4Output(storeOrder, false)) + globals.SugarLogger.Debugf("-----:LoadingStoreOrderSettleAmount fineList := %s ", utils.Format4Output(fineList, false)) + globals.SugarLogger.Debugf("-----:LoadingStoreOrderSettleAmount err := %v ", err) if err != nil { globals.SugarLogger.Debugf("GetStoreBillList err : %v", err) return nil, err @@ -653,6 +657,24 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er //} } + if fineList != nil && len(fineList) > 0 { + fine := make([]*model.StoreFine, 0, len(fineList)) + for _, f := range fineList { + fine = append(fine, &model.StoreFine{ + ID: 0, + CreatedAt: time.Now(), + StoreID: storeListValue.StoreID, + VendorID: storeListValue.VendorID, + SettleAmount: f.SettleAmount, + BillType: f.BillChargeType, + BillDesc: f.ChargeFeeDesc, + BillId: f.Id, + FinishTime: utils.Str2Time(f.FinishTime), + }) + } + err = dao.CreateMultiEntities(db, fine) + globals.SugarLogger.Debugf("-----:LoadingStoreOrderSettleAmount CreateMultiEntities err := %v ", err) + } return retVal, err } task := tasksch.NewParallelTask("更新美团订单配送费/保险费/结算信息", tasksch.NewParallelConfig().SetParallelCount(4), jxcontext.AdminCtx, taskFunc, storeMapList) diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go index 567c7ba6c..159f87d82 100644 --- a/globals/beegodb/beegodb.go +++ b/globals/beegodb/beegodb.go @@ -102,6 +102,7 @@ func Init() { orm.RegisterModel(&model.CasbinRule{}) orm.RegisterModel(&model.SensitiveWord{}) orm.RegisterModel(&model.StoreScore{}) + orm.RegisterModel(&model.StoreFine{}) orm.RegisterModel(&model.StoreAlert{}) orm.RegisterModel(&model.FoodRecipe{}, &model.FoodRecipeStep{}, &model.FoodRecipeItem{}, &model.FoodRecipeItemChoice{}, &model.FoodRecipeUser{}) orm.RegisterModel(&model.DataResource{})