1
This commit is contained in:
@@ -452,7 +452,6 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
|
|||||||
var order *model.GoodsOrderExt
|
var order *model.GoodsOrderExt
|
||||||
var orders2 []*model.GoodsOrderExt
|
var orders2 []*model.GoodsOrderExt
|
||||||
for _, v := range orders {
|
for _, v := range orders {
|
||||||
globals.SugarLogger.Debugf(" v := %s", utils.Format4Output(v.ShortSkuInfo, false))
|
|
||||||
if afsInfo := afsSkuMap[jxutils.ComposeUniversalOrderID(v.VendorOrderID, v.VendorID)]; afsInfo != nil {
|
if afsInfo := afsSkuMap[jxutils.ComposeUniversalOrderID(v.VendorOrderID, v.VendorID)]; afsInfo != nil {
|
||||||
if afsInfo[v.SkuID] != nil && afsInfo[v.SkuID].Count >= 0 {
|
if afsInfo[v.SkuID] != nil && afsInfo[v.SkuID].Count >= 0 {
|
||||||
minus := afsInfo[v.SkuID].Count
|
minus := afsInfo[v.SkuID].Count
|
||||||
@@ -461,8 +460,6 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
|
|||||||
}
|
}
|
||||||
v.SkuCount2 -= minus
|
v.SkuCount2 -= minus
|
||||||
if minus == 0 { // 有售后单,且通过,部分商品缺重等情况
|
if minus == 0 { // 有售后单,且通过,部分商品缺重等情况
|
||||||
globals.SugarLogger.Debugf(" v := %s", utils.Format4Output(minus, false))
|
|
||||||
globals.SugarLogger.Debugf(" v := %s", utils.Format4Output(v.SkuID, false))
|
|
||||||
if v.EarningType == model.EarningTypeQuote {
|
if v.EarningType == model.EarningTypeQuote {
|
||||||
v.SkuShopPrice = v.SkuShopPrice - utils.Float64TwoInt(float64(afsInfo[v.SkuID].UserMoney)/float64(v.SkuSalePrice)*float64(v.SkuShopPrice))
|
v.SkuShopPrice = v.SkuShopPrice - utils.Float64TwoInt(float64(afsInfo[v.SkuID].UserMoney)/float64(v.SkuSalePrice)*float64(v.SkuShopPrice))
|
||||||
v.SkuEarningPrice = v.SkuEarningPrice - utils.Float64TwoInt(float64(afsInfo[v.SkuID].UserMoney)/float64(v.SkuSalePrice)*float64(v.SkuEarningPrice))
|
v.SkuEarningPrice = v.SkuEarningPrice - utils.Float64TwoInt(float64(afsInfo[v.SkuID].UserMoney)/float64(v.SkuSalePrice)*float64(v.SkuEarningPrice))
|
||||||
|
|||||||
@@ -688,15 +688,6 @@ func (p *PurchaseHandler) UpdateStoreSkusStock(ctx *jxcontext.Context, vendorOrg
|
|||||||
OrderNo: utils.String2Pointer(fmt.Sprintf("%s_%d_%d", vendorStoreID, time.Now().UnixNano(), 84671)),
|
OrderNo: utils.String2Pointer(fmt.Sprintf("%s_%d_%d", vendorStoreID, time.Now().UnixNano(), 84671)),
|
||||||
OrderType: utils.String2Pointer("10006800"), // 这个不太确定
|
OrderType: utils.String2Pointer("10006800"), // 这个不太确定
|
||||||
})
|
})
|
||||||
//if (index+model.YES)%tao_vegetable.MAXHandleCount == model.NO || (index+1) == len(storeSkuList) {
|
|
||||||
// batchStockPublishDto.StockPublishDtos = &stockPublishDtos
|
|
||||||
// param.BatchStockPublishDto = batchStockPublishDto
|
|
||||||
// if err = api.StoreSkuStock(¶m); err != nil {
|
|
||||||
// failedList = append(failedList, putils.GetErrMsg2FailedSingleList(v, err, storeID, model.VendorChineseNames[model.VendorIDTaoVegetable], "更新库存错误")...)
|
|
||||||
// }
|
|
||||||
// stockPublishDtos = make([]domain589.AlibabaWdkStockPublishStockPublishDto, 0, 0)
|
|
||||||
// param.BatchStockPublishDto = nil
|
|
||||||
//}
|
|
||||||
}
|
}
|
||||||
batchStockPublishDto.StockPublishDtos = &stockPublishDtos
|
batchStockPublishDto.StockPublishDtos = &stockPublishDtos
|
||||||
param.BatchStockPublishDto = batchStockPublishDto
|
param.BatchStockPublishDto = batchStockPublishDto
|
||||||
|
|||||||
Reference in New Issue
Block a user