liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2023-05-04 16:42:28 +08:00
parent 5c23542d12
commit c45fec0a6d
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
business/partner/delivery/rider.go
View File

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