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:
邹宗楠
2025-02-06 17:07:44 +08:00
parent 70e6ba71a0
commit ed0b29461d
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
business/jxcallback/orderman/orderman_ext.go
View File

@@ -144,7 +144,7 @@ func (c *OrderManager) GetOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID str
t3.img4 image4,
t3.img5 image5,
t3.desc_img descImg,
t3.price price,
t3.price mainPrice,
t3.upc
FROM order_sku t1
LEFT JOIN goods_order t6 ON t6.vendor_order_id = t1.vendor_order_id AND t6.vendor_id = t1.vendor_id
@@ -387,34 +387,24 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro
}
}
case model.ServerTypePet:
afsSkuIDList := make([]int, 0, 0)
skuFinancial, _ := dao.GetStoreAfsOrderSkuList(db, []int{order.JxStoreID}, []int{model.AfsOrderStatusFinished, model.AfsOrderStatusNew})
if len(skuFinancial) != model.NO {
for _, v := range skuFinancial {
afsSkuIDList = append(afsSkuIDList, v.JxSkuID)
}
}
sql := `
SELECT sum(o.sale_price*o.count) - sum(n.price*o.count ) inCome
SELECT sum(o.sale_price*o.count) - sum(n.price*o.count ) income
FROM order_sku o
INNER JOIN sku s on s.id = o.sku_id
INNER JOIN sku_name n ON n.id = s.name_id
WHERE o.vendor_order_id = ? `
incomeParam := []interface{}{order.VendorOrderID}
if len(afsSkuIDList) != model.NO {
sql += `AND o.sku_id NOT IN (
WHERE o.vendor_order_id = ? AND o.sku_id NOT IN (
SELECT t1.sku_id
FROM order_sku_financial t1
JOIN afs_order t2 ON t2.vendor_order_id = t1.vendor_order_id AND t2.vendor_id = t1.vendor_id AND t2.afs_order_id = t1.afs_order_id
WHERE t2.vendor_order_id = ? AND IF(t2.jx_store_id > 0, t2.jx_store_id, t2.store_id) = ? AND t1.is_afs_order = 1 AND t2.status IN (` + dao.GenQuestionMarks(2) + `)
)`
incomeParam = append(incomeParam, order.VendorOrderID, order.JxStoreID, model.AfsOrderStatusFinished, model.AfsOrderStatusNew)
}
incomeParam := []interface{}{order.VendorOrderID, order.VendorOrderID, order.JxStoreID, model.AfsOrderStatusFinished, model.AfsOrderStatusNew}
// 百货收益算法
var baiHuo = &struct {
Income int64 `json:"income"`
}{}
globals.SugarLogger.Debugf("----sql := %s", sql)
globals.SugarLogger.Debugf("----param := %s", utils.Format4Output(incomeParam, false))
if err = dao.GetRow(db, baiHuo, sql, incomeParam); err == nil {
order.JxIncome = baiHuo.Income
}

2
business/model/api.go
View File

@@ -85,7 +85,7 @@ type OrderSkuExt struct {
Img5 string `orm:"size(512)" json:"image5"` //第三张图片
DescImg string `orm:"size(255)" json:"descImg"` // 商品详情图片描述
Upc string `json:"upc"` //
Price int64 `json:"price"` // 商品库价格
MainPrice int64 `json:"mainPrice"` // 商品库价格
// RealEarningPrice int64 `json:"realEarningPrice"` // 实际单品结算给门店老板钱
}