diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 3f9f1d288..1e1e7c2ff 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -423,14 +423,14 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { storeListValue := batchItemList[0].(*model.StoreMap) - storeOrder, settleId, err := mtwm.GetAPI(storeListValue.VendorOrgCode, storeListValue.StoreID, storeListValue.VendorStoreID).GetStoreBillList(&mtwmapi.Bill{ + billListParam := &mtwmapi.Bill{ AppPoiCode: storeListValue.VendorStoreID, StartDate: from, EndDate: to, Offset: 0, Limit: 200, - }) - globals.SugarLogger.Debugf("==========order lens : %d,settleID :%d,err:%v", len(storeOrder), settleId, err) + } + storeOrder, settleId, err := mtwm.GetAPI(storeListValue.VendorOrgCode, storeListValue.StoreID, storeListValue.VendorStoreID).GetStoreBillList(billListParam) if err != nil { globals.SugarLogger.Debugf("GetStoreBillList err : %v", err) return nil, err @@ -438,21 +438,18 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er // 如果收款账户为京西的收款账户,则此门店不是服务商(否则是服务商,使用门店发单[需要自己的账户充值金额才行]!) if settleId != model.NO && jxSettleIdMap[settleId] { - globals.SugarLogger.Debugf("=================================1") - brandSql := `UPDATE store_map s SET s.create_delivery_type = ?,s.is_service = ? WHERE g.vendor_store_id = ? AND d.deleted_at = ?` + brandSql := `UPDATE store_map s SET s.create_delivery_type = ?,s.is_service = ? WHERE s.vendor_store_id = ? AND s.deleted_at = ?` if _, err := dao.ExecuteSQL(db, brandSql, []interface{}{model.NO, model.NO, storeListValue.VendorStoreID, utils.DefaultTimeValue}...); err != nil { globals.SugarLogger.Debugf("将门店修改为非服务商和系统发单: %v", err) } } else { - globals.SugarLogger.Debugf("=================================1.1") - brandSql := `UPDATE store_map s SET s.create_delivery_type = ?,s.is_service = ? WHERE g.vendor_store_id = ? AND d.deleted_at = ?` + brandSql := `UPDATE store_map s SET s.create_delivery_type = ?,s.is_service = ? WHERE s.vendor_store_id = ? AND s.deleted_at = ?` if _, err := dao.ExecuteSQL(db, brandSql, []interface{}{model.YES, model.YES, storeListValue.VendorStoreID, utils.DefaultTimeValue}...); err != nil { globals.SugarLogger.Debugf("将门店修改为服务商和门店发单: %v", err) } } - globals.SugarLogger.Debugf("=================================2") + for _, so := range storeOrder { - globals.SugarLogger.Debugf("=================================so : %s", utils.Format4Output(so, false)) // 更新订单的结算信息 if so.PlatformSettlement > 0 { goodsOrderSql := `UPDATE goods_order g SET g.total_shop_money = ? WHERE g.vendor_order_id = ? `