liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dingdan

Browse Source
This commit is contained in:
邹宗楠
2022-09-30 17:16:22 +08:00
parent e2b41bf9db
commit 97c092cd26
36 changed files with 1753 additions and 1895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/model/api_config.go
View File

@@ -146,6 +146,7 @@ var (
VendorIDQiNiuCloud: "七牛云",
VendorIDShowAPI: "万维易源",
VendorGoMei: "国美",
VendorIDDD: "抖店平台",
}
VendorInfoMap = map[int]*VendorInfo{

42
business/model/const.go
View File

@@ -214,9 +214,9 @@ var (
)
const (
OrderTypeOrder = 1
OrderTypeWaybill = 2
OrderTypeAfsOrder = 3
OrderTypeOrder = 1 // 新订单
OrderTypeWaybill = 2 // 运单
OrderTypeAfsOrder = 3 // 售后单
)
// https://blog.csdn.net/a13570320979/article/details/51366355
@@ -245,19 +245,23 @@ const (
OrderStatusAdjust = -65 // 原值-35 订单调整完成
OrderStatusApplyUrgeOrder = -55 // 原值-15
OrderStatusUnlocked = -25
OrderStatusLocked = -20
OrderStatusUndoApplyCancel = -10
OrderStatusVendorRejectCancel = -7
OrderStatusVendorAgreeCancel = -6
OrderStatusApplyCancel = -5
OrderStatusUnlocked = -25
OrderStatusLocked = -20
OrderStatusUndoApplyCancel = -10
OrderStatusVendorRejectCancel = -7
OrderStatusVendorAgreeCancel = -6
OrderStatusApplyCancel = -5 // 发货前退款(取消)
OrderStatusAfterShipmentCancel = -4 // 发货后退款(取消)
OrderStatusAfterReceivingCancel = -3 // 收货后退款(取消)
OrderStatusUnknown = 0
OrderStatusWait4Pay = 2 // 原值-60 下单待支付
OrderStatusWaitAccepted = 3 // 待接单，目前饿百用
OrderStatusNew = 5 // 新订单，实际是已经支付
OrderStatusAccepted = 10 // 已经接单，也即待出库，待拣货
OrderStatusFinishedPickup = 15 // 拣货完成
OrderStatusUnknown = 0
OrderStatusWait4Pay = 2 // 原值-60 下单待支付
OrderStatusWaitAccepted = 3 // 待接单，目前饿百用
OrderStatusNew = 5 // 新订单，实际是已经支付
OrderStatusPartDeliverGoods = 6 // 部分发货
OrderStatusPartPay = 7 // 部分支付
OrderStatusAccepted = 10 // 已经接单，也即待出库，待拣货
OrderStatusFinishedPickup = 15 // 拣货完成
OrderStatusApplyFailedGetGoods = 17 // 取货失败待审核
OrderStatusAgreeFailedGetGoods = 18 // 取货失败
@@ -402,6 +406,14 @@ const (
AfsAppealTypeRefund = 1 // 仅退款
AfsAppealTypeReturnAndRefund = 2 // 退货退款
AfsAppealTypeNewGoods = 3 // 重发新商品（即京东到家的直赔）
// 新补
AfsAppealTypeSendPkgOnlyReturnMoney = 4 // 已发货仅退款
AfsAppealTypeReturnMoney = 5 // 未发货仅退款
AfsAppealTypeChangePkg = 6 // 换货
AfsAppealTypeSystemCancel = 7 // 系统取消
AfsAppealTypeUserCancel = 8 // 用户取消
AfsAppealTypeInsuredPrice = 9 // 价保
AfsAppealTypeReissue = 10 // 补寄
)
const (

18
business/model/dao/dao_order.go
View File

@@ -1343,6 +1343,24 @@ func GetJxOrderCount(db *DaoDB, storeID int, orderID string, date time.Time) (co
return count, err
}
// GetVendorOrderNumber 查询当前平台当然订单数（抖音没有订单seq）
func GetVendorOrderNumber(db *DaoDB, vendorId int64, vendorStoreId string) (count int, err error) {
date := time.Now()
sql := `
SELECT COUNT(*) ct
FROM goods_order t1
WHERE t1.vendor_store_id = ? AND t1.vendor_id = ? AND t1.order_created_at >= ? AND t1.order_created_at < ?
`
sqlParams := []interface{}{
vendorStoreId,
vendorId,
utils.Time2Date(date),
utils.Time2Date(date).Add(24 * time.Hour),
}
return count, GetRow(db, &count, sql, sqlParams...)
}
func GetOrdersForJxPay(db *DaoDB, finishTimeBegin, finishTimeEnd time.Time) (goods []*GoodsOrderPay, err error) {
sql := `
SELECT a.*,b.transaction_id

2
business/model/dao/store.go
View File

@@ -60,7 +60,7 @@ type StoreDetail struct {
YbAppKey string `json:"ybAppKey"`
YbStorePrefix string `json:"ybStorePrefix"`
MtwmToken string `json:"mtwmToken"`
MtwmToken string `json:"mtwmToken"` // 当vendor为美团时存储美团token,为抖店时存储抖店token
EbaiSupplierID string `json:"ebaiSupplierID"`
BrandName string `json:"brandName"` //品牌信息

4
business/model/order_financial.go
View File

@@ -87,8 +87,8 @@ type AfsOrder struct {
VendorReasonType string `orm:"size(255)" json:"vendorReasonType"` // 原始售后原因
ReasonDesc string `orm:"size(1024)" json:"reasonDesc"` // 售后原因描述
ReasonImgList string `orm:"size(1024)" json:"reasonImgList"` // 售后描述图片
AppealType int8 `json:"appealType"` // 售后方式
VendorAppealType string `orm:"size(255)" json:"vendorAppealType"` // 原始售后方式
AppealType int8 `json:"appealType"` // 售后方式(本地)
VendorAppealType string `orm:"size(255)" json:"vendorAppealType"` // 原始售后方式(第三方平台)
Flag int `json:"flag"`
RefundType int8 `json:"refundType"`
RefuseReason string `orm:"size(1024)" json:"refuseReason"`

2
business/model/store.go
View File

@@ -489,7 +489,7 @@ type StoreMap struct {
YbAppKey string `orm:"size(255)" json:"ybAppKey"`
YbStorePrefix string `orm:"size(255)" json:"ybStorePrefix"`
MtwmToken string `orm:"size(255)" json:"mtwmToken"` //美团外卖商超token，有效期30天，每20天刷一次
MtwmToken string `orm:"size(512)" json:"mtwmToken"` //美团外卖商超token，有效期30天，每20天刷一次
MtwmRefreshToken string `orm:"size(255)" json:"mtwmRefreshToken"` //美团外卖商超refreshToken
EbaiSupplierID string `orm:"column(ebai_supplier_id)" json:"ebaiSupplierID"` //饿百供应商ID