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

修改休息

Browse Source
This commit is contained in:
邹宗楠
2024-02-18 15:53:34 +08:00
parent 8bb479c889
commit 556aff0d13
6 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/jxcallback/auto_delivery/auto_delivery.go
View File

@@ -126,7 +126,6 @@ func AutoSettingFakeDelivery() {
} else {
place, err := dao.GetParentCodeByCode(db, storeDetail.CityCode)
if err != nil {
globals.SugarLogger.Debugf("根据门店的城市code获取省份code错误: %s", err)
return
}
if strings.Contains(place.Name, "省") {

1
business/jxcallback/orderman/order.go
View File

@@ -2687,7 +2687,6 @@ func UpdateTiktokShopTotalMoney(storeId int64, startTime, endTime time.Time) err
}
for _, v := range goodsOrders {
globals.SugarLogger.Debugf("=============测试打印: %s", v.VendorOrderID)
orderDetail, err := tiktok_store.GetOrderDetail(v.VendorOrgCode, v.VendorOrderID)
if err != nil {
errList = append(errList, fmt.Sprintf("详情错误orderID[%s],%v", v.VendorOrderID, err))

13
business/jxstore/cms/storeman.go
View File

@@ -7,7 +7,6 @@ import (
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals"
)
type StoreManager struct {
@@ -25,8 +24,6 @@ func init() {
func (s *StoreManager) OnStoreStatusChanged(vendorStoreID string, vendorID int, storeStatus int) (err error) {
db := dao.GetDB()
storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, vendorStoreID, vendorID, "")
globals.SugarLogger.Debugf("==========storeDetail := %s", utils.Format4Output(storeDetail, false))
globals.SugarLogger.Debugf("==========storeStatus := %s", utils.Format4Output(storeStatus, false))
if err == nil {
if storeDetail.IsSync == model.NO || storeDetail.Status == model.StoreStatusDisabled || storeDetail.Status == model.StoreStatusHaveRest {
return err
@@ -37,10 +34,6 @@ func (s *StoreManager) OnStoreStatusChanged(vendorStoreID string, vendorID int,
storeKV = map[string]interface{}{
"Status": model.StoreStatusOpened,
}
//content := "您的门店 [" + storeDetail.Name + "]，ID:[" + utils.Int2Str(storeDetail.ID) + "]，在[" + model.VendorChineseNames[vendorID] + "] 平台上营业状态和京西不一致！平台状态：【营业】，京西状态：【非营业】"
//if user, err := dao.GetUserByID(db, "mobile", storeDetail.MarketManPhone); err == nil {
// ddmsg.SendUserMessage(dingdingapi.MsgTyeText, user.UserID, "平台门店状态变化", content)
//}
}
if storeDetail.VendorStatus != model.StoreStatusOpened {
storeMapKV = map[string]interface{}{
@@ -54,14 +47,10 @@ func (s *StoreManager) OnStoreStatusChanged(vendorStoreID string, vendorID int,
"Status": storeStatus,
}
}
//content := "您的门店 [" + storeDetail.Name + "]，ID:[" + utils.Int2Str(storeDetail.ID) + "]，在[" + model.VendorChineseNames[vendorID] + "] 平台上营业状态和京西不一致！平台状态：【非营业】，京西状态：【营业】"
//if user, err := dao.GetUserByID(db, "mobile", storeDetail.MarketManPhone); err == nil {
// ddmsg.SendUserMessage(dingdingapi.MsgTyeText, user.UserID, "平台门店状态变化", content)
//}
} else if storeDetail.Status <= storeStatus {
if storeDetail.VendorStatus != model.StoreStatusOpened {
storeMapKV = map[string]interface{}{
"Status": model.StoreStatusOpened,
"Status": storeStatus,
}
}
}

1
business/partner/delivery/mtps/waybill.go
View File

@@ -331,7 +331,6 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
return nil, fmt.Errorf("此平台配送已被系统关闭，暂不发配送 [%v]", vendorOrgCode[0].Comment)
}
globals.SugarLogger.Debugf("===================maxDeliveryFee := %d", maxDeliveryFee)
if maxDeliveryFee == model.NO {
fee, err := c.GetWaybillFee(order)
if err != nil {

2
business/partner/purchase/ebai/callback.go
View File

@@ -8,7 +8,6 @@ import (
"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/dao"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
)
@@ -27,7 +26,6 @@ func OnCallbackMsg(msg *ebaiapi.CallbackMsg) (response *ebaiapi.CallbackResponse
if /*msg.Cmd == ebaiapi.CmdOrderPartRefund || msg.Cmd == ebaiapi.CmdOrderUserCancel || */ msg.Cmd == ebaiapi.CmdOrderDeliveryStatus {
response = CurPurchaseHandler.OnFinancialMsg(msg)
} else if msg.Cmd == ebaiapi.CmdShopMsgPush {
globals.SugarLogger.Debugf("=============baidushopmsg := %s", utils.Format4Output(msg, false))
response = CurPurchaseHandler.onShopMsgPush(msg)
} else if msg.Cmd == ebaiapi.CmdShopUnbindMsg {
// 门店授权发生变化 17,失去授权

2
business/partner/purchase/mtwm/store.go
View File

@@ -230,7 +230,6 @@ func (p *PurchaseHandler) DeleteStore(db *dao.DaoDB, storeID int, userName strin
}
func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName string) (err error) {
globals.SugarLogger.Debugf("===========data : %s",utils.Format4Output(storeID,false))
if db == nil {
db = dao.GetDB()
}
@@ -281,7 +280,6 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
}
if globals.EnableMtwmStoreWrite {
globals.SugarLogger.Debugf("===========data : %s",utils.Format4Output(params,false))
errList.AddErr(mtapi.PoiSave(storeDetail.VendorStoreID, params))
}
if storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 {