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:
邹宗楠
2024-06-28 16:27:55 +08:00
parent 2aa17fc2ed
commit 851d30cbc0
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -452,6 +452,8 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
var order *model.GoodsOrderExt
var orders2 []*model.GoodsOrderExt
for _, v := range orders {
globals.SugarLogger.Debugf("========orders := %s", utils.Format4Output(orders, false))
globals.SugarLogger.Debugf("========afsSkuMap := %s", utils.Format4Output(afsSkuMap, false))
if afsInfo := afsSkuMap[jxutils.ComposeUniversalOrderID(v.VendorOrderID, v.VendorID)]; afsInfo != nil {
if afsInfo[v.SkuID] != nil && afsInfo[v.SkuID].Count > 0 {
minus := afsInfo[v.SkuID].Count
@@ -473,7 +475,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
utils.Int2Str(v.SkuEarningPrice),
}, ",")
} else {
if v.EarningType == model.EarningTypeQuote {
if v.EarningType == model.EarningTypeQuote { // 报价
earningPrice := 0
if v.SkuEarningPrice != 0 {
earningPrice = v.SkuEarningPrice
@@ -487,7 +489,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
utils.Int2Str(v.SkuSalePrice),
utils.Int2Str(earningPrice),
}, ",")
} else {
} else { // 扣点
skuStr = strings.Join([]string{
utils.Int2Str(v.SkuID),
utils.Int2Str(v.SkuCount2),

2
controllers/jx_order.go
View File

@@ -348,7 +348,7 @@ func (c *OrderController) GetOrders() {
// @Param cities query string false "城市code列表[1,2,3]，缺省不限制"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /ExportOrders [get]
// @router /ExportOrders [get]
func (c *OrderController) ExportOrders() {
c.callExportOrders(func(params *tOrderExportOrdersParams) (retVal interface{}, errCode string, err error) {
retVal, err = orderman.FixedOrderManager.ExportOrders(params.Ctx, params.FromDate, params.ToDate, params.MapData)