This commit is contained in:
苏尹岚
2021-04-12 10:59:43 +08:00
parent 9839e1ed91
commit fd4caa1a73

View File

@@ -230,31 +230,39 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
if math.Mod(float64(len(order.Skus)), float64(2)) == 0 {
if saleNormalSum < len(order.Skus)/2 {
buildOrderTo102919(order)
globals.SugarLogger.Debugf("resultjdsOrders return 1")
} else {
if order.EarningType == model.EarningTypeQuote && shopPriceSum+700 > int(order.TotalShopMoney) {
buildOrderTo102919(order)
globals.SugarLogger.Debugf("resultjdsOrders return 2")
}
}
} else {
if saleNormalSum <= len(order.Skus)/2 {
buildOrderTo102919(order)
globals.SugarLogger.Debugf("resultjdsOrders return 3")
} else {
if order.EarningType == model.EarningTypeQuote && shopPriceSum+700 > int(order.TotalShopMoney) {
buildOrderTo102919(order)
globals.SugarLogger.Debugf("resultjdsOrders return 4")
}
}
}
} else {
buildOrderTo102919(order)
globals.SugarLogger.Debugf("resultjdsOrders return 5")
}
} else {
buildOrderTo102919(order)
globals.SugarLogger.Debugf("resultjdsOrders return 6")
}
} else {
buildOrderTo102919(order)
globals.SugarLogger.Debugf("resultjdsOrders return 7")
}
if order.ActualPayPrice > 100000 {
buildOrderTo102919(order)
globals.SugarLogger.Debugf("resultjdsOrders return 8")
}
// 如果是暂停表示是预订单g
if msg.OrderState == jdshopapi.OrderStatusPause || msg.OrderState == jdshopapi.OrderStatusPopPause {
@@ -307,11 +315,13 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
setJdsOrderSeq(order)
if order.OrderType == model.OrderTypeAddressErr {
buildOrderTo102919(order)
globals.SugarLogger.Debugf("resultjdsOrders return 9")
}
billParams, _ := GetDaDaBillParams(db, order)
if result, err := api.DadaAPI.QueryDeliverFee(billParams); err == nil {
if result.Fee > 10 {
buildOrderTo102919(order)
globals.SugarLogger.Debugf("resultjdsOrders return 10")
}
}
if order.ExpectedDeliveredTime.Sub(order.OrderCreatedAt) <= time.Hour+time.Minute {