京西商城订单序号
This commit is contained in:
@@ -1162,3 +1162,28 @@ func GetOrdersSupplementNoPage(db *DaoDB, ID int, storIDs, vendorIDs, statuss []
|
|||||||
err = GetRows(db, &orderSupplementFee, sql, sqlParams...)
|
err = GetRows(db, &orderSupplementFee, sql, sqlParams...)
|
||||||
return orderSupplementFee, err
|
return orderSupplementFee, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetJxOrderCount(db *DaoDB, storeID int, orderID string, date time.Time) (count int, err error) {
|
||||||
|
if utils.IsTimeZero(date) {
|
||||||
|
date = time.Now()
|
||||||
|
}
|
||||||
|
sql := `
|
||||||
|
SELECT COUNT(*) ct
|
||||||
|
FROM goods_order t1
|
||||||
|
WHERE t1.vendor_id = ? AND t1.jx_store_id = ? AND (t1.status >= ? OR t1.order_seq > 0) AND t1.order_created_at >= ? AND t1.order_created_at < ?
|
||||||
|
`
|
||||||
|
sqlParams := []interface{}{
|
||||||
|
model.VendorIDJX,
|
||||||
|
storeID,
|
||||||
|
model.OrderStatusNew,
|
||||||
|
utils.Time2Date(date),
|
||||||
|
utils.Time2Date(date).Add(24 * time.Hour),
|
||||||
|
}
|
||||||
|
|
||||||
|
if orderID != "" {
|
||||||
|
sql += " AND t1.vendor_order_id = ?"
|
||||||
|
sqlParams = append(sqlParams, orderID)
|
||||||
|
}
|
||||||
|
err = GetRow(db, &count, sql, sqlParams...)
|
||||||
|
return count, err
|
||||||
|
}
|
||||||
|
|||||||
@@ -47,3 +47,11 @@ func TestGetPendingFakeOrders(t *testing.T) {
|
|||||||
}
|
}
|
||||||
t.Log(len(orderList))
|
t.Log(len(orderList))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestGetJxOrderSeq(t *testing.T) {
|
||||||
|
count, err := GetJxOrderCount(GetDB(), 100118, "23423", time.Now())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
t.Log(count)
|
||||||
|
}
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ func TestGetStoreList4Role(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestGetStoresMapList(t *testing.T) {
|
func TestGetStoresMapList(t *testing.T) {
|
||||||
storeList, err := GetStoresMapList(GetDB(), nil, nil, model.StoreStatusClosed, model.StoreIsSyncYes, "")
|
storeList, err := GetStoresMapList(GetDB(), nil, nil, nil, model.StoreStatusClosed, model.StoreIsSyncYes, "")
|
||||||
t.Log(utils.Format4Output(storeList, false))
|
t.Log(utils.Format4Output(storeList, false))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
|
|||||||
@@ -255,6 +255,10 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) {
|
|||||||
if err == nil {
|
if err == nil {
|
||||||
db := dao.GetDB()
|
db := dao.GetDB()
|
||||||
dao.UpdateEntity(db, orderPay)
|
dao.UpdateEntity(db, orderPay)
|
||||||
|
if count, err2 := dao.GetJxOrderCount(db, jxutils.GetSaleStoreIDFromOrder(order), order.VendorOrderID, order.OrderCreatedAt); err2 == nil {
|
||||||
|
order.OrderSeq = count + 1
|
||||||
|
partner.CurOrderManager.UpdateOrderFields(order, []string{"OrderSeq"})
|
||||||
|
}
|
||||||
order.Status = model.OrderStatusNew
|
order.Status = model.OrderStatusNew
|
||||||
order.VendorStatus = utils.Int2Str(model.OrderStatusNew)
|
order.VendorStatus = utils.Int2Str(model.OrderStatusNew)
|
||||||
order.StatusTime = *orderPay.PayFinishedAt
|
order.StatusTime = *orderPay.PayFinishedAt
|
||||||
|
|||||||
Reference in New Issue
Block a user