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

Compare commits

base: minghui:b47ea1135fe6b0e5063905a680dd93e93d33e6cd
Branches Tags
minghui:master
minghui:dev_1.5.0
minghui:dev_1.4.6
minghui:dev_1.4.5_3
minghui:dev_1.4.5
minghui:dev_1.4.4
minghui:dev_1.4.2
minghui:dev_1.4.1
minghui:dev_1.4.0
minghui:dev_1.2.0
minghui:demo
minghui:feature_express_revert
minghui:develop
minghui:V2.0.0
..
compare: minghui:b528c53e905cab2d4e0e4823c19764a8b62bf9cc
Branches Tags
minghui:dev_1.5.0
minghui:dev_1.4.6
minghui:dev_1.4.5_3
minghui:dev_1.4.5
minghui:dev_1.4.4
minghui:dev_1.4.2
minghui:dev_1.4.1
minghui:master
minghui:dev_1.4.0
minghui:dev_1.2.0
minghui:demo
minghui:feature_express_revert
minghui:develop
minghui:V2.0.0

No commits in common. "b47ea1135fe6b0e5063905a680dd93e93d33e6cd" and "b528c53e905cab2d4e0e4823c19764a8b62bf9cc" have entirely different histories.
b47ea1135f ... b528c53e90

1 changed files with 0 additions and 1 deletions
Show Stats Expand all files Collapse all files

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

@ -3741,7 +3741,6 @@ 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