1
This commit is contained in:
@@ -11,7 +11,6 @@ import (
|
|||||||
"git.rosy.net.cn/jx-callback/business/auth2"
|
"git.rosy.net.cn/jx-callback/business/auth2"
|
||||||
"git.rosy.net.cn/jx-callback/business/model"
|
"git.rosy.net.cn/jx-callback/business/model"
|
||||||
"git.rosy.net.cn/jx-callback/business/model/dao"
|
"git.rosy.net.cn/jx-callback/business/model/dao"
|
||||||
"git.rosy.net.cn/jx-callback/globals"
|
|
||||||
"git.rosy.net.cn/jx-callback/globals/api"
|
"git.rosy.net.cn/jx-callback/globals/api"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -64,8 +63,6 @@ func (a *DefAuther) GetUserType() (userType int8) {
|
|||||||
|
|
||||||
// 此函数用于联合(通过unionID)查找用户
|
// 此函数用于联合(通过unionID)查找用户
|
||||||
func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAuthTypeList []string, openID, unionID string, authDetail interface{}) (authBindEx *auth2.AuthBindEx, err error) {
|
func (a *DefAuther) UnionFindAuthBind(curAuthType, curAuthTypeID string, unionAuthTypeList []string, openID, unionID string, authDetail interface{}) (authBindEx *auth2.AuthBindEx, err error) {
|
||||||
globals.SugarLogger.Debugf("UnionFindAuthBind curAuthType:%s, curAuthTypeID:%s, unionAuthTypeList:%v, openID:%s, unionID:%s, authDetail:%s",
|
|
||||||
curAuthType, curAuthTypeID, unionAuthTypeList, openID, unionID, utils.Format4Output(authDetail, true))
|
|
||||||
db := dao.GetDB()
|
db := dao.GetDB()
|
||||||
var authBind *model.AuthBind
|
var authBind *model.AuthBind
|
||||||
if authBind, err = dao.GetAuthBind(db, model.AuthBindTypeAuth, curAuthType, openID); err == nil { // 直接找到了
|
if authBind, err = dao.GetAuthBind(db, model.AuthBindTypeAuth, curAuthType, openID); err == nil { // 直接找到了
|
||||||
@@ -146,7 +143,6 @@ func (a *DefAuther) GenerateVerifyCode(keyID string) (verifyCode string) {
|
|||||||
if verifyCode == "" {
|
if verifyCode == "" {
|
||||||
verifyCode = fmt.Sprintf("%06d", rand.Intn(1000000))
|
verifyCode = fmt.Sprintf("%06d", rand.Intn(1000000))
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("GenerateVerifyCode keyID:%s verifyCode:%s", keyID, verifyCode)
|
|
||||||
return verifyCode
|
return verifyCode
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1675,7 +1675,6 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
|
|||||||
var beforeStoreMap = *storeMap
|
var beforeStoreMap = *storeMap
|
||||||
syncStatus := model.SyncFlagModifiedMask
|
syncStatus := model.SyncFlagModifiedMask
|
||||||
valid := dao.StrictMakeMapByStructObject(payload, storeMap, userName)
|
valid := dao.StrictMakeMapByStructObject(payload, storeMap, userName)
|
||||||
globals.SugarLogger.Debug("==============validvalidvalidvalidvalid", utils.Format4Output(valid, false))
|
|
||||||
if valid["status"] != nil {
|
if valid["status"] != nil {
|
||||||
syncStatus |= model.SyncFlagStoreStatus
|
syncStatus |= model.SyncFlagStoreStatus
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,7 +55,6 @@ func InsertStoreAcctIncome(ctx *jxcontext.Context, storeID, price, acctType int,
|
|||||||
storeAcctIncome.ExpID = expendID
|
storeAcctIncome.ExpID = expendID
|
||||||
}
|
}
|
||||||
err = dao.CreateEntity(db, storeAcctIncome)
|
err = dao.CreateEntity(db, storeAcctIncome)
|
||||||
globals.SugarLogger.Debugf("InsertStoreAcctIncome orderID: [%v] , price :[%v] , type :[%v]", vendorOrderID, price, acctType)
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -96,7 +95,6 @@ func (s *StoreAcctManager) UpdateStoreAcctBalance(ctx *jxcontext.Context, storeI
|
|||||||
var (
|
var (
|
||||||
db = dao.GetDB()
|
db = dao.GetDB()
|
||||||
)
|
)
|
||||||
globals.SugarLogger.Debugf("UpdateStoreAcctBalance storeID: [%v] , price :[%v] ,", storeID, price)
|
|
||||||
if ctx == nil {
|
if ctx == nil {
|
||||||
ctx = jxcontext.AdminCtx
|
ctx = jxcontext.AdminCtx
|
||||||
}
|
}
|
||||||
@@ -130,7 +128,6 @@ func (s *StoreAcctManager) UpdateStoreAcctBalance(ctx *jxcontext.Context, storeI
|
|||||||
dao.Rollback(db, txDB)
|
dao.Rollback(db, txDB)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("UpdateStoreAcctBalance2 storeID: [%v] , balance :[%v] ,", storeID, storeAcct.AccountBalance)
|
|
||||||
}
|
}
|
||||||
dao.Commit(db, txDB)
|
dao.Commit(db, txDB)
|
||||||
return err
|
return err
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ func init() {
|
|||||||
|
|
||||||
func (s *StoreManager) OnStoreStatusChanged(vendorStoreID string, vendorID int, storeStatus int) (err error) {
|
func (s *StoreManager) OnStoreStatusChanged(vendorStoreID string, vendorID int, storeStatus int) (err error) {
|
||||||
//return err
|
//return err
|
||||||
globals.SugarLogger.Debugf("OnStoreStatusChanged venvendorStoreID:%s, storeStatus:%d", vendorStoreID, storeStatus)
|
|
||||||
db := dao.GetDB()
|
db := dao.GetDB()
|
||||||
storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, vendorStoreID, vendorID, "")
|
storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, vendorStoreID, vendorID, "")
|
||||||
if err == nil {
|
if err == nil {
|
||||||
|
|||||||
@@ -559,7 +559,6 @@ func (c *ComparePlatform) CompareStoreWithOperator(ctx *jxcontext.Context, db *d
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (v *VendorSync) FullSyncStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs []int, storeIDs []int, syncDisabled bool, excludeSkuIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
|
func (v *VendorSync) FullSyncStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs []int, storeIDs []int, syncDisabled bool, excludeSkuIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
|
||||||
globals.SugarLogger.Debug("FullSyncStoresSkus")
|
|
||||||
hint, err = v.LoopStoresMap(ctx, db, fmt.Sprintf("初始化门店商品信息:%v", storeIDs), isAsync, true, vendorIDs, storeIDs,
|
hint, err = v.LoopStoresMap(ctx, db, fmt.Sprintf("初始化门店商品信息:%v", storeIDs), isAsync, true, vendorIDs, storeIDs,
|
||||||
func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
|
func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
|
||||||
loopMapInfo := batchItemList[0].(*LoopStoreMapInfo)
|
loopMapInfo := batchItemList[0].(*LoopStoreMapInfo)
|
||||||
@@ -588,7 +587,6 @@ func (v *VendorSync) FullSyncStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, v
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (v *VendorSync) DeleteRemoteStoreSkus(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs []int, storeIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
|
func (v *VendorSync) DeleteRemoteStoreSkus(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs []int, storeIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
|
||||||
globals.SugarLogger.Debug("DeleteRemoteStoreSkus")
|
|
||||||
hint, err = v.LoopStoresMap(ctx, db, fmt.Sprintf("删除远程门店商品信息:%v", storeIDs), isAsync, true, vendorIDs, storeIDs,
|
hint, err = v.LoopStoresMap(ctx, db, fmt.Sprintf("删除远程门店商品信息:%v", storeIDs), isAsync, true, vendorIDs, storeIDs,
|
||||||
func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
|
func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
|
||||||
loopMapInfo := batchItemList[0].(*LoopStoreMapInfo)
|
loopMapInfo := batchItemList[0].(*LoopStoreMapInfo)
|
||||||
@@ -612,7 +610,6 @@ func (v *VendorSync) DeleteRemoteStoreSkus(ctx *jxcontext.Context, db *dao.DaoDB
|
|||||||
// 将平台有,但本地没有的门店商品清除
|
// 将平台有,但本地没有的门店商品清除
|
||||||
// todo,京东到家也应该支持
|
// todo,京东到家也应该支持
|
||||||
func (v *VendorSync) PruneMissingStoreSkus(ctx *jxcontext.Context, vendorIDs []int, storeIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
|
func (v *VendorSync) PruneMissingStoreSkus(ctx *jxcontext.Context, vendorIDs []int, storeIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
|
||||||
globals.SugarLogger.Debug("PruneMissingStoreSkus")
|
|
||||||
hint, err = v.LoopStoresMap(ctx, dao.GetDB(), fmt.Sprintf("删除远程无关联的门店商品信息:%v", storeIDs), isAsync, true, vendorIDs, storeIDs,
|
hint, err = v.LoopStoresMap(ctx, dao.GetDB(), fmt.Sprintf("删除远程无关联的门店商品信息:%v", storeIDs), isAsync, true, vendorIDs, storeIDs,
|
||||||
func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
|
func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
|
||||||
loopMapInfo := batchItemList[0].(*LoopStoreMapInfo)
|
loopMapInfo := batchItemList[0].(*LoopStoreMapInfo)
|
||||||
@@ -637,7 +634,6 @@ func (v *VendorSync) PruneMissingStoreSkus(ctx *jxcontext.Context, vendorIDs []i
|
|||||||
// 把京西有,平台无且没有待创建标记的商品加上待创建标记
|
// 把京西有,平台无且没有待创建标记的商品加上待创建标记
|
||||||
// todo,京东到家也应该支持
|
// todo,京东到家也应该支持
|
||||||
func (v *VendorSync) AddCreateFlagForJxStoreSku(ctx *jxcontext.Context, vendorIDs []int, storeIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
|
func (v *VendorSync) AddCreateFlagForJxStoreSku(ctx *jxcontext.Context, vendorIDs []int, storeIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
|
||||||
globals.SugarLogger.Debug("AddCreateFlagForJxStoreSku")
|
|
||||||
hint, err = v.LoopStoresMap(ctx, dao.GetDB(), fmt.Sprintf("处理京西有,平台无且没有待创建标记的商品加上待创建标记:%v", storeIDs), isAsync, true, vendorIDs, storeIDs,
|
hint, err = v.LoopStoresMap(ctx, dao.GetDB(), fmt.Sprintf("处理京西有,平台无且没有待创建标记的商品加上待创建标记:%v", storeIDs), isAsync, true, vendorIDs, storeIDs,
|
||||||
func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
|
func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
|
||||||
loopMapInfo := batchItemList[0].(*LoopStoreMapInfo)
|
loopMapInfo := batchItemList[0].(*LoopStoreMapInfo)
|
||||||
@@ -688,7 +684,6 @@ func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, parentTask tasksch.I
|
|||||||
if storeMapList, err = dao.GetStoresMapList2(db, vendorIDs, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "", "", mustDirty); err != nil {
|
if storeMapList, err = dao.GetStoresMapList2(db, vendorIDs, storeIDs, nil, model.StoreStatusAll, model.StoreIsSyncYes, "", "", "", mustDirty); err != nil {
|
||||||
return nil, "", err
|
return nil, "", err
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debug("===============len(storeMapList)", len(storeMapList))
|
|
||||||
if len(storeMapList) == 0 {
|
if len(storeMapList) == 0 {
|
||||||
return nil, "", nil
|
return nil, "", nil
|
||||||
}
|
}
|
||||||
@@ -705,13 +700,10 @@ func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, parentTask tasksch.I
|
|||||||
}
|
}
|
||||||
index++
|
index++
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debug("===============len(storeMapList)1111111111", vendorStoreMap)
|
|
||||||
|
|
||||||
if len(loopInfoList) == 1 {
|
if len(loopInfoList) == 1 {
|
||||||
globals.SugarLogger.Debug("===============len(storeMapList)22222")
|
|
||||||
taskName = fmt.Sprintf("%s,处理平台%s", taskName, model.VendorChineseNames[loopInfoList[0].VendorID])
|
taskName = fmt.Sprintf("%s,处理平台%s", taskName, model.VendorChineseNames[loopInfoList[0].VendorID])
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debug("===============len(storeMapList)3333")
|
|
||||||
|
|
||||||
task = tasksch.NewParallelTask(taskName, tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, handler, loopInfoList)
|
task = tasksch.NewParallelTask(taskName, tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, handler, loopInfoList)
|
||||||
if isAsync {
|
if isAsync {
|
||||||
|
|||||||
@@ -92,7 +92,6 @@ func syncCategories(ctx *jxcontext.Context, db *dao.DaoDB, parentTask tasksch.IT
|
|||||||
}
|
}
|
||||||
|
|
||||||
func SyncCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs []int, appOrgCodes []string, catIDs []int, isAsync bool) (hint string, err error) {
|
func SyncCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs []int, appOrgCodes []string, catIDs []int, isAsync bool) (hint string, err error) {
|
||||||
globals.SugarLogger.Debugf("SyncCategories vendorIDs:%v, appOrgCodes:%v, catIDs:%v", vendorIDs, appOrgCodes, catIDs)
|
|
||||||
db := dao.GetDB()
|
db := dao.GetDB()
|
||||||
catList, err := dao.GetSkuCategoryWithVendor(db, vendorIDs, appOrgCodes, -1, catIDs, true)
|
catList, err := dao.GetSkuCategoryWithVendor(db, vendorIDs, appOrgCodes, -1, catIDs, true)
|
||||||
globals.SugarLogger.Debugf("SyncCategories catListLenght:%v", len(catList))
|
globals.SugarLogger.Debugf("SyncCategories catListLenght:%v", len(catList))
|
||||||
|
|||||||
@@ -38,7 +38,6 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func CreateStoreCategoryByStoreSku(ctx *jxcontext.Context, vendorID, storeID int, vendorStoreID string, nameIDs, skuIDs []int) (err error) {
|
func CreateStoreCategoryByStoreSku(ctx *jxcontext.Context, vendorID, storeID int, vendorStoreID string, nameIDs, skuIDs []int) (err error) {
|
||||||
globals.SugarLogger.Debugf("CreateStoreCategoryByStoreSku vendorID:%d, storeID:%d", vendorID, storeID)
|
|
||||||
db := dao.GetDB()
|
db := dao.GetDB()
|
||||||
txDB, _ := dao.Begin(db)
|
txDB, _ := dao.Begin(db)
|
||||||
defer func() {
|
defer func() {
|
||||||
@@ -513,10 +512,8 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
|
|||||||
} else {
|
} else {
|
||||||
deleteList = append(deleteList, bareSku)
|
deleteList = append(deleteList, bareSku)
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debug("2.stockList,deleteList==============", stockList, deleteList)
|
|
||||||
} else {
|
} else {
|
||||||
updateItems = append(updateItems, sku2Update(vendorID, sku, model.SyncFlagDeletedMask))
|
updateItems = append(updateItems, sku2Update(vendorID, sku, model.SyncFlagDeletedMask))
|
||||||
globals.SugarLogger.Debug("3.updateItems==============", updateItems)
|
|
||||||
}
|
}
|
||||||
} else if model.IsSyncStatusNew(sku.SkuSyncStatus) {
|
} else if model.IsSyncStatusNew(sku.SkuSyncStatus) {
|
||||||
globals.SugarLogger.Debug("4.进入model.IsSyncStatusNew(sku.SkuSyncStatus)")
|
globals.SugarLogger.Debug("4.进入model.IsSyncStatusNew(sku.SkuSyncStatus)")
|
||||||
@@ -579,12 +576,10 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
|
|||||||
isAdded2Update = true
|
isAdded2Update = true
|
||||||
updateList = append(updateList, calVendorPrice4StoreSku(sku, storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage)))
|
updateList = append(updateList, calVendorPrice4StoreSku(sku, storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage)))
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debug("13.updateList================", updateList)
|
|
||||||
}
|
}
|
||||||
if model.IsSyncStatusPrice(sku.SkuSyncStatus) {
|
if model.IsSyncStatusPrice(sku.SkuSyncStatus) {
|
||||||
bareSku = storeSkuSyncInfo2Bare(calVendorPrice4StoreSku(sku, storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage)))
|
bareSku = storeSkuSyncInfo2Bare(calVendorPrice4StoreSku(sku, storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage)))
|
||||||
priceList = append(priceList, bareSku)
|
priceList = append(priceList, bareSku)
|
||||||
globals.SugarLogger.Debug("14. priceList=====================", priceList)
|
|
||||||
}
|
}
|
||||||
if !isAdded2Update {
|
if !isAdded2Update {
|
||||||
globals.SugarLogger.Debug("15.进入!isAdded2Update")
|
globals.SugarLogger.Debug("15.进入!isAdded2Update")
|
||||||
@@ -696,7 +691,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
|
|||||||
task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx,
|
task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx,
|
||||||
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
|
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
|
||||||
step := batchItemList[0].(int)
|
step := batchItemList[0].(int)
|
||||||
globals.SugarLogger.Debugf("17.deleteList,createList,updateList,stockList===============", deleteList, createList, updateList, stockList)
|
|
||||||
switch step {
|
switch step {
|
||||||
case 0:
|
case 0:
|
||||||
if len(deleteList) > 0 {
|
if len(deleteList) > 0 {
|
||||||
@@ -747,10 +741,8 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
|
|||||||
globals.SugarLogger.Debug("31.sth wrong on err2: %v", err2)
|
globals.SugarLogger.Debug("31.sth wrong on err2: %v", err2)
|
||||||
failedList = append(failedList, putils.GetErrMsg2FailedSingleList(batchedStoreSkuList, err2, storeID, model.VendorChineseNames[vendorID], "查询是否有该商品")...)
|
failedList = append(failedList, putils.GetErrMsg2FailedSingleList(batchedStoreSkuList, err2, storeID, model.VendorChineseNames[vendorID], "查询是否有该商品")...)
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debug("33.updateList|| failedList=============", updateList, failedList)
|
|
||||||
}
|
}
|
||||||
failedList, err = buildFailedListAndErr(failedList, err, nil, batchedStoreSkuList, storeID, vendorID, "创建门店商品")
|
failedList, err = buildFailedListAndErr(failedList, err, nil, batchedStoreSkuList, storeID, vendorID, "创建门店商品")
|
||||||
globals.SugarLogger.Debug("18.updateList,failedList=========================", updateList, failedList)
|
|
||||||
if len(failedList) > 0 {
|
if len(failedList) > 0 {
|
||||||
task.AddFailedList(failedList)
|
task.AddFailedList(failedList)
|
||||||
}
|
}
|
||||||
@@ -851,7 +843,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
|
|||||||
}
|
}
|
||||||
case 6:
|
case 6:
|
||||||
if len(priceList) > 0 {
|
if len(priceList) > 0 {
|
||||||
globals.SugarLogger.Debugf("================更新门店商品价格%s", utils.Format4Output(priceList, true))
|
|
||||||
_, err = putils.FreeBatchStoreSkuInfo("更新门店商品价格", func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, successCount int, err error) {
|
_, err = putils.FreeBatchStoreSkuInfo("更新门店商品价格", func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, successCount int, err error) {
|
||||||
if isNeedHandleAct(causeFlag) {
|
if isNeedHandleAct(causeFlag) {
|
||||||
cancelStoreSkuActs(ctx, task, vendorID, storeDetail.VendorOrgCode, storeID, vendorStoreID, batchedStoreSkuList, true)
|
cancelStoreSkuActs(ctx, task, vendorID, storeDetail.VendorOrgCode, storeID, vendorStoreID, batchedStoreSkuList, true)
|
||||||
|
|||||||
@@ -682,7 +682,6 @@ func ScheduleTimerFuncOnce(name string, handler func(interface{}), timeStr strin
|
|||||||
now := time.Now()
|
now := time.Now()
|
||||||
nextTime := jxutils.GetNextTimeFromList(now, []string{timeStr})
|
nextTime := jxutils.GetNextTimeFromList(now, []string{timeStr})
|
||||||
duration := nextTime.Sub(now) + 1*time.Second
|
duration := nextTime.Sub(now) + 1*time.Second
|
||||||
globals.SugarLogger.Debugf("ScheduleTimerFuncOnce, func:%s, duration:%v", name, duration)
|
|
||||||
utils.AfterFuncWithRecover(duration, func() {
|
utils.AfterFuncWithRecover(duration, func() {
|
||||||
globals.SugarLogger.Debugf("ScheduleTimerFuncOnce func:%s", name)
|
globals.SugarLogger.Debugf("ScheduleTimerFuncOnce func:%s", name)
|
||||||
handler(param)
|
handler(param)
|
||||||
@@ -690,7 +689,6 @@ func ScheduleTimerFuncOnce(name string, handler func(interface{}), timeStr strin
|
|||||||
}
|
}
|
||||||
|
|
||||||
func ScheduleTimerFuncByInterval(handler func(), delay, inerval time.Duration) {
|
func ScheduleTimerFuncByInterval(handler func(), delay, inerval time.Duration) {
|
||||||
globals.SugarLogger.Debugf("ScheduleTimerFuncByInterval, delay:%v, inerval:%v", delay, inerval)
|
|
||||||
utils.AfterFuncWithRecover(delay, func() {
|
utils.AfterFuncWithRecover(delay, func() {
|
||||||
beginTime := time.Now()
|
beginTime := time.Now()
|
||||||
handler()
|
handler()
|
||||||
|
|||||||
@@ -136,7 +136,6 @@ func GetPossibleVendorIDFromVendorOrderID(vendorOrderID string) (vendorID int) {
|
|||||||
vendorID = model.VendorIDUnknown
|
vendorID = model.VendorIDUnknown
|
||||||
//if vendorOrderIDInt64 := utils.Str2Int64WithDefault(vendorOrderID, 0); vendorOrderIDInt64 > 0 {
|
//if vendorOrderIDInt64 := utils.Str2Int64WithDefault(vendorOrderID, 0); vendorOrderIDInt64 > 0 {
|
||||||
orderIDLen := len(vendorOrderID)
|
orderIDLen := len(vendorOrderID)
|
||||||
globals.SugarLogger.Debugf("GetPossibleVendorIDFromVendorOrderID, orderIDLen: %v", orderIDLen)
|
|
||||||
// 5287873015048 13 wsc
|
// 5287873015048 13 wsc
|
||||||
// 15380342248732 14 old ebai order
|
// 15380342248732 14 old ebai order
|
||||||
// 800402581000221 15,16 jd order
|
// 800402581000221 15,16 jd order
|
||||||
|
|||||||
@@ -72,7 +72,6 @@ func getStore4Print(db *dao.DaoDB, storeID int) (store *model.Store, err error)
|
|||||||
|
|
||||||
// PrintOrderByOrder4Store 打印订单信息
|
// PrintOrderByOrder4Store 打印订单信息
|
||||||
func PrintOrderByOrder4Store(ctx *jxcontext.Context, order *model.GoodsOrder, storeID int, printType string, afs *model.AfsOrder) (printResult *partner.PrinterStatus, err error) {
|
func PrintOrderByOrder4Store(ctx *jxcontext.Context, order *model.GoodsOrder, storeID int, printType string, afs *model.AfsOrder) (printResult *partner.PrinterStatus, err error) {
|
||||||
globals.SugarLogger.Debugf("PrintOrderByOrder4Store orderID:%s", order.VendorOrderID)
|
|
||||||
db := dao.GetDB()
|
db := dao.GetDB()
|
||||||
store, err := getStore4Print(db, storeID)
|
store, err := getStore4Print(db, storeID)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
@@ -242,7 +241,6 @@ func RebindAllPrinters(ctx *jxcontext.Context, isForce, isAsync bool) (hint stri
|
|||||||
store := batchItemList[0].(*model.Store)
|
store := batchItemList[0].(*model.Store)
|
||||||
if handler := partner.GetPrinterPlatformFromVendorID(store.PrinterVendorID); handler != nil {
|
if handler := partner.GetPrinterPlatformFromVendorID(store.PrinterVendorID); handler != nil {
|
||||||
bindResult, err2 := handler.RebindPrinter(ctx, bindResultMap[store.ID])
|
bindResult, err2 := handler.RebindPrinter(ctx, bindResultMap[store.ID])
|
||||||
globals.SugarLogger.Debugf("RebindAllPrinters storeID:%d, result:%s, err:%v", store.ID, utils.Format4Output(bindResult, true), err2)
|
|
||||||
if err = err2; err == nil {
|
if err = err2; err == nil {
|
||||||
store.PrinterSN = bindResult.PrinterSN
|
store.PrinterSN = bindResult.PrinterSN
|
||||||
store.PrinterKey = bindResult.PrinterKey
|
store.PrinterKey = bindResult.PrinterKey
|
||||||
|
|||||||
@@ -64,13 +64,11 @@ func SendVoiceMsg(mobileList []string, templateCode string, templateParam map[st
|
|||||||
TtsCode: tea.String(templateCode),
|
TtsCode: tea.String(templateCode),
|
||||||
TtsParam: tea.String(string(utils.MustMarshal(templateParam))),
|
TtsParam: tea.String(string(utils.MustMarshal(templateParam))),
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("SendVoiceMsg mobile: %s,template: %s ", mobileNum, templateCode)
|
|
||||||
res, _err := api.VoiceClient.SingleCallByTts(request)
|
res, _err := api.VoiceClient.SingleCallByTts(request)
|
||||||
if _err != nil {
|
if _err != nil {
|
||||||
errList.AddErr(err)
|
errList.AddErr(err)
|
||||||
}
|
}
|
||||||
if *res.Body.Code != "OK" {
|
if *res.Body.Code != "OK" {
|
||||||
globals.SugarLogger.Debugf("SendVoiceMsg mobileNum:%s failed with response:%s", mobileNum, utils.Format4Output(res, true))
|
|
||||||
errList.AddErr(fmt.Errorf(*res.Body.Message))
|
errList.AddErr(fmt.Errorf(*res.Body.Message))
|
||||||
} else {
|
} else {
|
||||||
globals.SugarLogger.Debugf("SendVoiceMsg mobileNum:%s success with response:%s", mobileNum, utils.Format4Output(res, true))
|
globals.SugarLogger.Debugf("SendVoiceMsg mobileNum:%s success with response:%s", mobileNum, utils.Format4Output(res, true))
|
||||||
@@ -135,7 +133,6 @@ func NotifyPickOrder(order *model.GoodsOrder) (err error) {
|
|||||||
}
|
}
|
||||||
balance, _ := partner.CurStoreAcctManager.GetBrandBalance(store.BrandID)
|
balance, _ := partner.CurStoreAcctManager.GetBrandBalance(store.BrandID)
|
||||||
if order.NotifyType == 0 && store.SMSNotify != 0 && store.IsOrder == model.NO && store.ID != model.MatterStoreID && store.ID != model.JdShopMainStoreID && len(mobileList) > 0 {
|
if order.NotifyType == 0 && store.SMSNotify != 0 && store.IsOrder == model.NO && store.ID != model.MatterStoreID && store.ID != model.JdShopMainStoreID && len(mobileList) > 0 {
|
||||||
globals.SugarLogger.Debugf("NotifyPickOrder orderID: %s , smsNotify :%d", order.VendorOrderID, store.SMSNotify)
|
|
||||||
switch store.SMSNotify {
|
switch store.SMSNotify {
|
||||||
case model.NotifyTypeSMS:
|
case model.NotifyTypeSMS:
|
||||||
if store.BrandIsOpen&model.BrandOpenSMS != 0 && balance >= model.BrandBalanceLimit {
|
if store.BrandIsOpen&model.BrandOpenSMS != 0 && balance >= model.BrandBalanceLimit {
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.rosy.net.cn/jx-callback/globals"
|
|
||||||
"git.rosy.net.cn/jx-callback/globals/api"
|
"git.rosy.net.cn/jx-callback/globals/api"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -14,7 +13,6 @@ const (
|
|||||||
|
|
||||||
func LockJdStoreSku(jdStoreID string, jdSkuID int64, expire time.Time) {
|
func LockJdStoreSku(jdStoreID string, jdSkuID int64, expire time.Time) {
|
||||||
return
|
return
|
||||||
globals.SugarLogger.Debug(expire, " ", time.Now())
|
|
||||||
duration := expire.Sub(time.Now())
|
duration := expire.Sub(time.Now())
|
||||||
if duration > 0 {
|
if duration > 0 {
|
||||||
api.Cacher.Set(genCacheKey(jdStoreID, jdSkuID), 1, duration)
|
api.Cacher.Set(genCacheKey(jdStoreID, jdSkuID), 1, duration)
|
||||||
|
|||||||
@@ -140,7 +140,6 @@ func RefreshWeixinToken() (err error) {
|
|||||||
func RefreshFnToken() (err error) {
|
func RefreshFnToken() (err error) {
|
||||||
if api.FnAPI != nil {
|
if api.FnAPI != nil {
|
||||||
err = RefreshConfig("fn", fnTokenExpires, func() (token string, expireTimeStr string, refreshToken string) {
|
err = RefreshConfig("fn", fnTokenExpires, func() (token string, expireTimeStr string, refreshToken string) {
|
||||||
globals.SugarLogger.Debugf("RefreshFnToken RunMode:%s", beego.BConfig.RunMode)
|
|
||||||
//if globals.IsMainProductEnv() {
|
//if globals.IsMainProductEnv() {
|
||||||
curConfig := &legacymodel.Config{
|
curConfig := &legacymodel.Config{
|
||||||
Thirdparty: "fn",
|
Thirdparty: "fn",
|
||||||
@@ -181,7 +180,6 @@ func RefreshFnToken() (err error) {
|
|||||||
func RefreshQywxToken() (err error) {
|
func RefreshQywxToken() (err error) {
|
||||||
if api.QywxAPI != nil {
|
if api.QywxAPI != nil {
|
||||||
err = RefreshConfig("qywx", weixinTokenExpires, func() (token string, expireTimeStr string, invalidParameter string) {
|
err = RefreshConfig("qywx", weixinTokenExpires, func() (token string, expireTimeStr string, invalidParameter string) {
|
||||||
globals.SugarLogger.Debugf("RefreshQywxToken RunMode:%s", beego.BConfig.RunMode)
|
|
||||||
if globals.IsMainProductEnv() {
|
if globals.IsMainProductEnv() {
|
||||||
if tokenInfo, err := api.QywxAPI.GetToken(); err == nil {
|
if tokenInfo, err := api.QywxAPI.GetToken(); err == nil {
|
||||||
token = tokenInfo
|
token = tokenInfo
|
||||||
@@ -191,7 +189,6 @@ func RefreshQywxToken() (err error) {
|
|||||||
}
|
}
|
||||||
return token, expireTimeStr, ""
|
return token, expireTimeStr, ""
|
||||||
}, func(value, v2 string) {
|
}, func(value, v2 string) {
|
||||||
globals.SugarLogger.Debugf("RefreshQywxToken setter value:%s", value)
|
|
||||||
api.QywxAPI.SetToken(value)
|
api.QywxAPI.SetToken(value)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -204,7 +201,6 @@ func RefreshWeixin2Token() (err error) {
|
|||||||
globals.SugarLogger.Debugf("RefreshWeixin2Token RunMode:%s", beego.BConfig.RunMode)
|
globals.SugarLogger.Debugf("RefreshWeixin2Token RunMode:%s", beego.BConfig.RunMode)
|
||||||
if globals.IsMainProductEnv() {
|
if globals.IsMainProductEnv() {
|
||||||
if tokenInfo, err := api.WeixinMiniAPI2.CBRetrieveToken(); err == nil {
|
if tokenInfo, err := api.WeixinMiniAPI2.CBRetrieveToken(); err == nil {
|
||||||
globals.SugarLogger.Debugf("RefreshWeixin2Token tokenInfo:%s", utils.Format4Output(tokenInfo, true))
|
|
||||||
token = tokenInfo.AccessToken
|
token = tokenInfo.AccessToken
|
||||||
} else {
|
} else {
|
||||||
globals.SugarLogger.Errorf("RefreshWeixin2Token RefreshToken failed with error:%v", err)
|
globals.SugarLogger.Errorf("RefreshWeixin2Token RefreshToken failed with error:%v", err)
|
||||||
@@ -217,7 +213,6 @@ func RefreshWeixin2Token() (err error) {
|
|||||||
}
|
}
|
||||||
return token, expireTimeStr, ""
|
return token, expireTimeStr, ""
|
||||||
}, func(value, v2 string) {
|
}, func(value, v2 string) {
|
||||||
globals.SugarLogger.Debugf("RefreshWeixinToken setter value:%s", value)
|
|
||||||
syseventhub.SysEventHub.OnNewWX2Token(value)
|
syseventhub.SysEventHub.OnNewWX2Token(value)
|
||||||
api.WeixinMiniAPI2.CBSetToken(value)
|
api.WeixinMiniAPI2.CBSetToken(value)
|
||||||
})
|
})
|
||||||
@@ -228,7 +223,6 @@ func RefreshWeixin2Token() (err error) {
|
|||||||
func RefreshPushToken() (err error) {
|
func RefreshPushToken() (err error) {
|
||||||
if api.PushAPI != nil {
|
if api.PushAPI != nil {
|
||||||
err = RefreshConfig("push", pushTokenExpires, func() (token string, expireTimeStr string, invalidParameter string) {
|
err = RefreshConfig("push", pushTokenExpires, func() (token string, expireTimeStr string, invalidParameter string) {
|
||||||
globals.SugarLogger.Debugf("RefreshPushToken RunMode:%s", beego.BConfig.RunMode)
|
|
||||||
if globals.IsMainProductEnv() {
|
if globals.IsMainProductEnv() {
|
||||||
if tokenInfo, err := api.PushAPI.CBRetrieveToken(); err == nil {
|
if tokenInfo, err := api.PushAPI.CBRetrieveToken(); err == nil {
|
||||||
globals.SugarLogger.Debugf("RefreshPushToken tokenInfo:%s", utils.Format4Output(tokenInfo, true))
|
globals.SugarLogger.Debugf("RefreshPushToken tokenInfo:%s", utils.Format4Output(tokenInfo, true))
|
||||||
@@ -244,7 +238,6 @@ func RefreshPushToken() (err error) {
|
|||||||
}
|
}
|
||||||
return token, expireTimeStr, ""
|
return token, expireTimeStr, ""
|
||||||
}, func(value, v2 string) {
|
}, func(value, v2 string) {
|
||||||
globals.SugarLogger.Debugf("RefreshPushToken setter value:%s", value)
|
|
||||||
syseventhub.SysEventHub.OnNewPushToken(value)
|
syseventhub.SysEventHub.OnNewPushToken(value)
|
||||||
api.PushAPI.CBSetToken(value)
|
api.PushAPI.CBSetToken(value)
|
||||||
})
|
})
|
||||||
@@ -282,7 +275,6 @@ func RefreshWeixin3Token() (err error) {
|
|||||||
func RefreshWeimobToken() (err error) {
|
func RefreshWeimobToken() (err error) {
|
||||||
if api.WeimobAPI != nil {
|
if api.WeimobAPI != nil {
|
||||||
err = RefreshConfig("weimob", weimobTokenExpires, func() (token string, expireTimeStr string, invalidParameter string) {
|
err = RefreshConfig("weimob", weimobTokenExpires, func() (token string, expireTimeStr string, invalidParameter string) {
|
||||||
globals.SugarLogger.Debugf("RefreshWeimobToken RunMode:%s", beego.BConfig.RunMode)
|
|
||||||
if globals.IsMainProductEnv() {
|
if globals.IsMainProductEnv() {
|
||||||
if tokenInfo, err := api.WeimobAPI.RefreshTokenByRefreshToken(); err == nil {
|
if tokenInfo, err := api.WeimobAPI.RefreshTokenByRefreshToken(); err == nil {
|
||||||
return string(utils.MustMarshal(tokenInfo)), utils.Time2Str(time.Now().Add((time.Duration(tokenInfo.ExpiresIn) - weimobTokenExpires/time.Second) * time.Second)), ""
|
return string(utils.MustMarshal(tokenInfo)), utils.Time2Str(time.Now().Add((time.Duration(tokenInfo.ExpiresIn) - weimobTokenExpires/time.Second) * time.Second)), ""
|
||||||
@@ -315,7 +307,6 @@ func RefreshWeimobToken() (err error) {
|
|||||||
func RefreshDingDingToken() (err error) {
|
func RefreshDingDingToken() (err error) {
|
||||||
api.DingDingAPI.RetrieveToken()
|
api.DingDingAPI.RetrieveToken()
|
||||||
return RefreshConfig("dingding", dingdingTokenExpires, func() (string, string, string) {
|
return RefreshConfig("dingding", dingdingTokenExpires, func() (string, string, string) {
|
||||||
globals.SugarLogger.Debugf("RefreshDingDingToken RunMode:%s", beego.BConfig.RunMode)
|
|
||||||
if true { //globals.IsProductEnv() {
|
if true { //globals.IsProductEnv() {
|
||||||
if token, err := api.DingDingAPI.RetrieveToken(); err == nil {
|
if token, err := api.DingDingAPI.RetrieveToken(); err == nil {
|
||||||
globals.SugarLogger.Debugf("RefreshDingDingToken tokenInfo:%s", token)
|
globals.SugarLogger.Debugf("RefreshDingDingToken tokenInfo:%s", token)
|
||||||
@@ -343,7 +334,6 @@ func SaveWeimobToken(token *weimobapi.TokenInfo) (err error) {
|
|||||||
|
|
||||||
func RefreshYilianyunToken() (err error) {
|
func RefreshYilianyunToken() (err error) {
|
||||||
return RefreshConfig("yilianyun", yilianyunTokenExpires, func() (token string, expireTimeStr string, invalidParameter string) {
|
return RefreshConfig("yilianyun", yilianyunTokenExpires, func() (token string, expireTimeStr string, invalidParameter string) {
|
||||||
globals.SugarLogger.Debugf("RefreshYilianyunToken RunMode:%s", beego.BConfig.RunMode)
|
|
||||||
if globals.IsMainProductEnv() { // 只有京西菜市刷新易联云key
|
if globals.IsMainProductEnv() { // 只有京西菜市刷新易联云key
|
||||||
if tokenInfo, err := api.YilianyunAPI.RetrieveToken(); err == nil {
|
if tokenInfo, err := api.YilianyunAPI.RetrieveToken(); err == nil {
|
||||||
token = string(utils.MustMarshal(tokenInfo))
|
token = string(utils.MustMarshal(tokenInfo))
|
||||||
@@ -377,9 +367,7 @@ func PollingRemotEvent(remoteURL string, waitSecond int, params map[string]inter
|
|||||||
"waitSecond": waitSecond,
|
"waitSecond": waitSecond,
|
||||||
})
|
})
|
||||||
for {
|
for {
|
||||||
globals.SugarLogger.Debugf("PollingRemotEvent %s", remoteURL)
|
|
||||||
response, err := http.Get(utils.GenerateGetURL(remoteURL, "", params2))
|
response, err := http.Get(utils.GenerateGetURL(remoteURL, "", params2))
|
||||||
globals.SugarLogger.Debugf("PollingRemotEvent2 %s error:%v", remoteURL, err)
|
|
||||||
if err == nil {
|
if err == nil {
|
||||||
defer response.Body.Close()
|
defer response.Body.Close()
|
||||||
if response.StatusCode == http.StatusOK {
|
if response.StatusCode == http.StatusOK {
|
||||||
|
|||||||
@@ -1076,8 +1076,6 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
|
|||||||
sqlParams = append(sqlParams, pageSize, offset)
|
sqlParams = append(sqlParams, pageSize, offset)
|
||||||
txDB, _ := Begin(db)
|
txDB, _ := Begin(db)
|
||||||
defer Commit(db, txDB)
|
defer Commit(db, txDB)
|
||||||
globals.SugarLogger.Debugf("===orderEX==sql=%s", sql)
|
|
||||||
globals.SugarLogger.Debugf("===orderEX==param=%s", utils.Format4Output(sqlParams, false))
|
|
||||||
if err = GetRowsTx(txDB, &orders, sql, sqlParams...); err == nil {
|
if err = GetRowsTx(txDB, &orders, sql, sqlParams...); err == nil {
|
||||||
totalCount = GetLastTotalRowCount2(db, txDB)
|
totalCount = GetLastTotalRowCount2(db, txDB)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package dao
|
|||||||
import (
|
import (
|
||||||
"git.rosy.net.cn/baseapi/utils"
|
"git.rosy.net.cn/baseapi/utils"
|
||||||
"git.rosy.net.cn/jx-callback/business/model"
|
"git.rosy.net.cn/jx-callback/business/model"
|
||||||
"git.rosy.net.cn/jx-callback/globals"
|
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -57,7 +56,6 @@ func UpdateSensitiveWord(wordList *model.SensitiveWord, vendorID int, id int, us
|
|||||||
wordList.VendorID = vendorID
|
wordList.VendorID = vendorID
|
||||||
wordList.UpdatedAt = time.Now()
|
wordList.UpdatedAt = time.Now()
|
||||||
wordList.LastOperator = userName
|
wordList.LastOperator = userName
|
||||||
globals.SugarLogger.Debug("wordList:", wordList)
|
|
||||||
if id != 0 {
|
if id != 0 {
|
||||||
if _, err := UpdateEntity(nil, wordList, "id", "word", "vendor_id", "last_operator"); err != nil {
|
if _, err := UpdateEntity(nil, wordList, "id", "word", "vendor_id", "last_operator"); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|||||||
@@ -686,8 +686,6 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
|
|||||||
// }
|
// }
|
||||||
sql = fmt.Sprintf(sql, fmtParams...)
|
sql = fmt.Sprintf(sql, fmtParams...)
|
||||||
sql += " ORDER BY t1.price"
|
sql += " ORDER BY t1.price"
|
||||||
globals.SugarLogger.Debug("sql======", sql)
|
|
||||||
globals.SugarLogger.Debug("sqlparam======", sqlParams)
|
|
||||||
|
|
||||||
if err = GetRows(db, &skus, sql, sqlParams...); err != nil {
|
if err = GetRows(db, &skus, sql, sqlParams...); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -702,7 +700,6 @@ func GetStoreSkus(db *DaoDB, vendorID, storeID int, skuIDs []int) (skus []*Store
|
|||||||
// 以sku为基础来做全同步,
|
// 以sku为基础来做全同步,
|
||||||
// 多门店模式厂商适用
|
// 多门店模式厂商适用
|
||||||
func GetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInfo, err error) {
|
func GetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInfo, err error) {
|
||||||
globals.SugarLogger.Debugf("GetFullStoreSkus, storeID:%d, vendorID:%d", storeID, vendorID)
|
|
||||||
|
|
||||||
// 对于多门店平台,商品库删除后,不需要操作门店商品,所以sku_name用JOIN, sku与sku_name也可以直接排除下架的
|
// 对于多门店平台,商品库删除后,不需要操作门店商品,所以sku_name用JOIN, sku与sku_name也可以直接排除下架的
|
||||||
sql := `
|
sql := `
|
||||||
@@ -833,8 +830,6 @@ func SetStoreSkuSyncStatus(db *DaoDB, vendorID int, storeIDs []int, skuIDs []int
|
|||||||
}
|
}
|
||||||
|
|
||||||
func SetStoreCategorySyncStatus(db *DaoDB, vendorID int, storeIDs []int, catIDs []int, syncStatus int) (num int64, err error) {
|
func SetStoreCategorySyncStatus(db *DaoDB, vendorID int, storeIDs []int, catIDs []int, syncStatus int) (num int64, err error) {
|
||||||
globals.SugarLogger.Debugf("SetStoreCategorySyncStatus, storeIDs:%v, vendorID:%d", storeIDs, vendorID)
|
|
||||||
|
|
||||||
isSingleStorePF := model.MultiStoresVendorMap[vendorID] != 1
|
isSingleStorePF := model.MultiStoresVendorMap[vendorID] != 1
|
||||||
fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID])
|
fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID])
|
||||||
sql := `
|
sql := `
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package dao
|
|||||||
import (
|
import (
|
||||||
"git.rosy.net.cn/baseapi/utils"
|
"git.rosy.net.cn/baseapi/utils"
|
||||||
"git.rosy.net.cn/jx-callback/business/model"
|
"git.rosy.net.cn/jx-callback/business/model"
|
||||||
"git.rosy.net.cn/jx-callback/globals"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func GetThingMapList(db *DaoDB, thingType int, vendorIDs, thingIDs []int, vendorOrgCodes []string) (cats []*model.ThingMap, err error) {
|
func GetThingMapList(db *DaoDB, thingType int, vendorIDs, thingIDs []int, vendorOrgCodes []string) (cats []*model.ThingMap, err error) {
|
||||||
@@ -75,7 +74,6 @@ func SetSkuNameSyncStatus(db *DaoDB, vendorIDs []int, vendorOrgCodes []string, n
|
|||||||
}
|
}
|
||||||
|
|
||||||
func SetSkuSyncStatus(db *DaoDB, vendorID int, skuIDs []int, syncStatus int8) (num int64, err error) {
|
func SetSkuSyncStatus(db *DaoDB, vendorID int, skuIDs []int, syncStatus int8) (num int64, err error) {
|
||||||
globals.SugarLogger.Debugf("SetSkuSyncStatus, vendorID:%d", vendorID)
|
|
||||||
num, err = SetThingMapSyncStatus(db, []int{vendorID}, nil, model.ThingTypeSku, skuIDs, syncStatus)
|
num, err = SetThingMapSyncStatus(db, []int{vendorID}, nil, model.ThingTypeSku, skuIDs, syncStatus)
|
||||||
return num, err
|
return num, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,8 +32,6 @@ func TestCreateStore(t *testing.T) {
|
|||||||
StoreList: storeLists,
|
StoreList: storeLists,
|
||||||
}
|
}
|
||||||
resp, err := a.BatchCreateStore(param)
|
resp, err := a.BatchCreateStore(param)
|
||||||
t.Fatal("err===========", err)
|
|
||||||
t.Fatalf("resp===========:%v", resp)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -41,7 +41,6 @@ func (c *PurchaseHandler) isAfsMsg(msg string) bool {
|
|||||||
func (c *PurchaseHandler) OnAfsOrderMsg(msgId, orderId string, msg interface{}) (retVal *tiktokShop.CallbackResponse) {
|
func (c *PurchaseHandler) OnAfsOrderMsg(msgId, orderId string, msg interface{}) (retVal *tiktokShop.CallbackResponse) {
|
||||||
//jxutils.CallMsgHandlerAsync(func() {
|
//jxutils.CallMsgHandlerAsync(func() {
|
||||||
retVal = c.onAfsOrderMsg(msgId, msg)
|
retVal = c.onAfsOrderMsg(msgId, msg)
|
||||||
globals.SugarLogger.Debugf("============%s===", utils.Format4Output(retVal, false))
|
|
||||||
//}, jxutils.ComposeUniversalOrderID(orderId, model.VendorIDDD))
|
//}, jxutils.ComposeUniversalOrderID(orderId, model.VendorIDDD))
|
||||||
return retVal
|
return retVal
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -650,7 +650,6 @@ func (P *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("AddAuthBind user================:%s", utils.Format4Output(vendorStore, true))
|
|
||||||
retVal := &dao.StoreDetail{
|
retVal := &dao.StoreDetail{
|
||||||
Store: model.Store{
|
Store: model.Store{
|
||||||
Address: vendorStore.StoreDetail.Store.Address,
|
Address: vendorStore.StoreDetail.Store.Address,
|
||||||
|
|||||||
@@ -270,7 +270,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
|
|||||||
Supply7dayReturn: 0,
|
Supply7dayReturn: 0,
|
||||||
Mobile: storeDetail.Tel1,
|
Mobile: storeDetail.Tel1,
|
||||||
Commit: true,
|
Commit: true,
|
||||||
Specs: "净重|" + fmt.Sprintf("%f", storeSku.SpecQuality) + storeSku.SpecUnit,
|
Specs: "净重|" + utils.Float64ToStr(float64(storeSku.SpecQuality)) + storeSku.SpecUnit,
|
||||||
NeedRechargeMode: false,
|
NeedRechargeMode: false,
|
||||||
SellChannel: []int64{0},
|
SellChannel: []int64{0},
|
||||||
StartSaleType: 0,
|
StartSaleType: 0,
|
||||||
@@ -313,11 +313,9 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
globals.SugarLogger.Debugf("本地商品详情============%s,", utils.Format4Output(param, false))
|
|
||||||
// 根据本地商品id获取线上商品是否存在,存在则只创建子商品
|
// 根据本地商品id获取线上商品是否存在,存在则只创建子商品
|
||||||
var tiktokResultProductId int64 = 0
|
var tiktokResultProductId int64 = 0
|
||||||
skuMain, err := api.GetSkuDetailLocalID("", param.OuterProductId)
|
skuMain, err := api.GetSkuDetailLocalID("", param.OuterProductId)
|
||||||
globals.SugarLogger.Debugf("线上商品详情(主)============%s,", utils.Format4Output(skuMain, false))
|
|
||||||
if err != nil { // 线上不存在创建
|
if err != nil { // 线上不存在创建
|
||||||
tiktokResult, err := api.CreateStoreCommodity(param) // 创建主商品
|
tiktokResult, err := api.CreateStoreCommodity(param) // 创建主商品
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -462,7 +460,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
|
|||||||
//param.SaleLimitId = saleLimitId
|
//param.SaleLimitId = saleLimitId
|
||||||
//param.StoreId = utils.Str2Int64(vendorStoreID)
|
//param.StoreId = utils.Str2Int64(vendorStoreID)
|
||||||
// 抖店创建商品
|
// 抖店创建商品
|
||||||
globals.SugarLogger.Debugf("更新子商品=============%s", utils.Format4Output(param, false))
|
|
||||||
if err := api.EditStoreCommodity(param); err != nil {
|
if err := api.EditStoreCommodity(param); err != nil {
|
||||||
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType)
|
failedList = putils.GetErrMsg2FailedSingleList(storeSkuList, err, storeID, model.VendorChineseNames[model.VendorIDDD], syncType)
|
||||||
storeSku.VendorSkuID = utils.Int2Str(storeSku.SkuID)
|
storeSku.VendorSkuID = utils.Int2Str(storeSku.SkuID)
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ import (
|
|||||||
func GetComposedCode(c *web.Controller, code string) (composedCode string) {
|
func GetComposedCode(c *web.Controller, code string) (composedCode string) {
|
||||||
composedCode = code
|
composedCode = code
|
||||||
referer := c.Ctx.Request.Referer()
|
referer := c.Ctx.Request.Referer()
|
||||||
globals.SugarLogger.Debugf("GetComposedCode referer:%s", referer)
|
|
||||||
index := strings.Index(referer, "//")
|
index := strings.Index(referer, "//")
|
||||||
if index > 0 {
|
if index > 0 {
|
||||||
list := strings.Split(referer[index+2:], "/")
|
list := strings.Split(referer[index+2:], "/")
|
||||||
@@ -38,7 +37,6 @@ func GetComposedCode(c *web.Controller, code string) (composedCode string) {
|
|||||||
func GetComposedCode2(c *web.Controller, code string) (composedCode string) {
|
func GetComposedCode2(c *web.Controller, code string) (composedCode string) {
|
||||||
composedCode = code
|
composedCode = code
|
||||||
referer := c.Ctx.Request.UserAgent()
|
referer := c.Ctx.Request.UserAgent()
|
||||||
globals.SugarLogger.Debugf("GetComposedCode referer:%s", referer)
|
|
||||||
index := strings.Index(referer, "//")
|
index := strings.Index(referer, "//")
|
||||||
if index > 0 {
|
if index > 0 {
|
||||||
list := strings.Split(referer[index+2:], "/")
|
list := strings.Split(referer[index+2:], "/")
|
||||||
@@ -133,17 +131,14 @@ func (c *Auth2Controller) Login() {
|
|||||||
params.AuthSecret = GetComposedCode2(&c.Controller, params.AuthSecret)
|
params.AuthSecret = GetComposedCode2(&c.Controller, params.AuthSecret)
|
||||||
}
|
}
|
||||||
ctx := auth2.NewContext(c.Ctx.ResponseWriter, c.Ctx.Request)
|
ctx := auth2.NewContext(c.Ctx.ResponseWriter, c.Ctx.Request)
|
||||||
globals.SugarLogger.Debug("params.AuthType, params.AuthID, params.AuthIDType, params.AuthSecret==============", params.AuthType, params.AuthID, params.AuthIDType, params.AuthSecret)
|
|
||||||
authInfo, err := auth2.Login(ctx, params.AuthType, params.AuthID, params.AuthIDType, params.AuthSecret)
|
authInfo, err := auth2.Login(ctx, params.AuthType, params.AuthID, params.AuthIDType, params.AuthSecret)
|
||||||
// TODO 兼容没有取到authid2的错误
|
// TODO 兼容没有取到authid2的错误
|
||||||
if err == nil && authInfo.AuthBindInfo != nil {
|
if err == nil && authInfo.AuthBindInfo != nil {
|
||||||
if authInfo.AuthBindInfo.AuthID2 == "" {
|
if authInfo.AuthBindInfo.AuthID2 == "" {
|
||||||
globals.SugarLogger.Debug("fgfggggggg")
|
|
||||||
authInfo.AuthBindInfo.AuthID2 = authInfo.AuthBindInfo.AuthID
|
authInfo.AuthBindInfo.AuthID2 = authInfo.AuthBindInfo.AuthID
|
||||||
}
|
}
|
||||||
retVal = authInfo
|
retVal = authInfo
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debug("retVal==============", retVal)
|
|
||||||
return retVal, "", err
|
return retVal, "", err
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -248,7 +243,6 @@ func (c *Auth2Controller) WeixinMPOAuth2() {
|
|||||||
redirectURL = fmt.Sprintf("%s?info=%s", params.Block, base64.StdEncoding.EncodeToString(utils.MustMarshal(callResult)))
|
redirectURL = fmt.Sprintf("%s?info=%s", params.Block, base64.StdEncoding.EncodeToString(utils.MustMarshal(callResult)))
|
||||||
return retVal, model.ErrorCodeIgnore, err
|
return retVal, model.ErrorCodeIgnore, err
|
||||||
})
|
})
|
||||||
globals.SugarLogger.Debugf("WeixinMPOAuth2, callResult:%s, redirectURL:%s", utils.Format4Output(callResult, true), redirectURL)
|
|
||||||
c.Redirect(redirectURL, http.StatusTemporaryRedirect)
|
c.Redirect(redirectURL, http.StatusTemporaryRedirect)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -289,7 +283,6 @@ func (c *Auth2Controller) DingDingOAuth2() {
|
|||||||
}
|
}
|
||||||
return retVal, model.ErrorCodeIgnore, err
|
return retVal, model.ErrorCodeIgnore, err
|
||||||
})
|
})
|
||||||
globals.SugarLogger.Debugf("DingDingOAuth2, callResult:%s, redirectURL:%s", utils.Format4Output(callResult, true), redirectURL)
|
|
||||||
if redirectURL != "" {
|
if redirectURL != "" {
|
||||||
c.Redirect(redirectURL, http.StatusTemporaryRedirect)
|
c.Redirect(redirectURL, http.StatusTemporaryRedirect)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import (
|
|||||||
"git.rosy.net.cn/jx-callback/business/model"
|
"git.rosy.net.cn/jx-callback/business/model"
|
||||||
"git.rosy.net.cn/jx-callback/business/model/dao"
|
"git.rosy.net.cn/jx-callback/business/model/dao"
|
||||||
"git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store"
|
"git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store"
|
||||||
"git.rosy.net.cn/jx-callback/globals"
|
|
||||||
"github.com/astaxie/beego/server/web"
|
"github.com/astaxie/beego/server/web"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -401,7 +400,6 @@ func (c *SkuController) UpdateSensitiveWord() {
|
|||||||
// VendorID: params.VendorID,
|
// VendorID: params.VendorID,
|
||||||
// Word: params.Word,
|
// Word: params.Word,
|
||||||
//}
|
//}
|
||||||
globals.SugarLogger.Debug("UpdateSensitiveWord入参params:", params)
|
|
||||||
words, err := dao.GetSensitiveWordList(params.VendorID)
|
words, err := dao.GetSensitiveWordList(params.VendorID)
|
||||||
word := words[0]
|
word := words[0]
|
||||||
word.Word = params.Word
|
word.Word = params.Word
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package controllers
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
|
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
|
||||||
"git.rosy.net.cn/jx-callback/globals"
|
|
||||||
"github.com/panjf2000/ants"
|
"github.com/panjf2000/ants"
|
||||||
"io"
|
"io"
|
||||||
"sync"
|
"sync"
|
||||||
@@ -144,7 +143,6 @@ func (c *SyncController) CompareStoreWithOperator() {
|
|||||||
if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.VendorIDs, &vendorIDs); err != nil {
|
if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.VendorIDs, &vendorIDs); err != nil {
|
||||||
return retVal, "", err
|
return retVal, "", err
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debug(params.StoreIDs, params.VendorIDs)
|
|
||||||
p, _ := ants.NewPoolWithFunc(10, func(data interface{}) {
|
p, _ := ants.NewPoolWithFunc(10, func(data interface{}) {
|
||||||
task := data.(*CompareTask)
|
task := data.(*CompareTask)
|
||||||
task.Do()
|
task.Do()
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import (
|
|||||||
"git.rosy.net.cn/baseapi/platformapi/dadaapi"
|
"git.rosy.net.cn/baseapi/platformapi/dadaapi"
|
||||||
"git.rosy.net.cn/baseapi/utils"
|
"git.rosy.net.cn/baseapi/utils"
|
||||||
"git.rosy.net.cn/jx-callback/business/partner/delivery/dada"
|
"git.rosy.net.cn/jx-callback/business/partner/delivery/dada"
|
||||||
"git.rosy.net.cn/jx-callback/globals"
|
|
||||||
"git.rosy.net.cn/jx-callback/globals/api"
|
"git.rosy.net.cn/jx-callback/globals/api"
|
||||||
"github.com/astaxie/beego/server/web"
|
"github.com/astaxie/beego/server/web"
|
||||||
)
|
)
|
||||||
@@ -41,7 +40,6 @@ func (c *DadaDeliveryController) Notify() {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
notifyResponse = dadaapi.FailedNotifyResponse
|
notifyResponse = dadaapi.FailedNotifyResponse
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("dada notify, obj:%s, err:%v", utils.Format4Output(obj, false), err)
|
|
||||||
}
|
}
|
||||||
if notifyResponse == nil {
|
if notifyResponse == nil {
|
||||||
notifyResponse = dadaapi.SuccessNotifyResponse
|
notifyResponse = dadaapi.SuccessNotifyResponse
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import (
|
|||||||
|
|
||||||
"git.rosy.net.cn/baseapi/utils"
|
"git.rosy.net.cn/baseapi/utils"
|
||||||
"git.rosy.net.cn/jx-callback/business/jxstore/cms"
|
"git.rosy.net.cn/jx-callback/business/jxstore/cms"
|
||||||
"git.rosy.net.cn/jx-callback/globals"
|
|
||||||
"git.rosy.net.cn/jx-callback/globals/api"
|
"git.rosy.net.cn/jx-callback/globals/api"
|
||||||
"github.com/astaxie/beego/server/web"
|
"github.com/astaxie/beego/server/web"
|
||||||
)
|
)
|
||||||
@@ -19,12 +18,10 @@ func init() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c *DingDingController) Msg() {
|
func (c *DingDingController) Msg() {
|
||||||
globals.SugarLogger.Debugf("dingding msg:%s", string(c.Ctx.Input.RequestBody))
|
|
||||||
if c.Ctx.Input.Method() == http.MethodPost {
|
if c.Ctx.Input.Method() == http.MethodPost {
|
||||||
dataMap := utils.URLValues2Map(c.Ctx.Request.Form)
|
dataMap := utils.URLValues2Map(c.Ctx.Request.Form)
|
||||||
obj, callbackResponse := api.DingDingAPI.GetCallbackMsg(dataMap, c.Ctx.Input.RequestBody)
|
obj, callbackResponse := api.DingDingAPI.GetCallbackMsg(dataMap, c.Ctx.Input.RequestBody)
|
||||||
if callbackResponse == nil {
|
if callbackResponse == nil {
|
||||||
globals.SugarLogger.Debugf("dingding msg, obj:%s", utils.Format4Output(obj, false))
|
|
||||||
callbackResponse = cms.OnDingDingMsg(obj)
|
callbackResponse = cms.OnDingDingMsg(obj)
|
||||||
if callbackResponse == nil {
|
if callbackResponse == nil {
|
||||||
callbackResponse = api.DingDingAPI.Err2CallbackResponse(nil)
|
callbackResponse = api.DingDingAPI.Err2CallbackResponse(nil)
|
||||||
|
|||||||
@@ -35,7 +35,6 @@ func (e *EnterpriseController) EnterpriseCallback() {
|
|||||||
|
|
||||||
wxcpt := call.NewWXBizMsgCrypt(call.Token, call.EncodingAeskey, call.ReceiverId, call.JsonType)
|
wxcpt := call.NewWXBizMsgCrypt(call.Token, call.EncodingAeskey, call.ReceiverId, call.JsonType)
|
||||||
msg, err_ := wxcpt.DecryptMsg(msg_signature, timestamp, nonce, body)
|
msg, err_ := wxcpt.DecryptMsg(msg_signature, timestamp, nonce, body)
|
||||||
globals.SugarLogger.Debug("==============企业微信通知回调String", string(msg))
|
|
||||||
if err_ != nil {
|
if err_ != nil {
|
||||||
e.Abort("404")
|
e.Abort("404")
|
||||||
return
|
return
|
||||||
@@ -62,9 +61,7 @@ func (e *EnterpriseController) EnterpriseCallback() {
|
|||||||
//}
|
//}
|
||||||
//
|
//
|
||||||
if strings.Contains(string(msg), "SuiteTicket") {
|
if strings.Contains(string(msg), "SuiteTicket") {
|
||||||
globals.SugarLogger.Debug("==============企业微信通知回调SuiteTicket")
|
|
||||||
data, err := api.EnterpriseChatHeadApi.GetEnterpriseMsg(msg)
|
data, err := api.EnterpriseChatHeadApi.GetEnterpriseMsg(msg)
|
||||||
globals.SugarLogger.Debug("==============企业微信通知回调SuiteTicket->data", data.SuiteTicket)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
globals.SugarLogger.Debug("Unmarshal SuiteTicket err : ", err)
|
globals.SugarLogger.Debug("Unmarshal SuiteTicket err : ", err)
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -172,7 +172,6 @@ func (c *EventController) TestWebsocket() {
|
|||||||
//接收客户端的消息
|
//接收客户端的消息
|
||||||
err := ws.ReadJSON(&s)
|
err := ws.ReadJSON(&s)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
globals.SugarLogger.Debugf("页面可能断开啦 ws.ReadJSON error: %v", err.Error())
|
|
||||||
index := 0
|
index := 0
|
||||||
for k, v := range clients[vendorOrderID] {
|
for k, v := range clients[vendorOrderID] {
|
||||||
if v == ws {
|
if v == ws {
|
||||||
@@ -205,15 +204,12 @@ func handleMessages() {
|
|||||||
for {
|
for {
|
||||||
//读取通道中的消息
|
//读取通道中的消息
|
||||||
msg := <-broadcast
|
msg := <-broadcast
|
||||||
globals.SugarLogger.Debugf("clients len %v", len(clients))
|
|
||||||
//循环map客户端
|
//循环map客户端
|
||||||
for vendorOrderID, mmsg := range msg {
|
for vendorOrderID, mmsg := range msg {
|
||||||
for _, client := range clients[vendorOrderID] {
|
for _, client := range clients[vendorOrderID] {
|
||||||
//把通道中的消息发送给客户端
|
//把通道中的消息发送给客户端
|
||||||
globals.SugarLogger.Debugf("msg %v", utils.Format4Output(mmsg, false))
|
|
||||||
err := client.WriteJSON(mmsg)
|
err := client.WriteJSON(mmsg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
globals.SugarLogger.Debugf("client.WriteJSON error: %v", err)
|
|
||||||
client.Close() //关闭
|
client.Close() //关闭
|
||||||
index := 0
|
index := 0
|
||||||
for k, v := range clients[vendorOrderID] {
|
for k, v := range clients[vendorOrderID] {
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ type Djsw2Controller struct {
|
|||||||
|
|
||||||
func (c *Djsw2Controller) handleMsg(handler func(*jdapi.API, interface{}) *jdapi.CallbackResponse) (callbackResponse *jdapi.CallbackResponse) {
|
func (c *Djsw2Controller) handleMsg(handler func(*jdapi.API, interface{}) *jdapi.CallbackResponse) (callbackResponse *jdapi.CallbackResponse) {
|
||||||
callbackMsg, _, callbackResponse := jdapi.GetCallbackMsg(getUsefulRequest(c.Ctx))
|
callbackMsg, _, callbackResponse := jdapi.GetCallbackMsg(getUsefulRequest(c.Ctx))
|
||||||
globals.SugarLogger.Debug(utils.Format4Output(callbackMsg, true))
|
|
||||||
if callbackResponse == nil {
|
if callbackResponse == nil {
|
||||||
callbackResponse = handler(api.FakeJdAPI, callbackMsg.Param)
|
callbackResponse = handler(api.FakeJdAPI, callbackMsg.Param)
|
||||||
}
|
}
|
||||||
@@ -130,7 +129,6 @@ func (c *Djsw2Controller) transferResponse(funcName string, inCallbackResponse *
|
|||||||
if inCallbackResponse == nil {
|
if inCallbackResponse == nil {
|
||||||
return jdapi.SuccessResponse
|
return jdapi.SuccessResponse
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("%s callbackResponse:%s", funcName, utils.Format4Output(inCallbackResponse, true))
|
|
||||||
return inCallbackResponse
|
return inCallbackResponse
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ type DjswController struct {
|
|||||||
|
|
||||||
func (c *DjswController) handleMsg(handler func(*jdapi.API, interface{}) *jdapi.CallbackResponse) (callbackResponse *jdapi.CallbackResponse) {
|
func (c *DjswController) handleMsg(handler func(*jdapi.API, interface{}) *jdapi.CallbackResponse) (callbackResponse *jdapi.CallbackResponse) {
|
||||||
callbackMsg, mapData, callbackResponse := jdapi.GetCallbackMsg(getUsefulRequest(c.Ctx))
|
callbackMsg, mapData, callbackResponse := jdapi.GetCallbackMsg(getUsefulRequest(c.Ctx))
|
||||||
globals.SugarLogger.Debug(utils.Format4Output(callbackMsg, true))
|
|
||||||
if callbackResponse == nil {
|
if callbackResponse == nil {
|
||||||
if jdAPI := jd.GetAPIbyKey(callbackMsg.AppKey); jdAPI != nil {
|
if jdAPI := jd.GetAPIbyKey(callbackMsg.AppKey); jdAPI != nil {
|
||||||
if callbackResponse = jdAPI.CheckCallbackValidation(mapData, callbackMsg.Sign); callbackResponse == nil {
|
if callbackResponse = jdAPI.CheckCallbackValidation(mapData, callbackMsg.Sign); callbackResponse == nil {
|
||||||
@@ -166,7 +165,6 @@ func (c *DjswController) transferResponse(funcName string, inCallbackResponse *j
|
|||||||
if inCallbackResponse == nil {
|
if inCallbackResponse == nil {
|
||||||
return jdapi.SuccessResponse
|
return jdapi.SuccessResponse
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("%s callbackResponse:%s", funcName, utils.Format4Output(inCallbackResponse, true))
|
|
||||||
return inCallbackResponse
|
return inCallbackResponse
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ import (
|
|||||||
"git.rosy.net.cn/jx-callback/business/jxutils/netprinter"
|
"git.rosy.net.cn/jx-callback/business/jxutils/netprinter"
|
||||||
"git.rosy.net.cn/jx-callback/business/model"
|
"git.rosy.net.cn/jx-callback/business/model"
|
||||||
"git.rosy.net.cn/jx-callback/business/model/dao"
|
"git.rosy.net.cn/jx-callback/business/model/dao"
|
||||||
"git.rosy.net.cn/jx-callback/globals"
|
|
||||||
"github.com/astaxie/beego/server/web"
|
"github.com/astaxie/beego/server/web"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -266,7 +265,6 @@ func (c *OrderController) ExportMTWaybills() {
|
|||||||
toDate = fromDate
|
toDate = fromDate
|
||||||
}
|
}
|
||||||
content, err = orderman.FixedOrderManager.ExportMTWaybills(params.Ctx, params.FromDate, params.ToDate)
|
content, err = orderman.FixedOrderManager.ExportMTWaybills(params.Ctx, params.FromDate, params.ToDate)
|
||||||
globals.SugarLogger.Debug(err)
|
|
||||||
return retVal, model.ErrorCodeIgnore, err
|
return retVal, model.ErrorCodeIgnore, err
|
||||||
})
|
})
|
||||||
if content != nil {
|
if content != nil {
|
||||||
|
|||||||
@@ -8,9 +8,6 @@ import (
|
|||||||
|
|
||||||
"git.rosy.net.cn/jx-callback/globals/api"
|
"git.rosy.net.cn/jx-callback/globals/api"
|
||||||
|
|
||||||
"git.rosy.net.cn/baseapi/utils"
|
|
||||||
"git.rosy.net.cn/jx-callback/globals"
|
|
||||||
|
|
||||||
"github.com/astaxie/beego/server/web"
|
"github.com/astaxie/beego/server/web"
|
||||||
"github.com/astaxie/beego/server/web/context"
|
"github.com/astaxie/beego/server/web/context"
|
||||||
)
|
)
|
||||||
@@ -40,7 +37,6 @@ func MsgFail() *TicktockRes {
|
|||||||
|
|
||||||
func (c *TicTocController) TiktokMsg() {
|
func (c *TicTocController) TiktokMsg() {
|
||||||
call, refund, payType, err := api.TiktokApi.GetCallbackMsg(getPayInfo(c.Ctx))
|
call, refund, payType, err := api.TiktokApi.GetCallbackMsg(getPayInfo(c.Ctx))
|
||||||
globals.SugarLogger.Debugf("tictok callback callbackResponse:%s", utils.Format4Output(call, true))
|
|
||||||
if err != nil || call == nil {
|
if err != nil || call == nil {
|
||||||
c.Data["json"] = MsgFail()
|
c.Data["json"] = MsgFail()
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ func (c *LogisticsController) LogisticsRegister() {
|
|||||||
|
|
||||||
register := &LogisticsRegisterReq{}
|
register := &LogisticsRegisterReq{}
|
||||||
if err := json.Unmarshal(body, register); err != nil {
|
if err := json.Unmarshal(body, register); err != nil {
|
||||||
globals.SugarLogger.Debugf("小时达订阅接口类型转换异常:%s", err)
|
|
||||||
c.Data["json"] = LogisticsRegisterResp{
|
c.Data["json"] = LogisticsRegisterResp{
|
||||||
Result: false,
|
Result: false,
|
||||||
ReturnCode: "1007",
|
ReturnCode: "1007",
|
||||||
@@ -61,7 +60,6 @@ func (c *LogisticsController) LogisticsRegister() {
|
|||||||
globals.SugarLogger.Debugf("根据单号查询运单数据错误:%s", err)
|
globals.SugarLogger.Debugf("根据单号查询运单数据错误:%s", err)
|
||||||
}
|
}
|
||||||
if len(data) <= 0 {
|
if len(data) <= 0 {
|
||||||
globals.SugarLogger.Debugf("单号存在但是本地数据不存,推送平台运单号错误,或者运单错误:%s", err)
|
|
||||||
c.Data["json"] = LogisticsRegisterResp{
|
c.Data["json"] = LogisticsRegisterResp{
|
||||||
Result: false,
|
Result: false,
|
||||||
ReturnCode: "1002",
|
ReturnCode: "1002",
|
||||||
@@ -158,7 +156,6 @@ func (c *LogisticsController) LogisticsQuery() {
|
|||||||
globals.SugarLogger.Debugf("根据单号查询运单数据错误:%s", err)
|
globals.SugarLogger.Debugf("根据单号查询运单数据错误:%s", err)
|
||||||
}
|
}
|
||||||
if len(data) <= 0 {
|
if len(data) <= 0 {
|
||||||
globals.SugarLogger.Debugf("单号存在但是本地数据不存,推送平台运单号错误,或者运单错误:%s", err)
|
|
||||||
c.Data["json"] = LogisticsRegisterResp{
|
c.Data["json"] = LogisticsRegisterResp{
|
||||||
Result: false,
|
Result: false,
|
||||||
ReturnCode: "1002",
|
ReturnCode: "1002",
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package controllers
|
|||||||
import (
|
import (
|
||||||
"git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api"
|
"git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api"
|
||||||
"git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store"
|
"git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store"
|
||||||
"git.rosy.net.cn/jx-callback/globals"
|
|
||||||
"git.rosy.net.cn/jx-callback/globals/api"
|
"git.rosy.net.cn/jx-callback/globals/api"
|
||||||
"github.com/astaxie/beego/server/web"
|
"github.com/astaxie/beego/server/web"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -29,9 +28,7 @@ func (t *TiktokController) CallbackTiktokOrderMsg() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 2.参数解析
|
// 2.参数解析
|
||||||
globals.SugarLogger.Debug("抖音订单回调数据参数打印===========", string(byteList))
|
|
||||||
orderStatus, resp := api.TiktokStore.CreateOrderCallback(byteList)
|
orderStatus, resp := api.TiktokStore.CreateOrderCallback(byteList)
|
||||||
globals.SugarLogger.Debug("抖音订单回调数据打印测试===========", orderStatus)
|
|
||||||
if resp.Code != 0 {
|
if resp.Code != 0 {
|
||||||
t.Data["json"] = resp
|
t.Data["json"] = resp
|
||||||
t.ServeJSON()
|
t.ServeJSON()
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ type TiktokShopController struct {
|
|||||||
// TokenMsg 抖音用户授权
|
// TokenMsg 抖音用户授权
|
||||||
func (c *TiktokShopController) TokenMsg() {
|
func (c *TiktokShopController) TokenMsg() {
|
||||||
code := c.Ctx.Request.URL.Query().Get("code")
|
code := c.Ctx.Request.URL.Query().Get("code")
|
||||||
globals.SugarLogger.Debugf("tictok callback callbackResponse:%s", code)
|
|
||||||
result, err := api.TiktokStore.CreateToken(code)
|
result, err := api.TiktokStore.CreateToken(code)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
globals.SugarLogger.Debugf("tictok callback create token:%s", err)
|
globals.SugarLogger.Debugf("tictok callback create token:%s", err)
|
||||||
@@ -30,7 +29,6 @@ func (c *TiktokShopController) TokenMsg() {
|
|||||||
result.ExpiresIn += time.Now().Unix()
|
result.ExpiresIn += time.Now().Unix()
|
||||||
data, err := json.Marshal(result)
|
data, err := json.Marshal(result)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
globals.SugarLogger.Debugf("tictok callback Marshal token:%s", err)
|
|
||||||
c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail}
|
c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail}
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
return
|
return
|
||||||
@@ -50,7 +48,6 @@ func (c *TiktokShopController) TokenMsg() {
|
|||||||
AppSecret: "", // web.AppConfig.DefaultString("tiktokShopAppSecret", "c397aa9f-3927-47c4-8cfe-4d84e02602e0")
|
AppSecret: "", // web.AppConfig.DefaultString("tiktokShopAppSecret", "c397aa9f-3927-47c4-8cfe-4d84e02602e0")
|
||||||
}
|
}
|
||||||
if err := common.AddVendorOrgCode(nil, param); err != nil {
|
if err := common.AddVendorOrgCode(nil, param); err != nil {
|
||||||
globals.SugarLogger.Debugf("tictok callback insert token:%s", err)
|
|
||||||
c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail}
|
c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail}
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -2,10 +2,10 @@ package controllers
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"git.rosy.net.cn/baseapi/utils"
|
"git.rosy.net.cn/baseapi/utils"
|
||||||
|
"git.rosy.net.cn/jx-callback/globals"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"git.rosy.net.cn/jx-callback/globals"
|
|
||||||
"git.rosy.net.cn/jx-callback/globals/api"
|
"git.rosy.net.cn/jx-callback/globals/api"
|
||||||
"github.com/astaxie/beego/server/web"
|
"github.com/astaxie/beego/server/web"
|
||||||
)
|
)
|
||||||
@@ -21,7 +21,7 @@ func (c *WeixinController) Msg() {
|
|||||||
nonce := c.GetString("nonce")
|
nonce := c.GetString("nonce")
|
||||||
echostr := c.GetString("echostr")
|
echostr := c.GetString("echostr")
|
||||||
isValid := api.WeixinAPI.ValidateWXCallbackURL(signature, timestamp, nonce)
|
isValid := api.WeixinAPI.ValidateWXCallbackURL(signature, timestamp, nonce)
|
||||||
globals.SugarLogger.Debugf("weixin URL check is:%t", isValid)
|
globals.SugarLogger.Debugf("isvaild %s", utils.Format4Output(isValid, false))
|
||||||
c.Ctx.WriteString(echostr)
|
c.Ctx.WriteString(echostr)
|
||||||
} else {
|
} else {
|
||||||
c.Data["json"] = "ok"
|
c.Data["json"] = "ok"
|
||||||
@@ -33,7 +33,7 @@ func (c *WeixinController) WifiMsg() {
|
|||||||
data, _ := ioutil.ReadAll(c.Ctx.Request.Body)
|
data, _ := ioutil.ReadAll(c.Ctx.Request.Body)
|
||||||
values, _ := utils.HTTPBody2Values(data, false)
|
values, _ := utils.HTTPBody2Values(data, false)
|
||||||
mapData := utils.URLValues2Map(values)
|
mapData := utils.URLValues2Map(values)
|
||||||
globals.SugarLogger.Debugf("weixin URL check is:%v", mapData)
|
globals.SugarLogger.Debugf("mapData %s", utils.Format4Output(mapData, false))
|
||||||
c.Data["json"] = "ok"
|
c.Data["json"] = "ok"
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -76,8 +76,6 @@ func FilterMapByStructObject(mapData map[string]interface{}, obj interface{}, ob
|
|||||||
globals.SugarLogger.Warnf("FilterMapByStructObject failed with err:%v, mapData:%s", err, utils.Format4Output(mapData, true))
|
globals.SugarLogger.Warnf("FilterMapByStructObject failed with err:%v, mapData:%s", err, utils.Format4Output(mapData, true))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("m[valid]====%s", utils.Format4Output(valid, false))
|
|
||||||
globals.SugarLogger.Debugf("m[invalid]====%s", utils.Format4Output(invalid, false))
|
|
||||||
|
|
||||||
return valid, invalid
|
return valid, invalid
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user