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

business/jxcallback/orderman/order_comment.go

@@ -80,7 +80,6 @@ func (c *OrderManager) OnOrderComments(orderCommentList []*model.OrderComment) (
 		if err == nil || dao.IsNoRowsError(err) {
 			isNewComment := false
 			if dao.IsNoRowsError(err) {
-				globals.SugarLogger.Debugf("========dao.IsNoRowsError= :%s", utils.Format4Output(orderComment, false))
 				err = nil
 				isNewComment = true
 				if orderComment.IsReplied == 0 && time.Now().Sub(orderComment.CommentCreatedAt) < time.Duration(orderComment.ModifyDuration)*time.Hour {
@@ -158,8 +157,6 @@ func (c *OrderManager) OnOrderComments(orderCommentList []*model.OrderComment) (
 						}
 					}
 				}
-				globals.SugarLogger.Debugf("========comment2= :%s", utils.Format4Output(comment2, false))
-				globals.SugarLogger.Debugf("========isNewComment= :%s", utils.Format4Output(isNewComment, false))
 
 				if err == nil {
 					if isNewComment {

business/jxstore/act/act.go

@@ -2171,11 +2171,15 @@ func GetStoreNotHaveSku(skuId int, offSet, pageSize int) (interface{}, error) {
 	var (
 		db = dao.GetDB()
 	)
-	haveActSku, err := dao.GetActMtwmVendorPage(db, nil, []int{skuId}, "", time.Time{}, time.Time{}, 0, 0, 2000)
+	haveActSku, err := dao.GetActMtwmVendorPage(db, nil, []int{skuId}, "", time.Time{}, time.Time{}, 0, 1, 20000)
 	if err != nil {
 		return nil, err
 	}
 
+	if haveActSku == nil || haveActSku.TotalCount == 0 {
+		return nil, fmt.Errorf("未查询到活动商品")
+	}
+
 	// 拥有此商品的门店
 	storeIds := make([]int, 0, 0)
 	for _, v := range haveActSku.Data.([]*model.ActMtwmVendor) {

business/jxstore/cms/store.go

@@ -1688,7 +1688,6 @@ func DeleteStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
 	if err = dao.GetEntity(db, storeMap, model.FieldStoreID, model.FieldVendorID, model.FieldDeletedAt); err == nil {
 		if handler := partner.GetPurchasePlatformFromVendorID(vendorID); handler != nil {
 			handler.UpdateStoreCustomID(ctx, storeMap.VendorOrgCode, storeMap.VendorStoreID, utils.Str2Int64WithDefault(storeMap.VendorStoreID, 0))
-			globals.SugarLogger.Debugf("DeleteStoreVendorMap storeMap.VendorStoreID ====%d", storeMap.VendorStoreID)
 		}
 		storeMap.FakeOpenStart = 0
 		storeMap.FakeOpenStop = 0

business/partner/printer/xpyun/xpyun.go

@@ -143,7 +143,6 @@ func (c *PrinterHandler) PrintCancelOrRefundOrder(ctx *jxcontext.Context, printT
 	} else {
 		content = c.getCancelOrRefundOrderContentBig(order, printType, storeDetail)
 	}
-	globals.SugarLogger.Debugf("PrintCancelOrRefundOrder content=====%s", content)
 	if content == "" {
 		return nil, nil
 	}

business/partner/purchase/mtwm/order_comment.go

@@ -29,7 +29,6 @@ func (c *PurchaseHandler) StartRefreshComment() {
 }
 
 func (c *PurchaseHandler) refreshCommentOnce() {
-	globals.SugarLogger.Debugf("refreshCommentOnce = %s", utils.Format4Output(time.Now(), false))
 	c.RefreshComment(time.Now().Add(-RefreshCommentTime), time.Now())
 	utils.AfterFuncWithRecover(RefreshCommentTimeInterval, func() {
 		c.refreshCommentOnce()
@@ -91,8 +90,6 @@ func (c *PurchaseHandler) RefreshComment(fromTime, toTime time.Time) (err error)
 		}, storeIDs)
 	task.Run()
 	resultList, err2 := task.GetResult(0)
-	globals.SugarLogger.Debugf("resultList := %s", utils.Format4Output(resultList, false))
-	globals.SugarLogger.Debugf("err2 := %s", utils.Format4Output(err2, false))
 	if err = err2; err != nil {
 		return err
 	}

business/partner/purchase/tiktok_store/store.go

@@ -660,7 +660,6 @@ func UpdateFreeShipTemplate(vendorOrgCode string, storeID int, shipFee int64) er
 						OverAmount: shipFee * 100,
 					}},
 			}
-			globals.SugarLogger.Debugf("ykljkfjapojf param====%s", utils.Format4Output(param, false))
 			if _, err := a.FreightTemplateUpdate(param); err != nil {
 				return errors.New("更新包邮运费模板失败")
 			}

business/partner/purchase/tiktok_store/store_sku2_utils.go

@@ -30,7 +30,6 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/business/partner/putils"
-	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api/apimanager"
 )
 
@@ -858,7 +857,6 @@ func GetDeliveryTemp(api *tiktokShop.API, vendorStoreID string, storeDetail *dao
 		}
 		freightId = temp.TemplateId
 	}
-	globals.SugarLogger.Debugf("freightId =last %d", freightId)
 	return freightId, nil
 }