Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

2023-03-30 10:59:23 +08:00
parent e5d1c798ba 2dc3594070
commit 31d540d33a
1 changed files with 7 additions and 0 deletions
--- a/business/jxcallback/scheduler/basesch/basesch_ext.go
+++ b/business/jxcallback/scheduler/basesch/basesch_ext.go
@@ -103,6 +103,13 @@ func (c *BaseScheduler) PickupGoodsAndUpdateStatus(ctx *jxcontext.Context, vendo
 						return err
 					}
 				}
+				// 京西商城的自提订单,在拣货完成时自动设置为完成订单
+				if model.IsOrderDeliveryBySelf(order) && order.VendorID == model.VendorIDJX {
+					order.Status = model.OrderStatusFinished
+					order.VendorStatus = utils.Int64ToStr(model.OrderStatusFinished)
+					order.Flag = 128
+					dao.UpdateEntity(dao.GetDB(), order, "Status", "VendorStatus", "Flag")
+				}
 			}
 			return err
 		}()