minghui/mh_goadmin_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_1.4.1'

Browse Source
This commit is contained in:
chenlin 2024-07-05 11:46:06 +08:00
commit b47ea1135f
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/admin/models/erp_order.go
View File

@ -3741,6 +3741,7 @@ func packData(result []RetailDetailByJoin) []ErpOrder {
commodity.ErpSupplierName = item.ErpSupplierName commodity.ErpSupplierName = item.ErpSupplierName
commodity.SalesProfit = item.SalesProfit commodity.SalesProfit = item.SalesProfit
commodity.StaffProfit = item.StaffProfit commodity.StaffProfit = item.StaffProfit
commodity.StaffPrice = item.WholesalePrice + item.StaffCostPrice
order.Commodities = append(order.Commodities, commodity) order.Commodities = append(order.Commodities, commodity)
orderIdMap[item.ErpOrderId] = order orderIdMap[item.ErpOrderId] = order