1
This commit is contained in:
@@ -1401,6 +1401,7 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in
|
|||||||
VendorOrgCode string
|
VendorOrgCode string
|
||||||
VendorStoreID string
|
VendorStoreID string
|
||||||
}
|
}
|
||||||
|
globals.SugarLogger.Debugf("--------------dateVendorList := %s", utils.Format4Output(dateVendorList, false))
|
||||||
if len(dateVendorList) > 0 {
|
if len(dateVendorList) > 0 {
|
||||||
var missingOrderList []*tOrderVendorPair
|
var missingOrderList []*tOrderVendorPair
|
||||||
var updateOrderStatusList []*model.GoodsOrder
|
var updateOrderStatusList []*model.GoodsOrder
|
||||||
|
|||||||
@@ -793,6 +793,10 @@ func (c *PurchaseHandler) ListOrders(ctx *jxcontext.Context, vendorOrgCode strin
|
|||||||
//}
|
//}
|
||||||
|
|
||||||
tmpOrderIDs, _ := getAPI(vendorOrgCode, 0, vendorStoreID).EcommerceGetOrderIdByPage(vendorStoreID, queryDate, endData)
|
tmpOrderIDs, _ := getAPI(vendorOrgCode, 0, vendorStoreID).EcommerceGetOrderIdByPage(vendorStoreID, queryDate, endData)
|
||||||
|
globals.SugarLogger.Debugf("-------------------tmpOrderIDs := %s", utils.Format4Output(tmpOrderIDs, false))
|
||||||
|
globals.SugarLogger.Debugf("-------------------queryDate := %s", utils.Format4Output(queryDate, false))
|
||||||
|
globals.SugarLogger.Debugf("-------------------endData := %s", utils.Format4Output(endData, false))
|
||||||
|
globals.SugarLogger.Debugf("-------------------vendorStoreID := %s", utils.Format4Output(vendorStoreID, false))
|
||||||
if len(tmpOrderIDs) > 0 {
|
if len(tmpOrderIDs) > 0 {
|
||||||
for _, v := range tmpOrderIDs {
|
for _, v := range tmpOrderIDs {
|
||||||
orderIDs = append(orderIDs, utils.Int64ToStr(v))
|
orderIDs = append(orderIDs, utils.Int64ToStr(v))
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ func (c *OrderController) SelfDelivered() {
|
|||||||
bills, _ := dao.GetWaybills(dao.GetDB(), params.VendorOrderID, nil)
|
bills, _ := dao.GetWaybills(dao.GetDB(), params.VendorOrderID, nil)
|
||||||
for _, b := range bills {
|
for _, b := range bills {
|
||||||
if b.WaybillVendorID == model.VendorJXFakeWL && b.Status < model.OrderStatusDelivering {
|
if b.WaybillVendorID == model.VendorJXFakeWL && b.Status < model.OrderStatusDelivering {
|
||||||
return nil, "", fmt.Errorf("物流单正在同步回传率,请稍后再点击送达")
|
return nil, "-1", fmt.Errorf("物流单正在同步回传率,请稍后再点击送达")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user