Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

This commit is contained in:
richboo111
2023-07-14 16:14:30 +08:00
10 changed files with 246 additions and 64 deletions

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
}
}
}
}