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-07-14 16:01:20 +08:00
parent f27844567a
commit 0e1cd858d5
10 changed files with 245 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,11 +96,6 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
continue
}
// 平台自配送
if v.WaybillVendorID == model.YES {
continue
}
if orderId == "" { // 订单id为空是,是定时轮询操作,不做此状态
waybillList, _ := dao.GetWaybills(dao.GetDB(), v.VendorOrderID, nil)
if len(waybillList) > 0 && waybillList[0].Status > model.WaybillStatusEndBegin {
@@ -136,7 +131,8 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) {
}
taoDeliveryStatus := ""
switch riderInfo.LogisticsStatus {
//switch riderInfo.LogisticsStatus {
switch v.Status {
case 5: // 呼叫骑手
riderInfo.LogisticsStatus = 0
riderInfo.OpCode = tiktok_api.TiktokLogisticsStatusCALLRIDER
@@ -492,15 +488,17 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er
}
// 如果收款账户为京西的收款账户,则此门店不是服务商(否则是服务商,使用门店发单[需要自己的账户充值金额才行]!)
if settleId != model.NO && jxSettleIdMap[settleId] {
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 {
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)
if settleId != 0 {
if settleId != model.NO && jxSettleIdMap[settleId] {
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 {
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)
}
}
}

8
business/partner/purchase/tao_vegetable/order.go
View File

@@ -878,7 +878,9 @@ func GetOrderTotalShopMoney(appOrgCode string, vendorStoreID string, start, end
var totalIndex int64 = 0
result, _ := api.QueryBillList(param)
for _, v := range *result.TxdBillDetailBOS {
settlement[*v.BizOrderId] = *v.ReceivableAmount
if *v.OrderType == "positive" {
settlement[*v.BizOrderId] = *v.ReceivableAmount
}
}
if *result.Total > int64(pageSize) {
@@ -891,7 +893,9 @@ func GetOrderTotalShopMoney(appOrgCode string, vendorStoreID string, start, end
param.TxdBillListGetRequest.PageIndex = utils.Int64ToPointer(int64(i))
result2, _ := api.QueryBillList(param)
for _, v := range *result2.TxdBillDetailBOS {
settlement[*v.BizOrderId] = *v.ReceivableAmount
if *v.OrderType == "positive" {
settlement[*v.BizOrderId] = *v.ReceivableAmount
}
}
}
}