Merge remote-tracking branch 'origin/mark' into su

business/auth2/auth2.go

@@ -44,6 +44,8 @@ const (
 	MinCaptchaLen    = 4
 	MaxCaptchaWidth  = 400
 	MaxCaptchaHeight = 400
+
+	InternalAuthSecret = "a36ca416-c85e-4dcf-aff9-590be3d2f8a2"
 )
 
 type IUser interface {
@@ -76,7 +78,7 @@ type CaptchaInfo struct {
 }
 
 type IAuther interface {
-	SendVerifyCode(authID string) (err error)
+	SendVerifyCode(authID string) (verifyCode string, err error)
 	// 负责验证secret，并找到相应的用户返回（password,email,mobile类型的不负责用户查找）如果找不到用户UserID为空
 	VerifySecret(authID, authSecret string) (authBindEx *AuthBindEx, err error)
 	AddAuthBind(authBindEx *AuthBindEx, userName string) (err error)
@@ -195,9 +197,9 @@ func CreateCaptcha(width, height, captchaLen int) (captchaInfo *CaptchaInfo, err
 	return captchaInfo, err
 }
 
-func SendVerifyCode(authToken, captchaID, captchaValue, authID string) (err error) {
+func SendVerifyCode(authToken, captchaID, captchaValue, authID string) (verfifyCode string, authInfo *AuthInfo, err error) {
 	if authToken != "" {
-		_, err = GetTokenInfo(authToken)
+		authInfo, err = GetTokenInfo(authToken)
 	} else if captchaID != "" && captchaValue != "" {
 		if !(TestCaptchaMap[captchaID] == captchaValue || captcha.VerifyString(captchaID, captchaValue)) {
 			err = ErrCaptchaIsNotOk
@@ -210,10 +212,10 @@ func SendVerifyCode(authToken, captchaID, captchaValue, authID string) (err erro
 		if handler := authers[authType]; handler == nil {
 			err = ErrIllegalAuthType
 		} else {
-			err = handler.SendVerifyCode(authID)
+			verfifyCode, err = handler.SendVerifyCode(authID)
 		}
 	}
-	return err
+	return verfifyCode, authInfo, err
 }
 
 // 账号密码时：authIDType可能是：UserIDID,UserIDID2,UserIDMobile,UserIDEmail，authSecret是密码的sha1
@@ -224,7 +226,7 @@ func SendVerifyCode(authToken, captchaID, captchaValue, authID string) (err erro
 // 公众号登录：authIDTypeD是UserIDEmpty，authSecret是code（这个函数是被微信的回调调用，不是直接被客户端调用）
 // 微信登录：authIDType是UserIDEmpty，authSecret是code（这个函数是被微信的回调调用，不是直接被客户端调用）
 // 小程序登录：authIDType是UserIDEmpty，authSecret是jsCode
-func Login(ctx *Context, authType, authID, authIDType, authSecret string) (authInfo *AuthInfo, err error) {
+func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string) (authInfo *AuthInfo, err error) {
 	authType = strings.ToLower(authType)
 	authIDType = strings.ToLower(authIDType)
 	if handler := authers[authType]; handler != nil {
@@ -279,6 +281,13 @@ func Login(ctx *Context, authType, authID, authIDType, authSecret string) (authI
 	return authInfo, err
 }
 
+func Login(ctx *Context, authType, authID, authIDType, authSecret string) (authInfo *AuthInfo, err error) {
+	if authSecret == InternalAuthSecret {
+		authSecret = ""
+	}
+	return LoginInternal(ctx, authType, authID, authIDType, authSecret)
+}
+
 // 通过临时TOKEN绑定新创建的用户
 func BindUser(inauthInfo *AuthInfo, user IUser) (outauthInfo *AuthInfo, err error) {
 	if err = AddAuthBind(user, inauthInfo); err == nil {

business/auth2/auth_info.go

@@ -13,12 +13,12 @@ const (
 )
 
 type UserBasic struct {
-	UserID  string `json:"userID"`
+	UserID      string `json:"userID"`
-	UserID2 string `json:"userID2"`
+	UserID2     string `json:"userID2"`
-	Mobile  string `json:"mobile"`
+	Mobile      string `json:"mobile"`
-	Email   string `json:"email"`
+	Email       string `json:"email"`
-	Name    string `json:"name"`
+	Name        string `json:"name"`
-	Avatar  string `json:"avatar"`
+	Avatar      string `json:"avatar"`
 }
 
 func (u *UserBasic) GetID() string {

business/auth2/authprovider/defauther.go

@@ -45,8 +45,8 @@ func (a *DefAuther) UnbindAuth(userID, authType, userName string) (err error) {
 	return err
 }
 
-func (a *DefAuther) SendVerifyCode(authID string) error {
+func (a *DefAuther) SendVerifyCode(authID string) (verifyCode string, err error) {
-	return errors.New("当前登录类型不支持此操作")
+	return "", errors.New("当前登录类型不支持此操作")
 }
 
 // 此函数为空

business/auth2/authprovider/mobile/mobile.go

@@ -43,15 +43,15 @@ func init() {
 }
 
 // 特殊接口
-func (a *Auther) SendVerifyCode(mobileNumber string) error {
+func (a *Auther) SendVerifyCode(mobileNumber string) (verifyCode string, err error) {
-	code := a.GenerateVerifyCode(mobileNumber)
+	verifyCode = a.GenerateVerifyCode(mobileNumber)
 	smsClient := aliyunsmsclient.New("http://dysmsapi.aliyuncs.com/")
 	response, err := smsClient.Execute(globals.AliKey, globals.AliSecret, mobileNumber, "京西菜市", "SMS_175583158", string(utils.MustMarshal(map[string]interface{}{
-		"code": code,
+		"code": verifyCode,
 	})))
-	a.SaveVerifyCode(mobileNumber, code)
+	a.SaveVerifyCode(mobileNumber, verifyCode)
 	if err == nil && response.Code == aliyunsmsclient.ResponseCodeOk {
-		// a.SaveVerifyCode(mobileNumber, code)
+		// a.SaveVerifyCode(mobileNumber, verifyCode)
 	} else {
 		if err == nil {
 			if warningMap[response.Code] == 1 {
@@ -64,14 +64,16 @@ func (a *Auther) SendVerifyCode(mobileNumber string) error {
 			globals.SugarLogger.Warnf("SendVerifyCode mobileNumber:%s failed with error:%v", mobileNumber, err)
 		}
 	}
-	return err
+	return verifyCode, err
 }
 
 func (a *Auther) VerifySecret(mobileNumber, code string) (authBindEx *auth2.AuthBindEx, err error) {
 	globals.SugarLogger.Debugf("VerifySecret mobileNumber:%s, code:%s", mobileNumber, code)
 
 	err = ErrVerifyCodeIsWrong
-	if (auth2.TestMobileMap[mobileNumber] == 1 && code == TestVerifyCode) || a.VerifyCode(mobileNumber, code) {
+	if (code == auth2.InternalAuthSecret ||
+		auth2.TestMobileMap[mobileNumber] == 1 && code == TestVerifyCode) ||
+		a.VerifyCode(mobileNumber, code) {
 		err = nil
 	}
 	return nil, err

business/jxcallback/orderman/order.go

@@ -21,13 +21,6 @@ import (
 	"github.com/astaxie/beego/orm"
 )
 
-type tStoreSkuBindAndVendorSkuID struct {
-	VendorSkuID int64 `orm:"column(vendor_sku_id)"`
-	SkuID       int   `orm:"column(sku_id)"`
-	Weight      int
-	Price       int
-}
-
 func init() {
 }
 
@@ -323,49 +316,26 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.
 	}
 	orderSkus := order.Skus
 
-	vendorSkuIDs := make([]int64, 0)
+	var vendorSkuIDs []string
 	for _, v := range orderSkus {
-		intVendorSkuID := utils.Str2Int64WithDefault(v.VendorSkuID, 0)
+		if v.VendorSkuID != "" {
-		if intVendorSkuID != 0 {
+			vendorSkuIDs = append(vendorSkuIDs, v.VendorSkuID)
-			vendorSkuIDs = append(vendorSkuIDs, intVendorSkuID)
 		}
 	}
 	if len(vendorSkuIDs) > 0 {
-		tableName := "t2"
+		l, err := dao.GetStoreSkuPriceAndWeight(db, order.VendorStoreID, order.VendorID, vendorSkuIDs)
-		if model.MultiStoresVendorMap[order.VendorID] == 1 {
+		if err != nil {
-			tableName = "t1"
+			globals.SugarLogger.Warnf("updateOrderSkuOtherInfo orderID:%s failed with err:%v", order.VendorOrderID, err)
-		}
-		fieldPrefix := dao.ConvertDBFieldPrefix(model.VendorNames[order.VendorID])
-		sql := `
-			SELECT %s.%s_id vendor_sku_id, t1.id sku_id, t2.price, t1.weight
-			FROM sku t1
-			LEFT JOIN store_sku_bind t2 ON t1.id = t2.sku_id AND t2.deleted_at = ? AND t2.store_id = ?
-			WHERE t1.deleted_at = ? AND %s.%s_id IN (-1, ` + dao.GenQuestionMarks(len(vendorSkuIDs)) + ")"
-		sql = fmt.Sprintf(sql, tableName, fieldPrefix, tableName, fieldPrefix)
-		if order.VendorID == model.VendorIDJX {
-			sql = `
-			SELECT t1.id vendor_sku_id, t1.id sku_id, t2.price, t1.weight
-			FROM sku t1
-			LEFT JOIN store_sku_bind t2 ON t1.id = t2.sku_id AND t2.deleted_at = ? AND t2.store_id = ?
-			WHERE t1.deleted_at = ? AND t1.id IN (-1, ` + dao.GenQuestionMarks(len(vendorSkuIDs)) + ")"
-		}
-		var skuInfos []*tStoreSkuBindAndVendorSkuID
-		if err = dao.GetRows(db, &skuInfos, sql, utils.DefaultTimeValue, jxStoreID, utils.DefaultTimeValue, vendorSkuIDs); err != nil {
-			globals.SugarLogger.Errorf("updateOrderSkuOtherInfo can not get sku info for orderID:%s, error:%v", order.VendorOrderID, err)
 			return err
 		}
-		skumapper := make(map[int64]*tStoreSkuBindAndVendorSkuID)
+		skumapper := storeSkuPriceAndWeight2Map(l)
-		for _, v := range skuInfos {
-			skumapper[v.VendorSkuID] = v
-		}
-
 		for _, v := range orderSkus {
 			v.VendorOrderID = order.VendorOrderID
 			v.VendorID = order.VendorID
 
 			intVendorSkuID := utils.Str2Int64WithDefault(v.VendorSkuID, 0)
 			if intVendorSkuID != 0 && v.VendorSkuID != "-70000" { // todo hard code
-				skuBindInfo := skumapper[intVendorSkuID]
+				skuBindInfo := skumapper[v.VendorSkuID]
 				if skuBindInfo == nil {
 					globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku找不到门店价格（或商品映射），orderID:%s, StoreID:%d, VendorSkuID:%s, sku:%v", opNumStr, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.VendorSkuID, v)
 				} else {
@@ -392,6 +362,14 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.
 	return nil
 }
 
+func storeSkuPriceAndWeight2Map(l []*dao.StoreSkuPriceAndWeight) (skuMapper map[string]*dao.StoreSkuPriceAndWeight) {
+	skuMapper = make(map[string]*dao.StoreSkuPriceAndWeight)
+	for _, v := range l {
+		skuMapper[v.VendorSkuID] = v
+	}
+	return skuMapper
+}
+
 func updateSingleOrderEarningPrice(order *model.GoodsOrder, db *dao.DaoDB) {
 	jxStoreID := jxutils.GetShowStoreIDFromOrder(order)
 	skuIDMap := make(map[int]int)
@@ -773,3 +751,118 @@ func RefreshOrdersWithoutJxStoreID(ctx *jxcontext.Context, fromDate, toDate stri
 	}
 	return hint, err
 }
+
+func GetOrdersSupplement(ctx *jxcontext.Context, storIDs, vendorIDs, statuss []int, vendorOrderID, fromTime, toTime string, stype, IsReverse, offset, pageSize int) (pageInfo *model.PagedInfo, err error) {
+	var (
+		db        = dao.GetDB()
+		fromTimeP time.Time
+		toTimeP   time.Time
+	)
+	if fromTime != "" {
+		fromTimeP = utils.Str2Time(fromTime)
+	}
+	if toTime != "" {
+		toTimeP = utils.Str2Time(toTime)
+	}
+	if fromTimeP.After(toTimeP) {
+		return nil, fmt.Errorf("时间范围不合法！开始时间：[%v]，结束时间：[%v]", fromTimeP, toTimeP)
+	}
+	result, totalCount, err := dao.GetOrdersSupplement(db, storIDs, vendorIDs, statuss, vendorOrderID, fromTimeP, toTimeP, stype, IsReverse, offset, pageSize)
+	pageInfo = &model.PagedInfo{
+		Data:       result,
+		TotalCount: totalCount,
+	}
+	return pageInfo, err
+}
+
+func AddUpdateOrdersSupplement(ctx *jxcontext.Context, ordersSupplement *model.OrderSupplementFee) (num int64, err error) {
+	var (
+		db = dao.GetDB()
+		id = ordersSupplement.ID
+	)
+	now := time.Now()
+	ordersSupplement.SupplementTime = &now
+	defer func() {
+		if r := recover(); r != nil || err != nil {
+			dao.Rollback(db)
+			if r != nil {
+				panic(r)
+			}
+		}
+	}()
+	if id > 0 {
+		orderSupplementFee, _ := dao.GetOrdersSupplementNoPage(db, id, nil, nil, nil, "", utils.ZeroTimeValue, utils.ZeroTimeValue, 0, 0)
+		if len(orderSupplementFee) > 2 || len(orderSupplementFee) == 0 {
+			return 0, fmt.Errorf("查询扣款记录有误，请联系技术部！")
+		}
+		if orderSupplementFee[0].Status == 1 {
+			return 0, fmt.Errorf("已结账的扣款信息不允许修改！门店ID:[%v]，订单号:[%v]", ordersSupplement.StoreID, ordersSupplement.VendorOrderID)
+		}
+		ordersSupplement.UpdatedAt = time.Now()
+		ordersSupplement.LastOperator = ctx.GetUserName()
+		ordersSupplement.CreatedAt = orderSupplementFee[0].CreatedAt
+		if ordersSupplement.Status == -1 {
+			ordersSupplement.DeletedAt = time.Now()
+		} else {
+			ordersSupplement.DeletedAt = utils.DefaultTimeValue
+		}
+		num, err = dao.UpdateEntity(db, ordersSupplement)
+	} else {
+		dao.WrapAddIDCULDEntity(ordersSupplement, ctx.GetUserName())
+		err = dao.CreateEntity(db, ordersSupplement)
+	}
+	dao.Commit(db)
+	return num, err
+}
+
+func RefreshOrdersPriceInfo(ctx *jxcontext.Context, fromTime, toTime time.Time, isAsync, isContinueWhenError bool) (hint string, err error) {
+	if utils.IsTimeZero(fromTime) {
+		return "", fmt.Errorf("必须指定起始时间")
+	}
+	if utils.IsTimeZero(toTime) {
+		toTime = fromTime
+	}
+
+	db := dao.GetDB()
+	orderList, err := dao.QueryOrders(db, "", 0, nil, 0, fromTime, toTime)
+	if err == nil && len(orderList) > 0 {
+		task := tasksch.NewParallelTask("RefreshOrdersPriceInfo", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
+			func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+				curOrder := batchItemList[0].(*model.GoodsOrder)
+				newOrder, err := FixedOrderManager.LoadOrder(curOrder.VendorOrderID, curOrder.VendorID)
+				if err == nil {
+					db := dao.GetDB()
+					if err = FixedOrderManager.updateOrderOtherInfo(newOrder, db); err == nil {
+						dao.Begin(db)
+						defer func() {
+							if r := recover(); r != nil {
+								dao.Rollback(db)
+								panic(r)
+							}
+						}()
+						if _, err = dao.UpdateEntity(db, newOrder); err != nil {
+							dao.Rollback(db)
+							return nil, err
+						}
+
+						for _, sku := range newOrder.Skus {
+							if _, err = dao.UpdateEntity(db, sku); err != nil {
+								dao.Rollback(db)
+								return nil, err
+							}
+						}
+						dao.Commit(db)
+					}
+				}
+				return retVal, err
+			}, orderList)
+		tasksch.HandleTask(task, nil, true).Run()
+		if isAsync {
+			hint = task.GetID()
+		} else {
+			_, err = task.GetResult(0)
+			hint = "1"
+		}
+	}
+	return hint, err
+}

business/jxcallback/orderman/order_afs.go

@@ -1,7 +1,6 @@
 package orderman
 
 import (
-	"fmt"
 	"strings"
 
 	"git.rosy.net.cn/baseapi/utils"
@@ -237,12 +236,11 @@ func (c *OrderManager) updateAfsOrderSkuOtherInfo(db *dao.DaoDB, order *model.Af
 		return nil
 	}
 	orderSkus := order.Skus
-	vendorSkuIDs := make([]int64, 0)
+	var vendorSkuIDs []string
 	skuIDMap := make(map[int]int)
 	for _, v := range orderSkus {
-		intVendorSkuID := utils.Str2Int64WithDefault(v.VendorSkuID, 0)
+		if v.VendorSkuID != "" {
-		if intVendorSkuID != 0 {
+			vendorSkuIDs = append(vendorSkuIDs, v.VendorSkuID)
-			vendorSkuIDs = append(vendorSkuIDs, intVendorSkuID)
 		}
 
 		if skuID := jxutils.GetSkuIDFromOrderSkuFinancial(v); skuID > 0 {
@@ -250,26 +248,13 @@ func (c *OrderManager) updateAfsOrderSkuOtherInfo(db *dao.DaoDB, order *model.Af
 		}
 	}
 	if len(vendorSkuIDs) > 0 {
-		tableName := "t2"
+		l, err := dao.GetStoreSkuPriceAndWeight(db, order.VendorStoreID, order.VendorID, vendorSkuIDs)
-		if model.MultiStoresVendorMap[order.VendorID] == 1 {
+		if err != nil {
-			tableName = "t1"
+			globals.SugarLogger.Warnf("updateAfsOrderSkuOtherInfo orderID:%s failed with err:%v", order.VendorOrderID, err)
-		}
-		fieldPrefix := dao.ConvertDBFieldPrefix(model.VendorNames[order.VendorID])
-		sql := `
-			SELECT %s.%s_id vendor_sku_id, t1.id sku_id, t2.price, t1.weight
-			FROM sku t1
-			LEFT JOIN store_sku_bind t2 ON t1.id = t2.sku_id AND t2.deleted_at = ? AND t2.store_id = ?
-			WHERE t1.deleted_at = ? AND %s.%s_id IN (-1, ` + dao.GenQuestionMarks(len(vendorSkuIDs)) + ")"
-		sql = fmt.Sprintf(sql, tableName, fieldPrefix, tableName, fieldPrefix)
-		var skuInfos []*tStoreSkuBindAndVendorSkuID
-		if err = dao.GetRows(db, &skuInfos, sql, utils.DefaultTimeValue, jxStoreID, utils.DefaultTimeValue, vendorSkuIDs); err != nil {
-			globals.SugarLogger.Errorf("updateAfsOrderSkuOtherInfo can not get sku info for orderID:%s, error:%v", order.VendorOrderID, err)
 			return err
 		}
-		skumapper := make(map[int64]*tStoreSkuBindAndVendorSkuID)
+		skumapper := storeSkuPriceAndWeight2Map(l)
-		for _, v := range skuInfos {
+
-			skumapper[v.VendorSkuID] = v
-		}
 		var actStoreSkuMap *jxutils.ActStoreSkuMap
 		if len(skuIDMap) > 0 {
 			if order2, err2 := c.LoadOrder(order.VendorOrderID, order.VendorID); err2 == nil {
@@ -292,7 +277,7 @@ func (c *OrderManager) updateAfsOrderSkuOtherInfo(db *dao.DaoDB, order *model.Af
 
 			intVendorSkuID := utils.Str2Int64WithDefault(v.VendorSkuID, 0)
 			if intVendorSkuID != 0 && v.VendorSkuID != "-70000" { // todo hard code
-				skuBindInfo := skumapper[intVendorSkuID]
+				skuBindInfo := skumapper[v.VendorSkuID]
 				if skuBindInfo == nil {
 					globals.SugarLogger.Infof("updateAfsOrderSkuOtherInfo [运营%s]%s订单sku找不到门店价格（或商品映射），orderID:%s, StoreID:%d, VendorSkuID:%s, sku:%v", opNumStr, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.VendorSkuID, v)
 				} else {

business/jxcallback/orderman/orderman_ext.go

@@ -181,7 +181,7 @@ func (c *OrderManager) GetOrderWaybillInfo(ctx *jxcontext.Context, vendorOrderID
 	if err == nil && isGetPos {
 		var taskBills []*model.WaybillExt
 		for _, v := range bills {
-			if v.Status >= model.WaybillStatusAccepted && v.Status <= model.WaybillStatusDelivering {
+			if true /*v.Status >= model.WaybillStatusAccepted && v.Status <= model.WaybillStatusDelivering*/ {
 				if handler := partner.GetRidderPositionGetter(v.WaybillVendorID); handler != nil {
 					taskBills = append(taskBills, v)
 				}

business/jxstore/act/act.go

@@ -21,11 +21,6 @@ import (
 
 const (
 	DefActSkuStock = 200 // 缺省活动库存
-
-	maxDiscount4SkuSecKill        = 80
-	maxDiscount4Sku               = 98
-	minDiscount4SkuDirectDown     = 0
-	minDiscount4SkuDirectDownMTWM = 30
 )
 
 type ActOrderRuleParam struct {
@@ -64,11 +59,71 @@ type tPreCreateActInfo struct {
 	ActStoreSku    []*tPreCreateActStoreSku `json:"actStoreSku"`
 }
 
+type tActRuleInfo struct {
+	MinDiscount int
+	MaxDiscount int
+}
+
 type ActManager struct {
 }
 
 var (
 	FixedActManager *ActManager
+
+	actRuleMap = map[int]map[int]*tActRuleInfo{
+		model.VendorIDJD: map[int]*tActRuleInfo{
+			model.ActSkuFake: &tActRuleInfo{
+				MinDiscount: 0,
+				MaxDiscount: 500,
+			},
+			model.ActSkuDirectDown: &tActRuleInfo{
+				MinDiscount: 0,
+				MaxDiscount: 99,
+			},
+			model.ActSkuSecKill: &tActRuleInfo{
+				MinDiscount: 0,
+				MaxDiscount: 80,
+			},
+		},
+		model.VendorIDMTWM: map[int]*tActRuleInfo{
+			model.ActSkuFake: &tActRuleInfo{
+				MinDiscount: 0,
+				MaxDiscount: 500,
+			},
+			model.ActSkuDirectDown: &tActRuleInfo{
+				MinDiscount: 30,
+				MaxDiscount: 99,
+			},
+			model.ActSkuSecKill: &tActRuleInfo{
+				MinDiscount: 0,
+				MaxDiscount: 30,
+			},
+		},
+		model.VendorIDEBAI: map[int]*tActRuleInfo{
+			model.ActSkuFake: &tActRuleInfo{
+				MinDiscount: 0,
+				MaxDiscount: 500,
+			},
+			model.ActSkuDirectDown: &tActRuleInfo{
+				MinDiscount: 0,
+				MaxDiscount: 99,
+			},
+		},
+		model.VendorIDJX: map[int]*tActRuleInfo{
+			model.ActSkuFake: &tActRuleInfo{
+				MinDiscount: 0,
+				MaxDiscount: 500,
+			},
+			model.ActSkuDirectDown: &tActRuleInfo{
+				MinDiscount: 0,
+				MaxDiscount: 99,
+			},
+			model.ActSkuSecKill: &tActRuleInfo{
+				MinDiscount: 0,
+				MaxDiscount: 80,
+			},
+		},
+	}
 )
 
 func init() {
@@ -256,11 +311,28 @@ func addActStoreSkuBind(ctx *jxcontext.Context, db *dao.DaoDB, actStoreSkuList [
 	return err
 }
 
+func checkActUpdate(actID int, actMap map[int]*model.Act2) (err error) {
+	if len(actMap) == 0 {
+		return fmt.Errorf("活动%d不存在或已被取消", actID)
+	}
+	errList := errlist.New()
+	for vendorID, act := range actMap {
+		if vendorID == model.VendorIDEBAI && act.CreateType != model.ActCreateTypeAPI {
+			errList.AddErr(fmt.Errorf("饿百平台不支持修改或取消网页活动"))
+		}
+	}
+	return errList.GetErrListAsOne()
+}
+
 func AddActStoreSkuBind(ctx *jxcontext.Context, db *dao.DaoDB, actID int, actStoreSku []*ActStoreSkuParam) (err error) {
 	actMap, err := dao.GetActVendorInfo(db, actID, nil)
 	if err != nil {
 		return err
 	}
+	if err = checkActUpdate(actID, actMap); err != nil {
+		return err
+	}
+
 	vendorIDs := partner.GetVendorIDsFromActMap(actMap)
 
 	var act *model.Act
@@ -309,25 +381,33 @@ func AddActStoreSkuBind(ctx *jxcontext.Context, db *dao.DaoDB, actID int, actSto
 	return err
 }
 
+func getActRule(vendorID, actType int) (actRule *tActRuleInfo, err error) {
+	if actRuleMap[vendorID] != nil {
+		actRule = actRuleMap[vendorID][actType]
+	}
+	if actRule == nil {
+		err = fmt.Errorf("%s不支持%s活动", model.VendorChineseNames[vendorID], model.ActTypeName[actType])
+	}
+	return actRule, err
+}
+
 func checkDiscountValidation(vendorIDs []int, actType int, pricePercentage float64) (err error) {
 	pricePercentageMin := int(math.Floor(pricePercentage))
 	pricePercentageMax := int(math.Ceil(pricePercentage))
-	if actType == model.ActSkuDirectDown && (pricePercentageMin < minDiscount4SkuDirectDown || pricePercentageMax > 99) {
+	errList := errlist.New()
-		if pricePercentageMin < minDiscount4SkuDirectDown {
+	for _, vendorID := range vendorIDs {
-			err = fmt.Errorf("%s活动折扣必须大于:%d", model.ActTypeName[actType], minDiscount4SkuDirectDown)
+		actRule, err2 := getActRule(vendorID, actType)
-		} else if pricePercentageMax > maxDiscount4Sku {
+		if err2 == nil {
-			err = fmt.Errorf("%s活动必须至少有%d折扣", model.ActTypeName[actType], maxDiscount4Sku)
+			if pricePercentageMin < actRule.MinDiscount {
-		} else if len(vendorIDs) > 0 && vendorIDs[0] == model.VendorIDMTWM && pricePercentageMin < minDiscount4SkuDirectDownMTWM {
+				errList.AddErr(fmt.Errorf("%s%s活动折扣必须大于:%d", model.VendorChineseNames[vendorID], model.ActTypeName[actType], actRule.MinDiscount))
-			err = fmt.Errorf("美团平台%s活动折扣必须大于:%d", model.ActTypeName[actType], minDiscount4SkuDirectDownMTWM)
+			} else if pricePercentageMax > actRule.MaxDiscount {
-		}
+				errList.AddErr(fmt.Errorf("%s%s活动折扣必须小于:%d", model.VendorChineseNames[vendorID], model.ActTypeName[actType], actRule.MaxDiscount))
-	} else if actType == model.ActSkuSecKill {
+			}
-		if len(vendorIDs) > 0 && vendorIDs[0] == model.VendorIDMTWM && pricePercentageMax > minDiscount4SkuDirectDownMTWM {
+		} else {
-			err = fmt.Errorf("美团平台%s活动折扣必须小于:%d", model.ActTypeName[actType], minDiscount4SkuDirectDownMTWM)
+			errList.AddErr(err2)
-		} else if pricePercentageMax > maxDiscount4SkuSecKill {
-			err = fmt.Errorf("%s活动折扣必须小于:%d", model.ActTypeName[actType], maxDiscount4SkuSecKill)
 		}
 	}
-	return err
+	return errList.GetErrListAsOne()
 }
 
 func checkActValidation(act *model.Act, vendorIDs []int) (err error) {
@@ -644,8 +724,8 @@ func DeleteActStoreSkuBind(ctx *jxcontext.Context, db *dao.DaoDB, actID int, act
 	if err != nil {
 		return 0, err
 	}
-	if len(actMap) == 0 {
+	if err = checkActUpdate(actID, actMap); err != nil {
-		return 0, fmt.Errorf("找不到活动:%d，或已被取消", actID)
+		return 0, err
 	}
 
 	actStoreSkuMap, err := dao.GetActStoreSkuVendorInfo(db, actID, nil, nil, nil)
@@ -958,6 +1038,7 @@ func ForceUpdateVendorPrice(ctx *jxcontext.Context, vendorID int, actType int, s
 	var wrongSkuList []*ActStoreSkuParam
 	var storeSkuBindList []*model.StoreSkuBind
 
+	actRule, _ := getActRule(vendorID, actType)
 	db := dao.GetDB()
 	errList := errlist.New()
 	for _, v := range storeSkuList {
@@ -978,11 +1059,7 @@ func ForceUpdateVendorPrice(ctx *jxcontext.Context, vendorID int, actType int, s
 			} else {
 				vendorPrice = dao.GetStoreSkuBindVendorPrice(storeSkuBind, vendorID)
 				if checkDiscountValidation([]int{vendorID}, actType, float64(v.ActPrice)*100/float64(vendorPrice)) != nil {
-					if actType == model.ActSkuSecKill {
+					vendorPrice = int(v.ActPrice)*100/actRule.MaxDiscount + 10
-						vendorPrice = int(v.ActPrice)*100/maxDiscount4SkuSecKill + 10
-					} else if actType == model.ActSkuDirectDown {
-						vendorPrice = int(v.ActPrice) + 10
-					}
 				} else {
 					storeSkuBind = nil
 				}

business/jxstore/cms/cms.go

@@ -2,6 +2,7 @@ package cms
 
 import (
 	"fmt"
+	"reflect"
 	"strconv"
 	"strings"
 	"time"
@@ -31,6 +32,13 @@ const (
 	SendMsgTypeSuggestRequest   = "suggestRequest"
 )
 
+type SysConfigLimit struct {
+	ValueType    reflect.Kind
+	MinValue     int64
+	MaxValue     int64
+	AfterChanged func() error
+}
+
 var (
 	serviceInfo               map[string]interface{}
 	allowUpdatePlaceFieldsMap = map[string]bool{
@@ -54,6 +62,36 @@ var (
 	needConfirmRequestMap = map[string]int{
 		SendMsgTypeOpenStoreRequest: 1,
 	}
+
+	SysConfigLimitMap = map[string]*SysConfigLimit{
+		model.ConfigSysEbaiBoxFee: &SysConfigLimit{
+			ValueType: reflect.Int,
+			MinValue:  0,
+			MaxValue:  500,
+			AfterChanged: func() (err error) {
+				_, err = dao.SetStoreMapSyncStatus(dao.GetDB(), []int{model.VendorIDEBAI}, nil, model.SyncFlagModifiedMask)
+				return err
+			},
+		},
+		model.ConfigSysMtwmBoxFee: &SysConfigLimit{
+			ValueType: reflect.Int,
+			MinValue:  0,
+			MaxValue:  500,
+			AfterChanged: func() (err error) {
+				_, err = dao.SetStoreMapSyncStatus(dao.GetDB(), []int{model.VendorIDMTWM}, nil, model.SyncFlagModifiedMask)
+				return err
+			},
+		},
+		model.ConfigSysMtwmSkuBoxFee: &SysConfigLimit{
+			ValueType: reflect.Int,
+			MinValue:  0,
+			MaxValue:  50,
+			AfterChanged: func() (err error) {
+				_, err = dao.SetStoreSkuSyncStatus(dao.GetDB(), model.VendorIDMTWM, nil, nil, model.SyncFlagModifiedMask)
+				return err
+			},
+		},
+	}
 )
 
 func InitServiceInfo(version string, buildTime time.Time, gitCommit string) {
@@ -102,6 +140,7 @@ func InitServiceInfo(version string, buildTime time.Time, gitCommit string) {
 			"refundStatusName":       model.RefundStatusName,
 			"autoReplyTypeName":      model.AutoReplyTypeName,
 			"complaintReasons":       model.ComplaintReasons,
+			"supplementType":         model.SupplementTypeName,
 		},
 	}
 }
@@ -193,6 +232,27 @@ func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, ms
 	return err
 }
 
+func checkSysConfig(key, value string) (err error) {
+	if limit := SysConfigLimitMap[key]; limit != nil {
+		if limit.ValueType == reflect.Int {
+			int64Value, err2 := strconv.ParseInt(value, 10, 64)
+			if err = err2; err == nil {
+				if int64Value < limit.MinValue || int64Value > limit.MaxValue {
+					err = fmt.Errorf("配置%s,值%s超范围[%d,%d]", key, value, limit.MinValue, limit.MaxValue)
+				}
+			}
+		}
+	}
+	return err
+}
+
+func onSysConfigChanged(key, value string) (err error) {
+	if limit := SysConfigLimitMap[key]; limit != nil && limit.AfterChanged != nil {
+		err = limit.AfterChanged()
+	}
+	return err
+}
+
 func checkConfig(opFlag int, configType, key, value string) (err error) {
 	switch configType {
 	case model.ConfigTypePricePack:
@@ -228,8 +288,10 @@ func checkConfig(opFlag int, configType, key, value string) (err error) {
 		}
 	case model.ConfigTypeRole:
 	case model.ConfigTypeSys:
-		if opFlag&(model.SyncFlagNewMask|model.SyncFlagDeletedMask) != 0 {
+		if opFlag&( /*model.SyncFlagNewMask|*/ model.SyncFlagDeletedMask) != 0 {
-			err = fmt.Errorf("系统参数只支持修改，不支持自由添加")
+			err = fmt.Errorf("系统参数只支持修改或添加，不支持删除")
+		} else {
+			err = checkSysConfig(key, value)
 		}
 	default:
 		err = fmt.Errorf("当前只支持配置:%s, 传入的配置类型:%s", utils.Format4Output(model.ConfigTypeName, true), configType)
@@ -249,7 +311,11 @@ func AddConfig(ctx *jxcontext.Context, key, configType, value string) (err error
 		Value: value,
 	}
 	dao.WrapAddIDCULDEntity(conf, ctx.GetUserName())
-	return dao.CreateEntity(db, conf)
+	err = dao.CreateEntity(db, conf)
+	if configType == model.ConfigTypeSys && err == nil {
+		err = onSysConfigChanged(key, value)
+	}
+	return err
 }
 
 func DeleteConfig(ctx *jxcontext.Context, key, configType string) (err error) {
@@ -314,6 +380,9 @@ func DeleteConfig(ctx *jxcontext.Context, key, configType string) (err error) {
 			"Type": configType,
 		})
 	}
+	if configType == model.ConfigTypeSys && err == nil {
+		err = onSysConfigChanged(key, "")
+	}
 	return err
 }
 
@@ -393,6 +462,9 @@ func UpdateConfig(ctx *jxcontext.Context, key, configType, value string) (hint s
 	default:
 		dao.Commit(db)
 	}
+	if configType == model.ConfigTypeSys && err == nil {
+		err = onSysConfigChanged(key, value)
+	}
 	return hint, err
 }
 

business/jxstore/cms/sku.go

@@ -101,8 +101,8 @@ func AddCategory(ctx *jxcontext.Context, cat *model.SkuCategory, userName string
 	}
 
 	dao.WrapAddIDCULDEntity(cat, userName)
-	cat.JdSyncStatus = model.SyncFlagNewMask
+	// cat.JdSyncStatus = model.SyncFlagNewMask
-	cat.JdID = 0
+	// cat.JdID = 0
 	cat.Status = model.CategoryStatusEnable
 	cat.Name = strings.Trim(cat.Name, " ")
 	if cat.Img != "" {
@@ -152,12 +152,12 @@ func UpdateCategory(ctx *jxcontext.Context, categoryID int, payload map[string]i
 	}
 	valid := dao.StrictMakeMapByStructObject(payload, cat, userName)
 	if len(valid) > 0 {
-		syncStatus := 0
+		// syncStatus := 0
-		if valid["name"] != nil {
+		// if valid["name"] != nil {
-			valid["name"] = strings.Trim(valid["name"].(string), " ")
+		// 	valid["name"] = strings.Trim(valid["name"].(string), " ")
-			syncStatus = model.SyncFlagModifiedMask
+		// 	syncStatus = model.SyncFlagModifiedMask
-			valid[model.FieldJdSyncStatus] = int8(syncStatus) | cat.JdSyncStatus
+		// 	valid[model.FieldJdSyncStatus] = int8(syncStatus) | cat.JdSyncStatus
-		}
+		// }
 		if valid["status"] != nil {
 			if utils.Interface2Int64WithDefault(valid["status"], -1) == model.CategoryStatusDisabled {
 				if skuList, err2 := dao.GetSkuByCats(db, []int{categoryID}); err2 == nil && len(skuList) > 0 {
@@ -336,7 +336,10 @@ func DeleteCategory(ctx *jxcontext.Context, categoryID int, userName string) (nu
 			dao.Rollback(db)
 			return 0, err
 		}
-		if num, err = dao.DeleteEntityLogically(db, cat, utils.Params2Map(model.FieldJdSyncStatus, model.SyncFlagDeletedMask), userName, nil); err != nil {
+		if num, err = dao.DeleteEntityLogically(db, cat, map[string]interface{}{
+			// model.FieldJdSyncStatus: model.SyncFlagDeletedMask,
+			model.FieldStatus: 0,
+		}, userName, nil); err != nil {
 			dao.Rollback(db)
 			return 0, err
 		}
@@ -441,8 +444,13 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku bool, params ma
 			return nil, err
 		}
 		if len(vendorSkuIDs) > 0 {
-			sql += " AND t2.jd_id IN (" + dao.GenQuestionMarks(len(vendorSkuIDs)) + ")"
+			if globals.IsUseThingMap {
-			sqlParams = append(sqlParams, vendorSkuIDs)
+				sql += " AND (SELECT COUNT(*) FROM thing_map tm WHERE tm.thing_type = ? AND tm.thing_id = t2.id AND tm.deleted_at = ? AND tm.vendor_thing_id IN (" + dao.GenQuestionMarks(len(vendorSkuIDs)) + ")) > 0"
+				sqlParams = append(sqlParams, utils.DefaultTimeValue, vendorSkuIDs)
+			} else {
+				sql += " AND t2.jd_id IN (" + dao.GenQuestionMarks(len(vendorSkuIDs)) + ")"
+				sqlParams = append(sqlParams, vendorSkuIDs)
+			}
 		}
 	}
 	if params["name"] != nil {
@@ -552,16 +560,18 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku bool, params ma
 		t1.is_spu,
 		t1.desc_img,
 		t1.upc,
+		/*
 		t1.jd_id,
 		t1.jd_sync_status,
+		*/
 		t1.ex_prefix,
 		t1.ex_prefix_begin,
 		t1.ex_prefix_end,
 		CONCAT("[", GROUP_CONCAT(DISTINCT CONCAT('{"id":', t2.id, ',"comment":"', t2.comment, '","status":', t2.status,
 		',"createdAt":"', CONCAT(REPLACE(t2.created_at," ","T"),"+08:00"), '","updatedAt":"', CONCAT(REPLACE(t2.updated_at," ","T"),"+08:00"),
 		'","lastOperator":"', t2.last_operator, '","specQuality":', t2.spec_quality, ',"specUnit":"', t2.spec_unit,
-		'","weight":', t2.weight, ',"jdID":', t2.jd_id, ',"categoryID":', t2.category_id,  ',"nameID":', t2.name_id,
+		'","weight":', t2.weight, ',"categoryID":', t2.category_id,  ',"nameID":', t2.name_id,
-		',"jdID":', t2.jd_id, ',"jdSyncStatus":', t2.jd_sync_status, ', "seq":', t2.seq,
+		', "seq":', t2.seq,
 		"}")), "]") skus_str,
 		CONCAT("[", GROUP_CONCAT(DISTINCT  t3.place_code), "]") places_str
 		` + sql + `
@@ -670,7 +680,7 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
 	skuNameExt.SkuName.Status = model.SkuStatusNormal
 	if skuNameExt.IsSpu == 1 {
 		return nil, fmt.Errorf("不允许创建多规格商品")
-		skuNameExt.SkuName.JdSyncStatus = model.SyncFlagNewMask
+		// skuNameExt.SkuName.JdSyncStatus = model.SyncFlagNewMask
 	}
 	if skuNameExt.Unit == model.SpecialUnit {
 		skuNameExt.SpecQuality = float32(model.SpecialSpecQuality)
@@ -727,8 +737,8 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
 		sku := v.Sku
 		dao.WrapAddIDCULDEntity(sku, userName)
 		sku.NameID = skuNameExt.ID
-		sku.JdSyncStatus = model.SyncFlagNewMask
+		// sku.JdSyncStatus = model.SyncFlagNewMask
-		sku.JdID = 0
+		// sku.JdID = 0
 		if err = dao.CreateEntity(db, sku); err != nil {
 			dao.Rollback(db)
 			return nil, err
@@ -822,7 +832,7 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
 				panic(r)
 			}
 		}()
-		valid[model.FieldJdSyncStatus] = model.SyncFlagModifiedMask | skuName.JdSyncStatus
+		// valid[model.FieldJdSyncStatus] = model.SyncFlagModifiedMask | skuName.JdSyncStatus
 		if num, err = dao.UpdateEntityLogically(db, skuName, valid, userName, nil); err != nil {
 			dao.Rollback(db)
 			return 0, err
@@ -855,7 +865,7 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
 		if err = err2; err == nil {
 			for _, v := range skuList {
 				sku := &v.Sku
-				sku.JdSyncStatus |= model.SyncFlagModifiedMask
+				// sku.JdSyncStatus |= model.SyncFlagModifiedMask
 				sku.LastOperator = userName
 				sku.UpdatedAt = time.Now()
 				if _, err = dao.UpdateEntity(db, sku); err != nil {
@@ -930,8 +940,8 @@ func DeleteSkuName(ctx *jxcontext.Context, nameID int, userName string) (num int
 				return 0, err
 			}
 			if _, err = dao.DeleteEntityLogically(db, sku, map[string]interface{}{
-				model.FieldJdSyncStatus: model.SyncFlagDeletedMask,
+				// model.FieldJdSyncStatus: model.SyncFlagDeletedMask,
-				model.FieldStatus:       model.SkuStatusDeleted,
+				model.FieldStatus: model.SkuStatusDeleted,
 			}, userName, nil); err != nil {
 				dao.Rollback(db)
 				return 0, err
@@ -947,8 +957,8 @@ func DeleteSkuName(ctx *jxcontext.Context, nameID int, userName string) (num int
 	skuName := &model.SkuName{}
 	skuName.ID = nameID
 	if num, err = dao.DeleteEntityLogically(db, skuName, map[string]interface{}{
-		model.FieldJdSyncStatus: model.SyncFlagDeletedMask,
+		// model.FieldJdSyncStatus: model.SyncFlagDeletedMask,
-		model.FieldStatus:       model.SkuStatusDeleted,
+		model.FieldStatus: model.SkuStatusDeleted,
 	}, userName, nil); err != nil {
 		dao.Rollback(db)
 		return 0, err
@@ -973,8 +983,8 @@ func AddSku(ctx *jxcontext.Context, nameID int, sku *model.Sku, userName string)
 	}
 
 	dao.WrapAddIDCULDEntity(sku, userName)
-	sku.JdSyncStatus = model.SyncFlagNewMask
+	// sku.JdSyncStatus = model.SyncFlagNewMask
-	sku.JdID = 0
+	// sku.JdID = 0
 	sku.NameID = nameID
 
 	dao.Begin(db)
@@ -1028,7 +1038,7 @@ func UpdateSku(ctx *jxcontext.Context, skuID int, payload map[string]interface{}
 		if valid["specQuality"] != nil || valid["specUnit"] != nil {
 			maskValue |= model.SyncFlagSpecMask
 		}
-		valid[model.FieldJdSyncStatus] = maskValue | sku.JdSyncStatus
+		// valid[model.FieldJdSyncStatus] = maskValue | sku.JdSyncStatus
 		if num, err = dao.UpdateEntityLogically(db, sku, valid, userName, nil); err != nil || num == 0 {
 			dao.Rollback(db)
 			if err == nil {
@@ -1121,8 +1131,8 @@ func DeleteSku(ctx *jxcontext.Context, skuID int, userName string) (num int64, e
 	sku := &model.Sku{}
 	sku.ID = skuID
 	if num, err = dao.DeleteEntityLogically(db, sku, map[string]interface{}{
-		model.FieldStatus:       model.SkuStatusDeleted,
+		model.FieldStatus: model.SkuStatusDeleted,
-		model.FieldJdSyncStatus: model.SyncFlagDeletedMask,
+		// model.FieldJdSyncStatus: model.SyncFlagDeletedMask,
 	}, userName, nil); err != nil {
 		dao.Rollback(db)
 		return 0, err

business/jxstore/cms/store.go

@@ -176,6 +176,13 @@ var (
 		"promoteInfo":       1,
 	}
 
+	storeMapKeyPropertyMap = map[string]int{
+		"status":               1,
+		"freightDeductionPack": 1,
+		"vendorStoreName":      1,
+		"boxFee":               1,
+	}
+
 	WatchVendorStoreTimeList = []string{
 		"8:00:00",
 		"10:00:00",
@@ -1121,6 +1128,17 @@ func DeleteStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
 	return num, err
 }
 
+func isStoreMapNeedSync(vendorID int, valid map[string]interface{}) bool {
+	if vendorID != model.VendorIDJX {
+		for k := range valid {
+			if storeMapKeyPropertyMap[k] == 1 {
+				return true
+			}
+		}
+	}
+	return false
+}
+
 func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID int, payload map[string]interface{}, userName string) (num int64, err error) {
 	if vendorID != model.VendorIDJD {
 		if autoPickup, ok := payload["autoPickup"]; ok && autoPickup == 0 {
@@ -1196,7 +1214,7 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
 					panic(r)
 				}
 			}()
-			if valid["status"] != nil || valid["vendorStoreName"] != nil { // 对于store vendor map，只有Status改变才需要同步到厂商
+			if isStoreMapNeedSync(vendorID, valid) { // 对于store vendor map，只有Status改变才需要同步到厂商
 				num, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, storeMap, valid, userName, map[string]interface{}{
 					model.FieldStoreID:  storeID,
 					model.FieldVendorID: vendorID,
@@ -1229,7 +1247,7 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
 				}
 			}
 			dao.Commit(db)
-			if vendorID != model.VendorIDJX && (valid["status"] != nil || valid["freightDeductionPack"] != nil || valid["vendorStoreName"] != nil) {
+			if isStoreMapNeedSync(vendorID, valid) {
 				_, err = CurVendorSync.SyncStore(ctx, db, vendorID, storeID, false, userName)
 			}
 		}
@@ -2577,7 +2595,7 @@ func CreateStorePriceScore(ctx *jxcontext.Context) (err error) {
 				}
 			}
 		}()
-		priceReferSnapshotDeleteHis := &model.StorePriceScoreSnapshot{SnapshotAt: snapshotAt.AddDate(0, -1, 0)}
+		priceReferSnapshotDeleteHis := &model.StorePriceScoreSnapshot{SnapshotAt: snapshotAt.AddDate(0, 0, -7)}
 		priceReferSnapshotDelete := &model.StorePriceScoreSnapshot{SnapshotAt: snapshotAt}
 		dao.DeleteEntity(db, priceReferSnapshotDeleteHis, "SnapshotAt")
 		dao.DeleteEntity(db, priceReferSnapshotDelete, "SnapshotAt")

business/jxstore/cms/store_sku.go

@@ -114,6 +114,7 @@ type tGetStoresSkusInfo struct {
 	model.SkuName
 	PayPercentage int `json:"-"`
 	dao.StoreSkuExt
+	RealMidUnitPrice int `json:"realMidUnitPrice"` //真实的该商品的全国中位价
 }
 
 type SheetParam struct {
@@ -154,6 +155,11 @@ type DataLock struct {
 	locker          sync.RWMutex
 }
 
+type tUpdateStoresSkus struct {
+	StoreID      int
+	SkuBindInfos []*StoreSkuBindInfo
+}
+
 const (
 	maxStoreNameBind  = 10000 // 最大门店SkuName bind个数
 	maxStoreNameBind2 = 10000 // 最大门店乘SkuName个数
@@ -256,10 +262,12 @@ func getGetStoresSkusBaseSQL(db *dao.DaoDB, storeIDs, skuIDs []int, isFocus bool
 	sql += `
 	JOIN store_sku_bind t4 ON t4.store_id = t3.id AND t4.sku_id = t2.id AND t4.deleted_at = ?
 	LEFT JOIN sku_name_place_bind t5 ON t1.id = t5.name_id AND t3.city_code = t5.place_code
+	LEFT JOIN price_refer_snapshot t6 ON t6.city_code = 0 AND t6.sku_id = t2.id AND t6.snapshot_at = ?
 	WHERE t1.deleted_at = ? AND (t1.is_global = 1 OR t5.id IS NOT NULL OR 1 = ?)/* AND t1.status = ?*/
 	`
 	sqlParams = append(sqlParams, []interface{}{
 		utils.DefaultTimeValue,
+		utils.Time2Date(time.Now().AddDate(0, 0, -1)),
 		utils.DefaultTimeValue,
 		utils.Bool2Int(isFocus),
 		// model.SkuStatusNormal,
@@ -277,8 +285,15 @@ func getGetStoresSkusBaseSQL(db *dao.DaoDB, storeIDs, skuIDs []int, isFocus bool
 		sqlParams = append(sqlParams, keywordLike, keywordLike, keywordLike, keywordLike)
 
 		if keywordInt64, err2 := strconv.ParseInt(keyword, 10, 64); err2 == nil {
-			sql += " OR t1.id = ? OR t2.id = ? OR t2.jd_id = ?"
+			sql += " OR t1.id = ? OR t2.id = ?"
-			sqlParams = append(sqlParams, keywordInt64, keywordInt64, keywordInt64)
+			sqlParams = append(sqlParams, keywordInt64, keywordInt64)
+			if !globals.IsUseThingMap {
+				sql += " OR t2.jd_id = ?"
+				sqlParams = append(sqlParams, keywordInt64)
+			} else {
+				sql += " OR (SELECT COUNT(*) FROM thing_map tm WHERE tm.vendor_org_code = sm.vendor_org_code AND tm.thing_type = ? AND tm.thing_id = t2.id AND tm.deleted_at = ? AND tm.vendor_thing_id = ?) > 0"
+				sqlParams = append(sqlParams, model.ThingTypeSku, utils.DefaultTimeValue, keywordInt64)
+			}
 			if isFocus {
 				sql += " OR t4.ebai_id = ? OR t4.mtwm_id = ?"
 				sqlParams = append(sqlParams, keywordInt64, keywordInt64)
@@ -481,7 +496,8 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus bo
 	t4.jd_sync_status, t4.ebai_sync_status, t4.mtwm_sync_status,
 	t4.jd_price, t4.ebai_price, t4.mtwm_price, t4.jx_price,
 	t4.jd_lock_time, t4.ebai_lock_time, t4.mtwm_lock_time, t4.jx_lock_time,
-	t4.status_sale_begin, t4.status_sale_end
+	t4.status_sale_begin, t4.status_sale_end,
+	t6.mid_unit_price real_mid_unit_price
 	`, jdVendorIDField) + sql
 	var tmpList []*tGetStoresSkusInfo
 	beginTime := time.Now()
@@ -500,11 +516,12 @@ func GetStoresSkusNew(ctx *jxcontext.Context, storeIDs, skuIDs []int, isFocus bo
 		index := jxutils.Combine2Int(v.StoreID, v.ID)
 		if isBySku || storeNameMap[index] == nil {
 			storeName = &dao.StoreSkuNameExt{
-				StoreID:       v.StoreID,
+				StoreID:          v.StoreID,
-				StoreName:     v.StoreName,
+				StoreName:        v.StoreName,
-				SkuName:       v.SkuName,
+				SkuName:          v.SkuName,
-				UnitPrice:     v.UnitPrice,
+				UnitPrice:        v.UnitPrice,
-				PayPercentage: v.PayPercentage,
+				PayPercentage:    v.PayPercentage,
+				RealMidUnitPrice: v.RealMidUnitPrice,
 			}
 			if !isBySku {
 				storeNameMap[index] = storeName
@@ -1890,7 +1907,7 @@ func RefreshStoresSkuByVendor(ctx *jxcontext.Context, storeIDs []int, vendorID i
 		return "", fmt.Errorf("此功能当前只支持京东到家平台")
 	}
 	db := dao.GetDB()
-	storeMapList, err := dao.GetStoresMapList(db, nil, storeIDs, model.StoreStatusAll, model.StoreIsSyncAll, "")
+	storeMapList, err := dao.GetStoresMapList(db, []int{vendorID}, storeIDs, model.StoreStatusAll, model.StoreIsSyncAll, "")
 	if err != nil {
 		return "", err
 	}
@@ -1907,13 +1924,13 @@ func RefreshStoresSkuByVendor(ctx *jxcontext.Context, storeIDs []int, vendorID i
 			return "", err
 		}
 	}
-	skuList, err := dao.GetSkus(db, nil, nil, nil, nil)
+	skuList, err := dao.GetSkusWithVendor(db, []int{vendorID}, nil, nil, nil, false)
 	if err != nil {
 		return "", err
 	}
 	skuNameMap := make(map[int]*model.SkuName)
-	skuMap := make(map[int]*model.SkuAndName)
+	skuMap := make(map[int]*dao.StoreSkuSyncInfo)
-	var bareStoreSkuList []*partner.StoreSkuInfo
+	bareStoreSkuMap := make(map[string][]*partner.StoreSkuInfo)
 	for _, sku := range skuList {
 		if skuNameMap[sku.NameID] == nil {
 			skuNameMap[sku.NameID] = &model.SkuName{
@@ -1922,9 +1939,9 @@ func RefreshStoresSkuByVendor(ctx *jxcontext.Context, storeIDs []int, vendorID i
 		}
 		skuMap[sku.ID] = sku
 
-		bareStoreSkuList = append(bareStoreSkuList, &partner.StoreSkuInfo{
+		bareStoreSkuMap[sku.VendorOrgCode] = append(bareStoreSkuMap[sku.VendorOrgCode], &partner.StoreSkuInfo{
 			SkuID:       sku.ID,
-			VendorSkuID: utils.Int64ToStr(sku.JdID),
+			VendorSkuID: sku.VendorSkuID,
 		})
 	}
 
@@ -1937,7 +1954,7 @@ func RefreshStoresSkuByVendor(ctx *jxcontext.Context, storeIDs []int, vendorID i
 				func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
 					switch step {
 					case 0:
-						bareStoreSkuList, err2 := handler.GetStoreSkusBareInfo(ctx, oneStoreMap.VendorOrgCode, task, oneStoreMap.StoreID, oneStoreMap.VendorStoreID, bareStoreSkuList)
+						bareStoreSkuList, err2 := handler.GetStoreSkusBareInfo(ctx, oneStoreMap.VendorOrgCode, task, oneStoreMap.StoreID, oneStoreMap.VendorStoreID, bareStoreSkuMap[oneStoreMap.VendorOrgCode])
 						// globals.SugarLogger.Debug(utils.Format4Output(bareStoreSkuList, false))
 						if err = err2; err == nil || len(bareStoreSkuList) > 0 {
 							err = nil // todo 如果部分失败，强制忽略错误
@@ -2202,18 +2219,7 @@ func GetTopSkusByCityCode(ctx *jxcontext.Context, cityCode, storeID int) (skuNam
 								JOIN sku b ON a.sku_id = b.id AND b.deleted_at = ?
 								WHERE a.deleted_at = ? 
 								AND a.store_id = ?
-								AND a.status = ?)
+								AND a.status = ?)			
-			UNION 
-			SELECT DISTINCT a.name_id id,0 brand_id
-			FROM sku a
-			LEFT JOIN (SELECT DISTINCT b.name_id 
-						FROM store_sku_bind a
-						JOIN sku b ON a.sku_id = b.id
-						WHERE a.deleted_at = ? 
-						AND store_id = ?)b ON a.name_id = b.name_id
-			WHERE a.status = ?	
-			AND a.deleted_at = ?
-			AND b.name_id IS NULL
 		`
 		sqlParams := []interface{}{
 			utils.DefaultTimeValue,
@@ -2224,23 +2230,31 @@ func GetTopSkusByCityCode(ctx *jxcontext.Context, cityCode, storeID int) (skuNam
 			utils.DefaultTimeValue,
 			storeID,
 			model.StoreSkuBindStatusNormal,
-			utils.DefaultTimeValue,
-			storeID,
-			model.StoreSkuBindStatusNormal,
-			utils.DefaultTimeValue,
 		}
 		err = dao.GetRows(db, &skuNameList, sql, sqlParams...)
 		var skuNameMap = make(map[int]*model.SkuName)
 		for _, v := range skuNameList {
 			skuNameMap[v.ID] = v
 		}
+		store, err := dao.GetStoreDetail(db, storeID, -1)
+		if err != nil {
+			return nil, err
+		}
+		var payPercentage int
+		if store.PayPercentage < 50 {
+			payPercentage = 70
+		} else {
+			payPercentage = store.PayPercentage
+		}
 		for _, v := range skuNameAndPlace {
 			if skuNameMap[v.ID] != nil {
-				midPrice, _ := dao.GetMidPriceByNameID(db, cityCode, v.ID, utils.Time2Date(time.Now().AddDate(0, 0, -1)))
+				priceReferList, _ := dao.GetPriceReferSnapshotNoPage(db, []int{cityCode}, nil, []int{v.ID}, utils.Time2Date(time.Now().AddDate(0, 0, -1)))
-				if midPrice != 0 {
+				if len(priceReferList) > 0 {
-					v.Price = midPrice
+					v.Price = priceReferList[0].MidUnitPrice * payPercentage / 100
 				}
 				v.Type = skuNameMap[v.ID].BrandID
+				skuList, _ := dao.GetSkus(db, nil, []int{v.ID}, nil, nil)
+				v.Skus = skuList
 				skuNameAndPlaceList = append(skuNameAndPlaceList, v)
 			}
 		}
@@ -2303,7 +2317,39 @@ func GetTopCategoriesByStoreIDs(ctx *jxcontext.Context, storeIDs []int) (skuCate
 
 func RefershStoreSkusMidPrice(ctx *jxcontext.Context, storeIDs []int) (err error) {
 	db := dao.GetDB()
-	_, err = dao.RefershStoreSkusMidPrice(db, storeIDs)
+	if len(storeIDs) == 0 {
+		return err
+	}
+	for _, v := range storeIDs {
+		var skuBindInfos []*StoreSkuBindInfo
+		store, err := dao.GetStoreDetail(db, v, -1)
+		if err != nil {
+			return err
+		}
+		var payPercentage int
+		if store.PayPercentage < 50 {
+			payPercentage = 70
+		} else {
+			payPercentage = store.PayPercentage
+		}
+		storeSkuList, err := dao.GetStoresSkusInfo(db, []int{v}, nil)
+		for _, storeSku := range storeSkuList {
+			priceReferList, err := dao.GetPriceReferSnapshotNoPage(db, []int{store.CityCode}, []int{storeSku.SkuID}, nil, utils.Time2Date(time.Now().AddDate(0, 0, -1)))
+			if err != nil {
+				return err
+			}
+			if len(priceReferList) > 0 {
+				if storeSku.UnitPrice > priceReferList[0].MidUnitPrice*payPercentage/100 {
+					skuBindInfo := &StoreSkuBindInfo{
+						NameID:    priceReferList[0].NameID,
+						UnitPrice: priceReferList[0].MidUnitPrice * payPercentage / 100,
+					}
+					skuBindInfos = append(skuBindInfos, skuBindInfo)
+				}
+			}
+		}
+		updateStoresSkusWithoutSync(ctx, db, []int{v}, skuBindInfos, false)
+	}
 	if err == nil {
 		CreateStorePriceScore(ctx)
 	}
@@ -2624,15 +2670,15 @@ func GetVendorStoreSkuPrice(ctx *jxcontext.Context, vendorIDs []int, skuID int,
 							outStoreSkuList []*partner.StoreSkuInfo
 						)
 						db := dao.GetDB()
-						skuNameList, err := dao.GetSkus(db, []int{skuID}, nil, nil, nil)
+						skuList, err := dao.GetSkusWithVendor(db, []int{vendorID}, []string{v}, nil, []int{skuID}, false)
 						if err != nil {
 							return retVal, err
 						}
 						if partner.IsMultiStore(vendorID) {
 							multiHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IMultipleStoresHandler)
 							storeDetail, err = multiHandler.ReadStore(ctx, v, vendorStoreID)
-							if len(skuNameList) > 0 {
+							if len(skuList) > 0 {
-								inStoreSku.VendorSkuID = utils.Int64ToStr(skuNameList[0].JdID)
+								inStoreSku.VendorSkuID = skuList[0].VendorSkuID
 							}
 						} else {
 							singleHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreHandler)
@@ -2652,7 +2698,7 @@ func GetVendorStoreSkuPrice(ctx *jxcontext.Context, vendorIDs []int, skuID int,
 									StoreID:     vendorStoreID,
 									StoreName:   storeDetail.Name,
 									SkuID:       skuID,
-									SkuName:     skuNameList[0].Name,
+									SkuName:     skuList[0].Name,
 									VendorPrice: "",
 								}
 								retVal = []DataVendorStoreSkuPrice{data}
@@ -2661,7 +2707,7 @@ func GetVendorStoreSkuPrice(ctx *jxcontext.Context, vendorIDs []int, skuID int,
 									StoreID:     vendorStoreID,
 									StoreName:   storeDetail.Name,
 									SkuID:       skuID,
-									SkuName:     skuNameList[0].Name,
+									SkuName:     skuList[0].Name,
 									VendorPrice: utils.Float64ToStr(utils.Str2Float64(utils.Int64ToStr(outStoreSkuList[0].VendorPrice)) / 100),
 								}
 								retVal = []DataVendorStoreSkuPrice{data}
@@ -2753,22 +2799,20 @@ func FocusStoreSkusByExcel(ctx *jxcontext.Context, files []*multipart.FileHeader
 
 func FocusStoreSkusByExcelBin(ctx *jxcontext.Context, reader io.Reader, isAsync, isContinueWhenError bool) (hint string, err error) {
 	var (
-		skuMap       = make(map[int]int)
+		skuMap  = make(map[int]int)
-		skuNameMap   = make(map[int]int)
+		db      = dao.GetDB()
-		skuBindInfos []*StoreSkuBindInfo
+		skuIDs  []int
-		db           = dao.GetDB()
+		result1 []interface{}
-		storeIDs     []int
-		skuIDs       []int
 	)
 	sheetParam := &SheetParam{
 		OutSkuIDCol: 1,
 		SkuPriceCol: 3,
 		SkuRow:      1,
 	}
-	// xlsx, err := excelize.OpenFile("111.xlsx")
 	taskSeqFunc := func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
 		switch step {
 		case 0:
+			// xlsx, err := excelize.OpenFile("111.xlsx")
 			xlsx, err := excelize.OpenReader(reader)
 			if err != nil {
 				return result, err
@@ -2785,43 +2829,72 @@ func FocusStoreSkusByExcelBin(ctx *jxcontext.Context, reader io.Reader, isAsync,
 				skuIDs = append(skuIDs, k)
 			}
 			skuList, err := dao.GetSkus(db, skuIDs, nil, nil, nil)
+			storeList, err := dao.GetStoreList(db, nil, nil, "")
 			if err != nil && len(skuList) == 0 {
 				return result, err
 			}
-			for _, v := range skuList {
+			taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+				store := batchItemList[0].(*model.Store)
 				var (
-					price       int
+					skuBindInfos []*StoreSkuBindInfo
-					specQuality float64
+					skuNameMap   = make(map[int]int)
+					skuInfoMap   = make(map[int][]*StoreSkuBindSkuInfo)
 				)
-				if v.Unit == model.SpecialUnit {
+				for _, v := range skuList {
-					if v.SpecUnit == model.SpecUnitNames[1] || v.SpecUnit == model.SpecUnitNames[2] {
+					var (
-						specQuality = float64(v.SpecQuality) * 1000
+						price       int
+						specQuality float64
+					)
+					focusList, _ := dao.GetStoreSkuBindByNameID(db, store.ID, v.NameID, model.StoreSkuBindStatusNormal)
+					//有关注过
+					if len(focusList) > 0 {
+						price = focusList[0].UnitPrice
+						skuInfoMap[v.NameID] = append(skuInfoMap[v.NameID], &StoreSkuBindSkuInfo{
+							SkuID:  v.ID,
+							IsSale: 1,
+						})
+						skuNameMap[v.NameID] = price
 					} else {
-						specQuality = float64(v.SpecQuality)
+						if v.Unit == model.SpecialUnit {
+							if v.SpecUnit == model.SpecUnitNames[1] || v.SpecUnit == model.SpecUnitNames[2] {
+								specQuality = float64(v.SpecQuality) * 1000
+							} else {
+								specQuality = float64(v.SpecQuality)
+							}
+							price = int(utils.Float64TwoInt64(utils.Int2Float64(model.SpecialSpecQuality) / specQuality * utils.Int2Float64(skuMap[v.ID])))
+						} else {
+							price = skuMap[v.ID]
+						}
+						if skuNameMap[v.NameID] < price {
+							skuNameMap[v.NameID] = price
+						}
 					}
-					price = int(utils.Float64TwoInt64(utils.Int2Float64(model.SpecialSpecQuality) / specQuality * utils.Int2Float64(skuMap[v.ID])))
-				} else {
-					price = skuMap[v.ID]
 				}
-				if skuNameMap[v.NameID] < price {
+				for k, v := range skuNameMap {
-					skuNameMap[v.NameID] = price
+					skuBindInfo := &StoreSkuBindInfo{
+						NameID:    k,
+						UnitPrice: v,
+						IsFocus:   1,
+						IsSale:    1,
+						Skus:      skuInfoMap[k],
+					}
+					skuBindInfos = append(skuBindInfos, skuBindInfo)
 				}
-			}
+				tUpdate := &tUpdateStoresSkus{
-			for k, v := range skuNameMap {
+					StoreID:      store.ID,
-				skuBindInfo := &StoreSkuBindInfo{
+					SkuBindInfos: skuBindInfos,
-					NameID:    k,
-					UnitPrice: v,
-					IsFocus:   1,
-					IsSale:    1,
 				}
-				skuBindInfos = append(skuBindInfos, skuBindInfo)
+				retVal = []*tUpdateStoresSkus{tUpdate}
-			}
+				return retVal, err
-			storeList, err := dao.GetStoreList(db, nil, nil, "")
-			for _, v := range storeList {
-				storeIDs = append(storeIDs, v.ID)
 			}
+			taskParallel := tasksch.NewParallelTask("根据skuID关注商品", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx, taskFunc, storeList)
+			tasksch.HandleTask(taskParallel, task, true).Run()
+			result1, _ = taskParallel.GetResult(0)
 		case 2:
-			UpdateStoresSkus(ctx, storeIDs, skuBindInfos, false, isAsync, isContinueWhenError)
+			for _, v := range result1 {
+				tUpdate := v.(*tUpdateStoresSkus)
+				UpdateStoresSkus(ctx, []int{tUpdate.StoreID}, tUpdate.SkuBindInfos, false, isAsync, isContinueWhenError)
+			}
 		}
 		return result, err
 	}
@@ -2854,9 +2927,9 @@ func GetCellForFocusStoreSkus(db *dao.DaoDB, rowNum int, row []string, sheetPara
 
 func FocusStoreSkusBySku(ctx *jxcontext.Context, skuIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
 	var (
-		skuBindInfos []*StoreSkuBindInfo
+		skuNameMap = make(map[int][]*StoreSkuBindSkuInfo)
-		skuNameMap   = make(map[int][]*StoreSkuBindSkuInfo)
+		storeIDs   []int
-		storeIDs     []int
+		result1    []interface{}
 	)
 	db := dao.GetDB()
 	skuList, err := dao.GetSkus(db, skuIDs, nil, nil, nil)
@@ -2876,26 +2949,48 @@ func FocusStoreSkusBySku(ctx *jxcontext.Context, skuIDs []int, isAsync, isContin
 		case 1:
 			taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 				store := batchItemList[0].(*model.Store)
+				var skuBindInfos []*StoreSkuBindInfo
 				for k, v := range skuNameMap {
-					midPrice, _ := dao.GetMidPriceByNameID(db, store.CityCode, k, utils.Time2Date(time.Now().AddDate(0, 0, -1)))
+					var price int
+					focusList, _ := dao.GetStoreSkuBindByNameID(db, store.ID, k, model.StoreSkuBindStatusNormal)
+					//有关注过
+					if len(focusList) > 0 {
+						price = focusList[0].UnitPrice
+					} else {
+						var payPercentage int
+						if store.PayPercentage < 50 {
+							payPercentage = 70
+						} else {
+							payPercentage = store.PayPercentage
+						}
+						priceReferList, _ := dao.GetPriceReferSnapshotNoPage(db, []int{store.CityCode}, nil, []int{k}, utils.Time2Date(time.Now().AddDate(0, 0, -1)))
+						if len(priceReferList) > 0 {
+							price = priceReferList[0].MidUnitPrice * payPercentage / 100
+						}
+					}
 					skuBindInfo := &StoreSkuBindInfo{
 						NameID:    k,
-						UnitPrice: midPrice,
+						UnitPrice: price,
 						IsFocus:   1,
 						Skus:      v,
 					}
-					retVal = []*StoreSkuBindInfo{skuBindInfo}
+					skuBindInfos = append(skuBindInfos, skuBindInfo)
 				}
+				tUpdate := &tUpdateStoresSkus{
+					StoreID:      store.ID,
+					SkuBindInfos: skuBindInfos,
+				}
+				retVal = []*tUpdateStoresSkus{tUpdate}
 				return retVal, err
 			}
 			taskParallel := tasksch.NewParallelTask("根据skuID部分关注商品", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx, taskFunc, storeList)
 			tasksch.HandleTask(taskParallel, task, true).Run()
-			result1, _ := taskParallel.GetResult(0)
+			result1, _ = taskParallel.GetResult(0)
-			for _, v := range result1 {
-				skuBindInfos = append(skuBindInfos, v.(*StoreSkuBindInfo))
-			}
 		case 2:
-			UpdateStoresSkus(ctx, storeIDs, skuBindInfos, false, isAsync, isContinueWhenError)
+			for _, v := range result1 {
+				tUpdate := v.(*tUpdateStoresSkus)
+				UpdateStoresSkus(ctx, []int{tUpdate.StoreID}, tUpdate.SkuBindInfos, false, isAsync, isContinueWhenError)
+			}
 		}
 		return result, err
 	}
@@ -2909,3 +3004,136 @@ func FocusStoreSkusBySku(ctx *jxcontext.Context, skuIDs []int, isAsync, isContin
 	}
 	return hint, err
 }
+
+func AutoFocusStoreSkusWithoutFocusForTopSkus(ctx *jxcontext.Context) (err error) {
+	db := dao.GetDB()
+	storeList, err := dao.GetStoreList(db, nil, nil, "")
+	for _, v := range storeList {
+		var (
+			skuName         []*model.SkuName
+			skuNameMap      = make(map[int]int)
+			skuBindInfoList []*StoreSkuBindInfo
+		)
+		sql := `
+			SELECT DISTINCT a.name_id id
+			FROM sku a
+			LEFT JOIN (SELECT DISTINCT b.name_id 
+						FROM store_sku_bind a
+						JOIN sku b ON a.sku_id = b.id
+						WHERE a.deleted_at = ?
+						AND store_id = ?)b ON a.name_id = b.name_id
+			WHERE a.status = ?	
+			AND a.deleted_at = ?
+			AND b.name_id IS NULL
+		`
+		sqlParams := []interface{}{
+			utils.DefaultTimeValue,
+			v.ID,
+			model.SkuStatusNormal,
+			utils.DefaultTimeValue,
+		}
+		err = dao.GetRows(db, &skuName, sql, sqlParams...)
+		for _, v := range skuName {
+			skuNameMap[v.ID] = v.ID
+		}
+		skuNameAndPlaceList, err2 := GetTopSkusByCityCode(ctx, v.CityCode, v.ID)
+		if err2 != nil {
+			return err2
+		}
+		var payPercentage int
+		if v.PayPercentage < 50 {
+			payPercentage = 70
+		} else {
+			payPercentage = v.PayPercentage
+		}
+		if len(skuNameAndPlaceList) > 0 {
+			for _, v := range skuNameAndPlaceList {
+				if skuNameMap[v.ID] != 0 {
+					priceReferList, err := dao.GetPriceReferSnapshotNoPage(db, []int{v.CityCode}, nil, []int{v.ID}, utils.Time2Date(time.Now().AddDate(0, 0, -1)))
+					if err == nil && len(priceReferList) > 0 {
+						storeSkuBindInfo := &StoreSkuBindInfo{
+							NameID:    v.ID,
+							UnitPrice: priceReferList[0].MidUnitPrice * payPercentage / 100,
+							IsFocus:   1,
+							IsSale:    0,
+						}
+						skuBindInfoList = append(skuBindInfoList, storeSkuBindInfo)
+					}
+				}
+			}
+		}
+		UpdateStoreSkus(ctx, v.ID, skuBindInfoList, true, true)
+	}
+	return err
+}
+
+func AutoFocusStoreSkusWithoutFocus(ctx *jxcontext.Context, skuIDs []int, isSync bool) (err error) {
+	var (
+		nameMap = make(map[int]*StoreSkuBindInfo)
+	)
+	db := dao.GetDB()
+	storeList, err := dao.GetStoreList(db, nil, nil, "")
+	for _, v := range storeList {
+		storeSkuList, _ := dao.GetStoreSkusAndSkuName(db, []int{v.ID}, skuIDs, nil)
+		for _, vv := range storeSkuList {
+			if nameMap[vv.ID] != nil {
+				nameMap[vv.ID].Skus = append(nameMap[vv.ID].Skus, &StoreSkuBindSkuInfo{
+					SkuID: vv.SkuID,
+				})
+			} else {
+				skuBindInfo := &StoreSkuBindInfo{
+					UnitPrice: vv.UnitPrice,
+					NameID:    vv.ID,
+					StoreID:   v.ID,
+					Skus:      []*StoreSkuBindSkuInfo{},
+				}
+				nameMap[vv.ID] = skuBindInfo
+			}
+		}
+	}
+	for _, v := range nameMap {
+		var skuBindInfoList []*StoreSkuBindInfo
+		skuBindInfoResult := &StoreSkuBindInfo{
+			NameID:    v.NameID,
+			UnitPrice: v.UnitPrice,
+			IsFocus:   1,
+		}
+		var skuBindSkuList []*StoreSkuBindSkuInfo
+		skuMap := make(map[int]int)
+		skuList, _ := dao.GetSkus(db, nil, []int{v.NameID}, nil, nil)
+		if len(v.Skus) != len(skuList) {
+			for _, skus := range v.Skus {
+				skuMap[skus.SkuID] = 1
+			}
+			for _, vv := range skuList {
+				if skuMap[vv.ID] != 1 {
+					continue
+				}
+				skuBindSkuList = append(skuBindSkuList, &StoreSkuBindSkuInfo{
+					SkuID:  vv.ID,
+					IsSale: 0,
+				})
+			}
+		}
+		skuBindInfoList = append(skuBindInfoList, skuBindInfoResult)
+		if isSync {
+			UpdateStoreSkus(ctx, v.StoreID, skuBindInfoList, true, true)
+		} else {
+			updateStoresSkusWithoutSync(ctx, db, []int{v.StoreID}, skuBindInfoList, false)
+		}
+	}
+	return err
+}
+func UpdateStoreSkuNamePrice(ctx *jxcontext.Context, storeID, nameID, unitPrice int, isAsync bool) (hint string, err error) {
+	// db := dao.GetDB()
+	// skuList, err := dao.GetSkus(db, nil, []int{nameID}, nil, nil)
+	// if err != nil || len(skuList) == 0 {
+	// 	return "", err
+	// }
+	// var skuIDs []int
+	// for _, v := range skuList {
+	// 	skuIDs = append(skuIDs, v.ID)
+	// }
+	// actStoreSkuList, err :=dao.GetEffectiveActStoreSkuInfo(db, 0, nil, model.ActSkuDirectDown, []int{storeID}, skuIDs, time.Now(),time.Now())
+	return hint, err
+}

business/jxstore/cms/sync.go

@@ -218,20 +218,16 @@ func (v *VendorSync) SyncReorderCategories(ctx *jxcontext.Context, db *dao.DaoDB
 // 	return "", err
 // }
 
-func (v *VendorSync) SyncStore(ctx *jxcontext.Context, db *dao.DaoDB, vendorID, storeID int, isAsync bool, userName string) (hint string, err error) {
+func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs, storeIDs []int, mustDirty, isAsync bool) (hint string, err error) {
-	globals.SugarLogger.Debugf("SyncStore, storeID:%d", storeID)
+	globals.SugarLogger.Debugf("SyncStore2, storeIDs:%d", storeIDs)
-	var vendorIDs []int
+	userName := ctx.GetUserName()
-	if vendorID != -1 {
+	isManageIt := len(storeIDs) == 0 || len(storeIDs) > 5
-		vendorIDs = []int{
+	_, hint, err = v.LoopStoresMap2(ctx, db, fmt.Sprintf("同步门店信息:%v", storeIDs), isAsync, isManageIt, vendorIDs, storeIDs, mustDirty, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (resultList interface{}, err error) {
-			vendorID,
-		}
-	}
-	hint, err = v.LoopStoresMap(ctx, db, fmt.Sprintf("同步门店信息:%d", storeID), isAsync, false, vendorIDs, []int{storeID}, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (resultList interface{}, err error) {
 		loopMapInfo := batchItemList[0].(*LoopStoreMapInfo)
 		handler := v.GetStoreHandler(loopMapInfo.VendorID)
 		if handler != nil {
 			if len(loopMapInfo.StoreMapList) > 1 {
-				loopStoreTask := tasksch.NewParallelTask(fmt.Sprintf("处理平台%s", model.VendorChineseNames[loopMapInfo.VendorID]), nil, ctx,
+				loopStoreTask := tasksch.NewParallelTask(fmt.Sprintf("处理平台%s", model.VendorChineseNames[loopMapInfo.VendorID]), tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,
 					func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 						var resultList []interface{}
 						storeMap := batchItemList[0].(*model.StoreMap)
@@ -265,6 +261,16 @@ func (v *VendorSync) SyncStore(ctx *jxcontext.Context, db *dao.DaoDB, vendorID,
 	return hint, makeSyncError(err)
 }
 
+func (v *VendorSync) SyncStore(ctx *jxcontext.Context, db *dao.DaoDB, vendorID, storeID int, isAsync bool, userName string) (hint string, err error) {
+	var vendorIDs []int
+	if vendorID != -1 {
+		vendorIDs = []int{
+			vendorID,
+		}
+	}
+	return v.SyncStore2(ctx, db, vendorIDs, []int{storeID}, false, isAsync)
+}
+
 func (v *VendorSync) SyncSku(ctx *jxcontext.Context, db *dao.DaoDB, nameID, skuID int, isAsync, isContinueWhenError bool, userName string) (hint string, err error) {
 	var (
 		nameIDs []int
@@ -417,7 +423,7 @@ func (v *VendorSync) SyncStoresCategory(ctx *jxcontext.Context, db *dao.DaoDB, v
 func (v *VendorSync) SyncStoresSkus2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs []int, storeIDs []int, syncDisabled bool, skuIDs, excludeSkuIDs []int, setSyncStatus int, isAsync, isContinueWhenError bool) (hint string, err error) {
 	globals.SugarLogger.Debug("SyncStoresSkus2")
 	isManageIt := len(storeIDs) != 1 || len(skuIDs) == 0 || len(skuIDs) > 8
-	task, hint, err := v.LoopStoresMap2(ctx, db, fmt.Sprintf("同步门店商品信息:%v", storeIDs), isAsync, isManageIt, vendorIDs, storeIDs,
+	task, hint, err := v.LoopStoresMap2(ctx, db, fmt.Sprintf("同步门店商品信息:%v", storeIDs), isAsync, isManageIt, vendorIDs, storeIDs, false,
 		func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
 			loopMapInfo := batchItemList[0].(*LoopStoreMapInfo)
 			if handler := v.GetStoreHandler(loopMapInfo.VendorID); handler != nil {
@@ -594,9 +600,9 @@ func (v *VendorSync) AmendAndPruneStoreStuff(ctx *jxcontext.Context, vendorIDs [
 	return hint, makeSyncError(err)
 }
 
-func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, db *dao.DaoDB, taskName string, isAsync, isManageIt bool, vendorIDs []int, storeIDs []int, handler tasksch.WorkFunc, isContinueWhenError bool) (task tasksch.ITask, hint string, err error) {
+func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, db *dao.DaoDB, taskName string, isAsync, isManageIt bool, vendorIDs []int, storeIDs []int, mustDirty bool, handler tasksch.WorkFunc, isContinueWhenError bool) (task tasksch.ITask, hint string, err error) {
 	var storeMapList []*model.StoreMap
-	if storeMapList, err = dao.GetStoresMapList(db, vendorIDs, storeIDs, model.StoreStatusAll, model.StoreIsSyncYes, ""); err != nil {
+	if storeMapList, err = dao.GetStoresMapList2(db, vendorIDs, storeIDs, model.StoreStatusAll, model.StoreIsSyncYes, "", mustDirty); err != nil {
 		return nil, "", err
 	}
 	if len(storeMapList) == 0 {
@@ -618,7 +624,6 @@ func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, db *dao.DaoDB, taskN
 	if len(loopInfoList) == 1 {
 		taskName = fmt.Sprintf("%s,处理平台%s", taskName, model.VendorChineseNames[loopInfoList[0].VendorID])
 	}
-	// globals.SugarLogger.Debugf("LoopStoresMap2 loopInfoList:%s", utils.Format4Output(loopInfoList, false))
 	task = tasksch.NewParallelTask(taskName, tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, handler, loopInfoList)
 	task.SetFinishHook(func(task tasksch.ITask, ctx *jxcontext.Context) {
 		err = WirteToExcelBySyncFailed(task, ctx)
@@ -640,7 +645,7 @@ func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, db *dao.DaoDB, taskN
 }
 
 func (v *VendorSync) LoopStoresMap(ctx *jxcontext.Context, db *dao.DaoDB, taskName string, isAsync, isManageIt bool, vendorIDs []int, storeIDs []int, handler tasksch.WorkFunc, isContinueWhenError bool) (hint string, err error) {
-	_, hint, err = v.LoopStoresMap2(ctx, db, taskName, isAsync, isManageIt, vendorIDs, storeIDs, handler, isContinueWhenError)
+	_, hint, err = v.LoopStoresMap2(ctx, db, taskName, isAsync, isManageIt, vendorIDs, storeIDs, false, handler, isContinueWhenError)
 	return hint, err
 }
 

business/jxstore/cms/sync2.go

@@ -379,23 +379,23 @@ func OnThingSync(ctx *jxcontext.Context, db *dao.DaoDB, thingMap *model.ThingMap
 }
 
 func updateThingMapEntity(db *dao.DaoDB, thingMap *model.ThingMap) {
-	if thingMap.VendorOrgCode == globals.JdOrgCode {
+	// if thingMap.VendorOrgCode == globals.JdOrgCode {
-		if thingMap.ThingType == model.ThingTypeCategory {
+	// 	if thingMap.ThingType == model.ThingTypeCategory {
-			cat := &model.SkuCategory{
+	// 		cat := &model.SkuCategory{
-				JdID:         utils.Str2Int64WithDefault(thingMap.VendorThingID, 0),
+	// 			JdID:         utils.Str2Int64WithDefault(thingMap.VendorThingID, 0),
-				JdSyncStatus: thingMap.SyncStatus,
+	// 			JdSyncStatus: thingMap.SyncStatus,
-			}
+	// 		}
-			cat.ID = int(thingMap.ThingID)
+	// 		cat.ID = int(thingMap.ThingID)
-			dao.UpdateEntity(db, cat, "JdID", "JdSyncStatus")
+	// 		dao.UpdateEntity(db, cat, "JdID", "JdSyncStatus")
-		} else if thingMap.ThingType == model.ThingTypeSku {
+	// 	} else if thingMap.ThingType == model.ThingTypeSku {
-			sku := &model.Sku{
+	// 		sku := &model.Sku{
-				JdID:         utils.Str2Int64WithDefault(thingMap.VendorThingID, 0),
+	// 			JdID:         utils.Str2Int64WithDefault(thingMap.VendorThingID, 0),
-				JdSyncStatus: thingMap.SyncStatus,
+	// 			JdSyncStatus: thingMap.SyncStatus,
-			}
+	// 		}
-			sku.ID = int(thingMap.ThingID)
+	// 		sku.ID = int(thingMap.ThingID)
-			dao.UpdateEntity(db, sku, "JdID", "JdSyncStatus")
+	// 		dao.UpdateEntity(db, sku, "JdID", "JdSyncStatus")
-		}
+	// 	}
-	}
+	// }
 }
 
 func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorID int, vendorOrgCode string, isAsync, isContinueWhenError bool, opType int, isForceUpdate bool) (hint string, err error) {

business/jxstore/cms/sync_store_sku.go

@@ -225,10 +225,23 @@ func calVendorPrice4StoreSku(inSku *dao.StoreSkuSyncInfo, pricePercentagePack mo
 	return inSku
 }
 
+func getSkuBoxFee(vendorID int) (boxFee int64) {
+	if vendorID == model.VendorIDMTWM {
+		boxFee, _ = dao.GetSysConfigAsInt64(dao.GetDB(), model.ConfigSysMtwmSkuBoxFee)
+	}
+	return boxFee
+}
+
 func formalizeStoreSkuList(inSkuList []*dao.StoreSkuSyncInfo) []*dao.StoreSkuSyncInfo {
-	for _, skuItem := range inSkuList {
+	if len(inSkuList) > 0 {
-		skuItem.MergedStatus = jxutils.MergeSkuStatus(skuItem.Status, skuItem.StoreSkuStatus)
+		boxFee := getSkuBoxFee(inSkuList[0].VendorID)
-		skuItem.SkuName = jxutils.ComposeSkuNameSync(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 0, skuItem.ExPrefix, skuItem.ExPrefixBegin, skuItem.ExPrefixEnd)
+		for _, skuItem := range inSkuList {
+			if skuItem.VendorPrice > skuItem.BoxFee {
+				skuItem.BoxFee = boxFee
+			}
+			skuItem.MergedStatus = jxutils.MergeSkuStatus(skuItem.Status, skuItem.StoreSkuStatus)
+			skuItem.SkuName = jxutils.ComposeSkuNameSync(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 0, skuItem.ExPrefix, skuItem.ExPrefixBegin, skuItem.ExPrefixEnd)
+		}
 	}
 	return inSkuList
 }
@@ -244,7 +257,7 @@ func sku2Update(vendorID int, sku *dao.StoreSkuSyncInfo, syncStatus int8) (item
 			kvs[dao.GetVendorThingIDStructField(model.VendorNames[vendorID])] = utils.Str2Int64WithDefault(sku.VendorSkuID, 0)
 		} else if model.IsSyncStatusDelete(syncStatus) {
 			sku.SkuSyncStatus = 0
-			if utils.IsTimeZero(sku.BindDeletedAt) && (sku.ID == 0 || sku.NameID == 0) {
+			if utils.IsTimeZero(sku.BindDeletedAt) && (sku.NameID == 0) {
 				kvs[model.FieldDeletedAt] = time.Now()
 			}
 			if !dao.IsVendorThingIDEmpty(sku.VendorSkuID) && !partner.IsMultiStore(vendorID) {

business/jxstore/cms/user2.go

@@ -146,26 +146,48 @@ func init() {
 	auth2.Init(userProvider)
 }
 
-func RegisterUserWithMobile(ctx *jxcontext.Context, user *model.User, mobileVerifyCode string, inAuthInfo *auth2.AuthInfo) (outAuthInfo *auth2.AuthInfo, err error) {
+func RegisterUserWithMobile(ctx *jxcontext.Context, user *model.User, mobileVerifyCode string, inAuthInfo, manTokenInfo *auth2.AuthInfo) (outAuthInfo *auth2.AuthInfo, err error) {
 	var mobileAuth *auth2.AuthInfo
+	fakeMobile := false
+	user.Type = model.UserTypeConsumer
+	createName := ctx.GetRealRemoteIP()
+	authType := auth2.AuthTypeMobile
+	if manTokenInfo != nil && mobileVerifyCode == "" {
+		manUser, err2 := dao.GetUserByID(dao.GetDB(), "user_id", manTokenInfo.GetID())
+		if err = err2; err != nil {
+			return nil, err
+		}
+		if manUser.Type&(model.UserTypeOperator|model.UserTypeBoss) == 0 {
+			return nil, fmt.Errorf("管理员才能添加商户")
+		}
+		if utils.Pointer2String(user.Mobile) == "" {
+			return nil, fmt.Errorf("管理员添加必须指定用户手机号")
+		}
+		mobileVerifyCode = auth2.InternalAuthSecret
+		fakeMobile = true
+		user.Type |= model.UserTypeStoreBoss
+		createName = manTokenInfo.GetName()
+	}
+
 	if mobileVerifyCode != "" {
-		mobileAuth, err = auth2.Login(ctx.Context, auth2.AuthTypeMobile, user.GetMobile(), auth2.UserIDMobile, mobileVerifyCode)
+		if fakeMobile {
+			mobileAuth, err = auth2.LoginInternal(ctx.Context, auth2.AuthTypeMobile, user.GetMobile(), auth2.UserIDMobile, mobileVerifyCode)
+		} else {
+			mobileAuth, err = auth2.Login(ctx.Context, auth2.AuthTypeMobile, user.GetMobile(), auth2.UserIDMobile, mobileVerifyCode)
+		}
 		if err != nil {
 			return nil, err
 		}
 		if mobileAuth != nil && !mobileAuth.IsUserEmpty() {
 			return nil, jsonerr.New(mobileAuth, model.ErrCodeJsonUserAlreadyExist)
 		}
-	} else {
+	} else if inAuthInfo != nil {
-		if inAuthInfo == nil {
-			return nil, fmt.Errorf("短信验证码与其它认证方式至少要指定一种")
-		}
 		user.Mobile = nil
+	} else {
+		return nil, fmt.Errorf("短信验证码与其它认证方式至少要指定一种")
 	}
-	createName := ctx.GetRealRemoteIP()
+
-	authType := auth2.AuthTypeMobile
 	if inAuthInfo != nil {
-		user.Type = model.UserTypeConsumer
 		if inAuthInfo.AuthBindInfo.Type == dingding.AuthTypeStaff {
 			user.Type |= model.UserTypeOperator
 		} else if user.Mobile != nil {

business/jxstore/event/event.go

@@ -0,0 +1,9 @@
+package event
+
+func AddOperateEvent() {
+
+}
+
+func AddOperateEventDetail() {
+
+}

business/jxstore/misc/misc.go

@@ -141,7 +141,7 @@ func Init() {
 			cms.CurVendorSync.ChangeStoreSkuSaleStatus(jxcontext.AdminCtx, 0, true, true)
 		}, ChangeStoreSkuSaleStatusList)
 		ScheduleTimerFunc("BeginSavePriceRefer", func() {
-			report.BeginSavePriceRefer(jxcontext.AdminCtx, nil, nil)
+			report.BeginSavePriceRefer(jxcontext.AdminCtx, nil, nil, true, true)
 		}, priceReferTimeList)
 		ScheduleTimerFunc("CreateStorePriceScore", func() {
 			cms.CreateStorePriceScore(jxcontext.AdminCtx)
@@ -183,8 +183,8 @@ func syncStoreSku() {
 					})
 				errList.AddErr(err)
 
-				// cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, db, partner.GetMultiStoreVendorIDs(), nil, false, nil, []int{27379}, syncFlag, true, true)
+				_, err = cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, db, partner.GetMultiStoreVendorIDs(), nil, false, nil, []int{27379}, syncFlag, true, true)
-				_, err = cms.CurVendorSync.FullSyncStoresSkus(jxcontext.AdminCtx, db, partner.GetMultiStoreVendorIDs(), nil, false, []int{27379}, true, true)
+				// _, err = cms.CurVendorSync.FullSyncStoresSkus(jxcontext.AdminCtx, db, partner.GetMultiStoreVendorIDs(), nil, false, []int{27379}, true, true)
 				errList.AddErr(err)
 			case 1:
 				errList.AddErr(cms.SetSingleStoreSkuSyncModifyStatus(db, partner.GetSingleStoreVendorIDs()))
@@ -208,13 +208,15 @@ func doDailyWork() {
 	cms.SyncStoresCourierInfo(jxcontext.AdminCtx, nil, false, true)
 	netprinter.RebindAllPrinters(jxcontext.AdminCtx, false, true)
 
+	cms.CurVendorSync.SyncStore2(jxcontext.AdminCtx, dao.GetDB(), nil, nil, true, true)
+
 	syncStoreSku()
 
 	InitEx()
 
 	// 每天补全前一天与当天的订单
 	curDate := utils.Time2Date(time.Now())
-	orderman.FixedOrderManager.AmendMissingOrders(jxcontext.AdminCtx, nil, 0, curDate.Add(-24*time.Hour), curDate, true, true)
+	orderman.FixedOrderManager.AmendMissingOrders(jxcontext.AdminCtx, nil, 0, curDate.Add(-72*time.Hour), curDate, true, true)
 	//订单门店归属补漏
 	//fromDate, toDate都不传默认刷新当前天5天以前的订单，只传fromDate默认刷新fromDate到当天的订单
 	//只传toDate默认刷新toDate到5天以前的订单

business/jxstore/report/report.go

@@ -4,9 +4,10 @@ import (
 	"errors"
 	"fmt"
 	"math"
+	"sort"
 	"time"
 
-	"git.rosy.net.cn/jx-callback/globals"
+	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
 
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
@@ -14,6 +15,14 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 )
 
+type tStoreSkuBindAndSkuName struct {
+	CityCode      int
+	StoreID       int `orm:"column(store_id)"`
+	NameID        int `orm:"column(name_id)"`
+	UnitPrice     int
+	UnitPriceList []int
+}
+
 func GetStatisticsReportForOrders(ctx *jxcontext.Context, storeIDs []int, fromDate string, toDate string) (statisticsReportForOrdersList []*dao.StatisticsReportForOrdersList, err error) {
 	db := dao.GetDB()
 	fromDateParm := utils.Str2Time(fromDate)
@@ -44,7 +53,7 @@ func StatisticsReportForStoreSkusPrice(ctx *jxcontext.Context, cityCodes, skuIDs
 	if snapDate != "" {
 		snapDateParam = utils.Str2Time(snapDate)
 	}
-	priceReferSnapshot, totalCount, err := dao.GetPriceReferSnapshot(db, cityCodes, skuIDs, snapDateParam, offset, pageSize)
+	priceReferSnapshot, totalCount, err := dao.GetPriceReferSnapshot(db, cityCodes, skuIDs, 0, snapDateParam, offset, pageSize)
 	pagedInfo = &model.PagedInfo{
 		Data:       priceReferSnapshot,
 		TotalCount: totalCount,
@@ -52,33 +61,212 @@ func StatisticsReportForStoreSkusPrice(ctx *jxcontext.Context, cityCodes, skuIDs
 	return
 }
 
-func BeginSavePriceRefer(ctx *jxcontext.Context, cityCodes, skuIDs []int) (err error) {
+func BeginSavePriceRefer(ctx *jxcontext.Context, cityCodes, skuIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
+	var priceReferSnapshotList []*model.PriceReferSnapshot
 	db := dao.GetDB()
 	snapshotAt := utils.Time2Date(time.Now().AddDate(0, 0, -1))
-	priceReferSnapshot, err := dao.GetStatisticsReportForStoreSkusPrice(db, cityCodes, skuIDs)
+	taskSeqFunc := func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
-	if len(priceReferSnapshot) > 0 {
+		switch step {
-		dao.Begin(db)
+		case 0:
-		defer func() {
+			priceReferSnapshot, err := dao.GetStatisticsReportForStoreSkusPrice(db, cityCodes, skuIDs)
-			if r := recover(); r != nil || err != nil {
+			if len(priceReferSnapshot) > 0 {
-				dao.Rollback(db)
+				dao.Begin(db)
-				if r != nil {
+				defer func() {
-					panic(r)
+					if r := recover(); r != nil || err != nil {
+						dao.Rollback(db)
+						if r != nil {
+							panic(r)
+						}
+					}
+				}()
+				dao.DeletePriceReferHistory(db, utils.Time2Date(snapshotAt.AddDate(0, 0, -7)))
+				priceReferSnapshotDelete := &model.PriceReferSnapshot{SnapshotAt: snapshotAt}
+				dao.DeleteEntity(db, priceReferSnapshotDelete, "SnapshotAt")
+				taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+					v := batchItemList[0].(*model.PriceReferSnapshot)
+					dao.WrapAddIDCULDEntity(v, ctx.GetUserName())
+					v.SnapshotAt = snapshotAt
+					err = dao.CreateEntity(db, v)
+					return retVal, err
+				}
+				taskParallel := tasksch.NewParallelTask("生成价格统计", tasksch.NewParallelConfig(), ctx, taskFunc, priceReferSnapshot)
+				tasksch.HandleTask(taskParallel, task, true).Run()
+				_, err = taskParallel.GetResult(0)
+				dao.Commit(db)
+			}
+		case 1:
+			priceReferSnapshotList, err = dao.GetPriceReferSnapshotNoPage(db, nil, nil, nil, snapshotAt)
+			var (
+				citySkuMap       = make(map[int]map[int][]int)
+				countryMap       = make(map[int][]int)
+				resultMap        = make(map[int]map[int]*model.PriceReferSnapshot)
+				resultCountryMap = make(map[int]*model.PriceReferSnapshot)
+			)
+			storeList, err := dao.GetStoreList(db, nil, nil, "")
+			if err != nil {
+				return result, err
+			}
+			for _, v := range storeList {
+				var tList []*tStoreSkuBindAndSkuName
+				sql := `
+				SELECT DISTINCT b.city_code, a.store_id, Round(a.unit_price/IF(b.pay_percentage < 50 , 70, b.pay_percentage) * 100) AS unit_price, c.name_id
+				FROM store_sku_bind a
+				JOIN store b ON b.id = a.store_id AND b.deleted_at = ? AND b.status != ?
+				JOIN sku c ON c.id = a.sku_id
+				WHERE a.store_id = ? 
+				AND c.name_id NOT IN(
+				SELECT b.name_id
+							FROM store_sku_bind a
+							JOIN sku b ON a.sku_id = b.id AND b.deleted_at = ?
+							WHERE a.deleted_at = ?
+							AND a.store_id = ?
+							AND b.name_id NOT IN(SELECT DISTINCT b.name_id
+												FROM store_sku_bind a
+												JOIN sku b ON a.sku_id = b.id AND b.deleted_at = ?
+												WHERE a.deleted_at = ?
+												AND a.store_id = ?
+												AND a.status = ?)
+												)
+				AND a.deleted_at = ?
+				`
+				sqlParams := []interface{}{
+					utils.DefaultTimeValue,
+					model.StoreStatusDisabled,
+					v.ID,
+					utils.DefaultTimeValue,
+					utils.DefaultTimeValue,
+					v.ID,
+					utils.DefaultTimeValue,
+					utils.DefaultTimeValue,
+					v.ID,
+					model.StoreSkuBindStatusNormal,
+					utils.DefaultTimeValue,
+				}
+				dao.GetRows(db, &tList, sql, sqlParams...)
+				skuNameMap := make(map[int][]int)
+				if len(tList) > 0 {
+					for _, vv := range tList {
+						skuNameMap[vv.NameID] = append(skuNameMap[vv.NameID], vv.UnitPrice)
+						countryMap[vv.NameID] = append(countryMap[vv.NameID], vv.UnitPrice)
+					}
+					if citySkuMap[v.CityCode] != nil {
+						for nameID, unitPriceList := range skuNameMap {
+							if citySkuMap[v.CityCode][nameID] != nil {
+								citySkuMap[v.CityCode][nameID] = append(citySkuMap[v.CityCode][nameID], unitPriceList...)
+							} else {
+								citySkuMap[v.CityCode][nameID] = unitPriceList
+							}
+						}
+					} else {
+						citySkuMap[v.CityCode] = skuNameMap
+					}
 				}
 			}
-		}()
+			for k, v := range countryMap {
-		priceReferSnapshotDeleteHis := &model.PriceReferSnapshot{SnapshotAt: snapshotAt.AddDate(0, -1, 0)}
+				var midUnitPrice int
-		priceReferSnapshotDelete := &model.PriceReferSnapshot{SnapshotAt: snapshotAt}
+				var avgUnitPrice int
-		dao.DeleteEntity(db, priceReferSnapshotDeleteHis, "SnapshotAt")
+				sort.Ints(v)
-		dao.DeleteEntity(db, priceReferSnapshotDelete, "SnapshotAt")
+				if len(v)%2 == 0 {
-		for _, v := range priceReferSnapshot {
+					midUnitPrice = v[len(v)/2-1]
-			dao.WrapAddIDCULDEntity(v, ctx.GetUserName())
+				} else {
-			v.SnapshotAt = snapshotAt
+					midUnitPrice = v[len(v)/2]
-			if err = dao.CreateEntity(db, v); err != nil {
+				}
-				return err
+				for _, vv := range v {
+					avgUnitPrice += vv
+				}
+				priceRefer := &model.PriceReferSnapshot{
+					MidUnitPrice: midUnitPrice,
+					MaxUnitPrice: v[len(v)-1],
+					MinUnitPrice: v[0],
+					AvgUnitPrice: avgUnitPrice / len(v),
+				}
+				resultCountryMap[k] = priceRefer
 			}
+			for k1, v := range citySkuMap {
+				skuNameMap := make(map[int]*model.PriceReferSnapshot)
+				for k2, _ := range v {
+					var midUnitPrice int
+					var avgUnitPrice int
+					sort.Ints(v[k2])
+					if len(v[k2])%2 == 0 {
+						midUnitPrice = v[k2][len(v[k2])/2-1]
+					} else {
+						midUnitPrice = v[k2][len(v[k2])/2]
+					}
+					for _, vv := range v[k2] {
+						avgUnitPrice += vv
+					}
+					skuNameMap[k2] = &model.PriceReferSnapshot{
+						MidUnitPrice: midUnitPrice,
+						MaxUnitPrice: v[k2][len(v[k2])-1],
+						MinUnitPrice: v[k2][0],
+						AvgUnitPrice: avgUnitPrice / len(v[k2]),
+					}
+				}
+				resultMap[k1] = skuNameMap
+			}
+			dao.Begin(db)
+			defer func() {
+				if r := recover(); r != nil || err != nil {
+					dao.Rollback(db)
+					if r != nil {
+						panic(r)
+					}
+				}
+			}()
+			if len(priceReferSnapshotList) > 0 {
+				for _, v := range priceReferSnapshotList {
+					if v.CityCode == 0 {
+						if resultCountryMap[v.NameID] != nil {
+							v.MidUnitPrice = resultCountryMap[v.NameID].MidUnitPrice
+							v.MaxUnitPrice = resultCountryMap[v.NameID].MaxUnitPrice
+							v.AvgUnitPrice = resultCountryMap[v.NameID].AvgUnitPrice
+							v.MinUnitPrice = resultCountryMap[v.NameID].MinUnitPrice
+							dao.UpdateEntity(db, v, "MidUnitPrice", "MaxUnitPrice", "MinUnitPrice", "AvgUnitPrice")
+						}
+						continue
+					}
+					if resultMap[v.CityCode][v.NameID] != nil {
+						v.MidUnitPrice = resultMap[v.CityCode][v.NameID].MidUnitPrice
+						v.MaxUnitPrice = resultMap[v.CityCode][v.NameID].MaxUnitPrice
+						v.AvgUnitPrice = resultMap[v.CityCode][v.NameID].AvgUnitPrice
+						v.MinUnitPrice = resultMap[v.CityCode][v.NameID].MinUnitPrice
+						dao.UpdateEntity(db, v, "MidUnitPrice", "MaxUnitPrice", "MinUnitPrice", "AvgUnitPrice")
+					}
+				}
+			}
+			dao.Commit(db)
+		case 2:
+			dao.Begin(db)
+			defer func() {
+				if r := recover(); r != nil || err != nil {
+					dao.Rollback(db)
+					if r != nil {
+						panic(r)
+					}
+				}
+			}()
+			if len(priceReferSnapshotList) > 0 {
+				for _, v := range priceReferSnapshotList {
+					result, _ := dao.GetPriceReferPrice(db, v.CityCode, v.SkuID, snapshotAt)
+					v.MaxPrice = result.MaxPrice
+					v.MinPrice = result.MinPrice
+					v.AvgPrice = result.AvgPrice
+					v.MidPrice = result.MidPrice
+					dao.UpdateEntity(db, v, "MidPrice", "MaxPrice", "MinPrice", "AvgPrice")
+				}
+			}
+			dao.Commit(db)
 		}
-		dao.Commit(db)
+		return result, err
-		globals.SugarLogger.Debugf("CreatePriceRefer")
 	}
-	return err
+	taskSeq := tasksch.NewSeqTask2("生成每日价格统计", ctx, isContinueWhenError, taskSeqFunc, 3)
+	tasksch.HandleTask(taskSeq, nil, true).Run()
+	if !isAsync {
+		_, err = taskSeq.GetResult(0)
+		hint = "1"
+	} else {
+		hint = taskSeq.GetID()
+	}
+	return hint, err
 }

business/jxstore/tempop/tempop.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"regexp"
 	"strings"
-	"sync"
 	"time"
 
 	"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
@@ -40,252 +39,252 @@ func init() {
 }
 
 func Convert2JDSPU(ctx *jxcontext.Context, count int, isAsync, isContinueWhenError bool) (hint string, err error) {
-	sql := `
+	// sql := `
-	SELECT t1.*
+	// SELECT t1.*
-	FROM sku_name t1
+	// FROM sku_name t1
-	LEFT JOIN sku_name t2 ON t2.link_id = t1.id AND t2.deleted_at = ?
+	// LEFT JOIN sku_name t2 ON t2.link_id = t1.id AND t2.deleted_at = ?
-	WHERE t1.deleted_at = ? AND t1.status <> ? AND t1.is_spu = 0/* AND t1.unit = '份'*/
+	// WHERE t1.deleted_at = ? AND t1.status <> ? AND t1.is_spu = 0/* AND t1.unit = '份'*/
-	AND t2.id IS NULL
+	// AND t2.id IS NULL
-	ORDER BY t1.id
+	// ORDER BY t1.id
-	`
+	// `
-	if count > 0 {
+	// if count > 0 {
-		sql += " LIMIT " + utils.Int2Str(count)
+	// 	sql += " LIMIT " + utils.Int2Str(count)
-	}
+	// }
-	sqlParams := []interface{}{
+	// sqlParams := []interface{}{
-		utils.DefaultTimeValue,
+	// 	utils.DefaultTimeValue,
-		utils.DefaultTimeValue,
+	// 	utils.DefaultTimeValue,
-		model.SkuStatusDeleted,
+	// 	model.SkuStatusDeleted,
-	}
+	// }
 
-	db := dao.GetDB()
+	// db := dao.GetDB()
-	var skuNameList []*model.SkuName
+	// var skuNameList []*model.SkuName
-	if err = dao.GetRows(db, &skuNameList, sql, sqlParams...); err != nil {
+	// if err = dao.GetRows(db, &skuNameList, sql, sqlParams...); err != nil {
-		return "", err
+	// 	return "", err
-	}
+	// }
-	for _, skuName := range skuNameList {
+	// for _, skuName := range skuNameList {
-		sql = `
+	// 	sql = `
-		SELECT *
+	// 	SELECT *
-		FROM sku
+	// 	FROM sku
-		WHERE name_id = ? AND deleted_at = ? AND status = ?;
+	// 	WHERE name_id = ? AND deleted_at = ? AND status = ?;
-		`
+	// 	`
-		sqlParams := []interface{}{
+	// 	sqlParams := []interface{}{
-			skuName.ID,
+	// 		skuName.ID,
-			utils.DefaultTimeValue,
+	// 		utils.DefaultTimeValue,
-			model.SkuStatusNormal,
+	// 		model.SkuStatusNormal,
-		}
+	// 	}
-		var skuList []*model.Sku
+	// 	var skuList []*model.Sku
-		if err = dao.GetRows(db, &skuList, sql, sqlParams...); err != nil {
+	// 	if err = dao.GetRows(db, &skuList, sql, sqlParams...); err != nil {
-			return "", err
+	// 		return "", err
-		}
+	// 	}
 
-		sql = `
+	// 	sql = `
-		SELECT t1.*
+	// 	SELECT t1.*
-		FROM sku_name_place_bind t1
+	// 	FROM sku_name_place_bind t1
-		WHERE t1.name_id = ?
+	// 	WHERE t1.name_id = ?
-		`
+	// 	`
-		sqlParams = []interface{}{
+	// 	sqlParams = []interface{}{
-			skuName.ID,
+	// 		skuName.ID,
-		}
+	// 	}
-		var skuNamePlaceBindList []*model.SkuNamePlaceBind
+	// 	var skuNamePlaceBindList []*model.SkuNamePlaceBind
-		if err = dao.GetRows(db, &skuNamePlaceBindList, sql, sqlParams...); err != nil {
+	// 	if err = dao.GetRows(db, &skuNamePlaceBindList, sql, sqlParams...); err != nil {
-			return "", err
+	// 		return "", err
-		}
+	// 	}
 
-		globals.SugarLogger.Debugf("Convert2JDSPU, skuName:%s, skuCount:%d", skuName.Name, len(skuList))
+	// 	globals.SugarLogger.Debugf("Convert2JDSPU, skuName:%s, skuCount:%d", skuName.Name, len(skuList))
-		dao.Begin(db)
+	// 	dao.Begin(db)
-		skuNameNew2 := *skuName
+	// 	skuNameNew2 := *skuName
-		skuNameNew := &skuNameNew2
+	// 	skuNameNew := &skuNameNew2
-		dao.WrapAddIDCULEntity(skuNameNew, ctx.GetUserName())
+	// 	dao.WrapAddIDCULEntity(skuNameNew, ctx.GetUserName())
-		skuNameNew.JdID = 0
+	// 	skuNameNew.JdID = 0
-		skuNameNew.LinkID = skuName.ID
+	// 	skuNameNew.LinkID = skuName.ID
-		skuNameNew.IsSpu = 1
+	// 	skuNameNew.IsSpu = 1
-		skuNameNew.JdSyncStatus = model.SyncFlagNewMask
+	// 	skuNameNew.JdSyncStatus = model.SyncFlagNewMask
-		// skuNameNew.Status = model.SkuStatusDontSale
+	// 	// skuNameNew.Status = model.SkuStatusDontSale
-		if err = dao.CreateEntity(db, skuNameNew); err != nil {
+	// 	if err = dao.CreateEntity(db, skuNameNew); err != nil {
-			dao.Rollback(db)
+	// 		dao.Rollback(db)
-			return "", err
+	// 		return "", err
-		}
+	// 	}
-		if len(skuList) > 0 {
+	// 	if len(skuList) > 0 {
-			for _, sku := range skuList {
+	// 		for _, sku := range skuList {
-				skuNew2 := *sku
+	// 			skuNew2 := *sku
-				skuNew := &skuNew2
+	// 			skuNew := &skuNew2
-				dao.WrapAddIDCULEntity(skuNew, ctx.GetUserName())
+	// 			dao.WrapAddIDCULEntity(skuNew, ctx.GetUserName())
-				skuNew.JdID = 0
+	// 			skuNew.JdID = 0
-				skuNew.LinkID = sku.ID
+	// 			skuNew.LinkID = sku.ID
-				skuNew.NameID = skuNameNew.ID
+	// 			skuNew.NameID = skuNameNew.ID
-				skuNew.JdSyncStatus = model.SyncFlagNewMask
+	// 			skuNew.JdSyncStatus = model.SyncFlagNewMask
-				if skuNameNew.Status == model.SkuStatusDontSale {
+	// 			if skuNameNew.Status == model.SkuStatusDontSale {
-					skuNew.Status = model.SkuStatusDontSale
+	// 				skuNew.Status = model.SkuStatusDontSale
-				}
+	// 			}
-				globals.SugarLogger.Debugf("Convert2JDSPU, sku:%s", utils.Format4Output(skuNew, false))
+	// 			globals.SugarLogger.Debugf("Convert2JDSPU, sku:%s", utils.Format4Output(skuNew, false))
-				if err = dao.CreateEntity(db, skuNew); err != nil {
+	// 			if err = dao.CreateEntity(db, skuNew); err != nil {
-					dao.Rollback(db)
+	// 				dao.Rollback(db)
-					return "", err
+	// 				return "", err
-				}
+	// 			}
-			}
+	// 		}
-			for _, placeBind := range skuNamePlaceBindList {
+	// 		for _, placeBind := range skuNamePlaceBindList {
-				dao.WrapAddIDCULEntity(placeBind, ctx.GetUserName())
+	// 			dao.WrapAddIDCULEntity(placeBind, ctx.GetUserName())
-				placeBind.NameID = skuNameNew.ID
+	// 			placeBind.NameID = skuNameNew.ID
-				globals.SugarLogger.Debugf("Convert2JDSPU, placeBind:%s", utils.Format4Output(placeBind, false))
+	// 			globals.SugarLogger.Debugf("Convert2JDSPU, placeBind:%s", utils.Format4Output(placeBind, false))
-				if err = dao.CreateEntity(db, placeBind); err != nil {
+	// 			if err = dao.CreateEntity(db, placeBind); err != nil {
-					dao.Rollback(db)
+	// 				dao.Rollback(db)
-					return "", err
+	// 				return "", err
-				}
+	// 			}
-			}
+	// 		}
-		}
+	// 	}
-		dao.Commit(db)
+	// 	dao.Commit(db)
-	}
+	// }
-	sql = `
+	// sql = `
-	SELECT DISTINCT t1.*
+	// SELECT DISTINCT t1.*
-	FROM sku_name t1
+	// FROM sku_name t1
-	JOIN sku t2 ON t1.id = t2.name_id AND t2.jd_sync_status <> 0 AND t2.deleted_at = ?
+	// JOIN sku t2 ON t1.id = t2.name_id AND t2.jd_sync_status <> 0 AND t2.deleted_at = ?
-	WHERE t1.link_id > 0;
+	// WHERE t1.link_id > 0;
-	`
+	// `
-	skuNameList = []*model.SkuName{}
+	// skuNameList = []*model.SkuName{}
-	if err = dao.GetRows(db, &skuNameList, sql, utils.DefaultTimeValue); err != nil {
+	// if err = dao.GetRows(db, &skuNameList, sql, utils.DefaultTimeValue); err != nil {
-		return "", err
+	// 	return "", err
-	}
+	// }
-	rootTask := tasksch.NewParallelTask("Convert2JDSPU", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx,
+	// rootTask := tasksch.NewParallelTask("Convert2JDSPU", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), 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) {
-			skuName := batchItemList[0].(*model.SkuName)
+	// 		skuName := batchItemList[0].(*model.SkuName)
-			_, err = cms.CurVendorSync.SyncSku(ctx, db, skuName.ID, -1, false, isContinueWhenError, ctx.GetUserName())
+	// 		_, err = cms.CurVendorSync.SyncSku(ctx, db, skuName.ID, -1, false, isContinueWhenError, ctx.GetUserName())
-			return nil, err
+	// 		return nil, err
-		}, skuNameList)
+	// 	}, skuNameList)
-	tasksch.ManageTask(rootTask).Run()
+	// tasksch.ManageTask(rootTask).Run()
 
-	if !isAsync {
+	// if !isAsync {
-		_, err = rootTask.GetResult(0)
+	// 	_, err = rootTask.GetResult(0)
-	} else {
+	// } else {
-		hint = rootTask.ID
+	// 	hint = rootTask.ID
-	}
+	// }
 	return hint, err
 }
 
 func Change2JDSPU4Store(ctx *jxcontext.Context, storeIDs []int, step int, isAsync, isContinueWhenError bool) (hint string, err error) {
-	db := dao.GetDB()
+	// db := dao.GetDB()
-	if len(storeIDs) == 0 {
+	// if len(storeIDs) == 0 {
-		if err = dao.GetRows(db, &storeIDs, `
+	// 	if err = dao.GetRows(db, &storeIDs, `
-		SELECT t1.id
+	// 	SELECT t1.id
-		FROM store t1
+	// 	FROM store t1
-		JOIN store_map t2 ON t2.store_id = t1.id AND t2.vendor_id = 0 AND t2.deleted_at = ? AND t2.status <> ?
+	// 	JOIN store_map t2 ON t2.store_id = t1.id AND t2.vendor_id = 0 AND t2.deleted_at = ? AND t2.status <> ?
-		WHERE t1.deleted_at = ? AND t1.status <> ? /* AND t1.city_code IN (110100, 120100, 440100, 440300, 510100)*/
+	// 	WHERE t1.deleted_at = ? AND t1.status <> ? /* AND t1.city_code IN (110100, 120100, 440100, 440300, 510100)*/
-		`, utils.DefaultTimeValue, model.StoreStatusDisabled, utils.DefaultTimeValue, model.StoreStatusDisabled); err != nil {
+	// 	`, utils.DefaultTimeValue, model.StoreStatusDisabled, utils.DefaultTimeValue, model.StoreStatusDisabled); err != nil {
-			return "", err
+	// 		return "", err
-		}
+	// 	}
-	}
+	// }
-	var sql string
+	// var sql string
-	var sqlParams []interface{}
+	// var sqlParams []interface{}
 
-	dao.Begin(db)
+	// dao.Begin(db)
-	defer dao.Rollback(db)
+	// defer dao.Rollback(db)
 
-	if step == 1 {
+	// if step == 1 {
-		sql = `
+	// 	sql = `
-		DELETE t1
+	// 	DELETE t1
-		FROM store_sku_bind t1
+	// 	FROM store_sku_bind t1
-		JOIN sku t2 ON t2.id = t1.sku_id AND t2.link_id > 0
+	// 	JOIN sku t2 ON t2.id = t1.sku_id AND t2.link_id > 0
-		WHERE 1 = 1
+	// 	WHERE 1 = 1
-		`
+	// 	`
-		sqlParams = []interface{}{}
+	// 	sqlParams = []interface{}{}
-		if len(storeIDs) > 0 {
+	// 	if len(storeIDs) > 0 {
-			sql += " AND store_id IN (" + dao.GenQuestionMarks(len(storeIDs)) + ")"
+	// 		sql += " AND store_id IN (" + dao.GenQuestionMarks(len(storeIDs)) + ")"
-			sqlParams = append(sqlParams, storeIDs)
+	// 		sqlParams = append(sqlParams, storeIDs)
-		}
+	// 	}
-		if _, err = dao.ExecuteSQL(db, sql, sqlParams...); err != nil {
+	// 	if _, err = dao.ExecuteSQL(db, sql, sqlParams...); err != nil {
-			return "", err
+	// 		return "", err
-		}
+	// 	}
 
-		sql = `
+	// 	sql = `
-		INSERT INTO store_sku_bind(created_at, updated_at, last_operator, deleted_at, store_id, sku_id, price, unit_price, status, ebai_id, mtwm_id, jd_sync_status, ebai_sync_status, mtwm_sync_status)
+	// 	INSERT INTO store_sku_bind(created_at, updated_at, last_operator, deleted_at, store_id, sku_id, price, unit_price, status, ebai_id, mtwm_id, jd_sync_status, ebai_sync_status, mtwm_sync_status)
-		SELECT 						NOW(), 		NOW(),		?,				?,		t1.store_id, t2.id, t1.price, t1.unit_price, t1.status , 0, 0, ?, ?, ?
+	// 	SELECT 						NOW(), 		NOW(),		?,				?,		t1.store_id, t2.id, t1.price, t1.unit_price, t1.status , 0, 0, ?, ?, ?
-		FROM store_sku_bind t1
+	// 	FROM store_sku_bind t1
-		JOIN sku t2 ON t2.link_id = t1.sku_id AND t2.deleted_at = ?
+	// 	JOIN sku t2 ON t2.link_id = t1.sku_id AND t2.deleted_at = ?
-		JOIN store t3 ON t3.id = t1.store_id
+	// 	JOIN store t3 ON t3.id = t1.store_id
-		JOIN sku_name t4 ON t4.id = t2.name_id
+	// 	JOIN sku_name t4 ON t4.id = t2.name_id
-		LEFT JOIN sku_name_place_bind t5 ON t5.place_code = t3.city_code AND t5.name_id = t4.id
+	// 	LEFT JOIN sku_name_place_bind t5 ON t5.place_code = t3.city_code AND t5.name_id = t4.id
-		WHERE t1.deleted_at = ? AND (t4.is_global = 1 OR t5.id IS NOT NULL) AND t1.price > 0
+	// 	WHERE t1.deleted_at = ? AND (t4.is_global = 1 OR t5.id IS NOT NULL) AND t1.price > 0
-		`
+	// 	`
-		sqlParams = []interface{}{
+	// 	sqlParams = []interface{}{
-			ctx.GetUserName(),
+	// 		ctx.GetUserName(),
-			utils.DefaultTimeValue,
+	// 		utils.DefaultTimeValue,
-			// model.SkuStatusDontSale,
+	// 		// model.SkuStatusDontSale,
-			model.SyncFlagNewMask,
+	// 		model.SyncFlagNewMask,
-			0, //model.SyncFlagNewMask,
+	// 		0, //model.SyncFlagNewMask,
-			0, //model.SyncFlagNewMask,
+	// 		0, //model.SyncFlagNewMask,
-			utils.DefaultTimeValue,
+	// 		utils.DefaultTimeValue,
-			utils.DefaultTimeValue,
+	// 		utils.DefaultTimeValue,
-		}
+	// 	}
-	} else if step == 2 {
+	// } else if step == 2 {
-		sql = `
+	// 	sql = `
-		SELECT COUNT(*) ct
+	// 	SELECT COUNT(*) ct
-		FROM store_sku_bind t1
+	// 	FROM store_sku_bind t1
-		JOIN sku t2 ON t2.id = t1.sku_id AND t2.link_id > 0
+	// 	JOIN sku t2 ON t2.id = t1.sku_id AND t2.link_id > 0
-		WHERE 1 = 1
+	// 	WHERE 1 = 1
-		`
+	// 	`
-		sqlParams = []interface{}{}
+	// 	sqlParams = []interface{}{}
-		if len(storeIDs) > 0 {
+	// 	if len(storeIDs) > 0 {
-			sql += " AND store_id IN (" + dao.GenQuestionMarks(len(storeIDs)) + ")"
+	// 		sql += " AND store_id IN (" + dao.GenQuestionMarks(len(storeIDs)) + ")"
-			sqlParams = append(sqlParams, storeIDs)
+	// 		sqlParams = append(sqlParams, storeIDs)
-		}
+	// 	}
-		ct := 0
+	// 	ct := 0
-		if err = dao.GetRow(db, &ct, sql, sqlParams...); err != nil {
+	// 	if err = dao.GetRow(db, &ct, sql, sqlParams...); err != nil {
-			return "", err
+	// 		return "", err
-		}
+	// 	}
-		if ct == 0 {
+	// 	if ct == 0 {
-			return "", fmt.Errorf("%s看起来还没有执行《将转化的SPU在门店上架》", utils.Format4Output(storeIDs, true))
+	// 		return "", fmt.Errorf("%s看起来还没有执行《将转化的SPU在门店上架》", utils.Format4Output(storeIDs, true))
-		}
+	// 	}
 
-		sql = `
+	// 	sql = `
-		UPDATE store_sku_bind t1
+	// 	UPDATE store_sku_bind t1
-		JOIN sku t2 ON t2.link_id = t1.sku_id
+	// 	JOIN sku t2 ON t2.link_id = t1.sku_id
-		SET t1.status = 0,
+	// 	SET t1.status = 0,
-		t1.jd_sync_status = ?
+	// 	t1.jd_sync_status = ?
-		WHERE t1.deleted_at = ?
+	// 	WHERE t1.deleted_at = ?
-		`
+	// 	`
-		sqlParams = []interface{}{
+	// 	sqlParams = []interface{}{
-			model.SyncFlagSaleMask | model.SyncFlagModifiedMask,
+	// 		model.SyncFlagSaleMask | model.SyncFlagModifiedMask,
-			utils.DefaultTimeValue,
+	// 		utils.DefaultTimeValue,
-		}
+	// 	}
-	} else {
+	// } else {
-		return "", fmt.Errorf("非法的step")
+	// 	return "", fmt.Errorf("非法的step")
-	}
+	// }
-	if len(storeIDs) > 0 {
+	// if len(storeIDs) > 0 {
-		sql += " AND t1.store_id IN (" + dao.GenQuestionMarks(len(storeIDs)) + ")"
+	// 	sql += " AND t1.store_id IN (" + dao.GenQuestionMarks(len(storeIDs)) + ")"
-		sqlParams = append(sqlParams, storeIDs)
+	// 	sqlParams = append(sqlParams, storeIDs)
-	}
+	// }
-	globals.SugarLogger.Debug(sql)
+	// globals.SugarLogger.Debug(sql)
-	globals.SugarLogger.Debug(utils.Format4Output(sqlParams, false))
+	// globals.SugarLogger.Debug(utils.Format4Output(sqlParams, false))
-	var num int64
+	// var num int64
-	if num, err = dao.ExecuteSQL(db, sql, sqlParams...); err != nil {
+	// if num, err = dao.ExecuteSQL(db, sql, sqlParams...); err != nil {
-		return "", err
+	// 	return "", err
-	}
+	// }
-	globals.SugarLogger.Debug(num)
+	// globals.SugarLogger.Debug(num)
-	dao.Commit(db)
+	// dao.Commit(db)
 
-	var skuIDs []int
+	// var skuIDs []int
-	if step == 1 {
+	// if step == 1 {
-		sql = `
+	// 	sql = `
-		SELECT id
+	// 	SELECT id
-		FROM sku t1
+	// 	FROM sku t1
-		WHERE t1.link_id > 0 AND t1.deleted_at = ?
+	// 	WHERE t1.link_id > 0 AND t1.deleted_at = ?
-		`
+	// 	`
-		sqlParams = []interface{}{
+	// 	sqlParams = []interface{}{
-			utils.DefaultTimeValue,
+	// 		utils.DefaultTimeValue,
-		}
+	// 	}
-	} else if step == 2 {
+	// } else if step == 2 {
-		sql = `
+	// 	sql = `
-		SELECT t1.link_id
+	// 	SELECT t1.link_id
-		FROM sku t1
+	// 	FROM sku t1
-		WHERE t1.link_id > 0 AND t1.deleted_at = ?
+	// 	WHERE t1.link_id > 0 AND t1.deleted_at = ?
-		`
+	// 	`
-		sqlParams = []interface{}{
+	// 	sqlParams = []interface{}{
-			utils.DefaultTimeValue,
+	// 		utils.DefaultTimeValue,
-		}
+	// 	}
-	}
+	// }
-	if err = dao.GetRows(db, &skuIDs, sql, sqlParams...); err != nil {
+	// if err = dao.GetRows(db, &skuIDs, sql, sqlParams...); err != nil {
-		return "", err
+	// 	return "", err
-	}
+	// }
-	hint, err = cms.CurVendorSync.SyncStoresSkus(ctx, db, []int{model.VendorIDJD}, storeIDs, skuIDs, false, isAsync, isContinueWhenError)
+	// hint, err = cms.CurVendorSync.SyncStoresSkus(ctx, db, []int{model.VendorIDJD}, storeIDs, skuIDs, false, isAsync, isContinueWhenError)
 	return hint, err
 }
 
@@ -600,132 +599,132 @@ type GoodsOrderOriginalEx struct {
 }
 
 func TransformJdSpu2Sku(ctx *jxcontext.Context, skuNameIDs []int, count int, isAsync, isContinueWhenError bool) (hint string, err error) {
-	sql := `
+	// sql := `
-	SELECT t1.*
+	// SELECT t1.*
-	FROM sku_name t1
+	// FROM sku_name t1
-	WHERE t1.deleted_at = ? AND t1.status <> ? AND t1.is_spu = 1 AND jd_id <> 0
+	// WHERE t1.deleted_at = ? AND t1.status <> ? AND t1.is_spu = 1 AND jd_id <> 0
-	`
+	// `
-	sqlParams := []interface{}{
+	// sqlParams := []interface{}{
-		utils.DefaultTimeValue,
+	// 	utils.DefaultTimeValue,
-		model.SkuStatusDeleted,
+	// 	model.SkuStatusDeleted,
-	}
+	// }
-	if len(skuNameIDs) > 0 {
+	// if len(skuNameIDs) > 0 {
-		sql += " AND t1.id IN (" + dao.GenQuestionMarks(len(skuNameIDs)) + ")"
+	// 	sql += " AND t1.id IN (" + dao.GenQuestionMarks(len(skuNameIDs)) + ")"
-		sqlParams = append(sqlParams, skuNameIDs)
+	// 	sqlParams = append(sqlParams, skuNameIDs)
-	}
+	// }
-	sql += " ORDER BY t1.id"
+	// sql += " ORDER BY t1.id"
-	if count > 0 {
+	// if count > 0 {
-		sql += " LIMIT ?"
+	// 	sql += " LIMIT ?"
-		sqlParams = append(sqlParams, count)
+	// 	sqlParams = append(sqlParams, count)
-	}
+	// }
-	db := dao.GetDB()
+	// db := dao.GetDB()
-	var skuNameList []*model.SkuName
+	// var skuNameList []*model.SkuName
-	if err = dao.GetRows(db, &skuNameList, sql, sqlParams...); err != nil {
+	// if err = dao.GetRows(db, &skuNameList, sql, sqlParams...); err != nil {
-		return "", err
+	// 	return "", err
-	}
+	// }
-	if len(skuNameList) == 0 {
+	// if len(skuNameList) == 0 {
-		return "", fmt.Errorf("待转换的skuName为空")
+	// 	return "", fmt.Errorf("待转换的skuName为空")
-	}
+	// }
-	batchSize := 40
+	// batchSize := 40
-	rootTask := tasksch.NewSeqTask2("TransformJdSpu2Sku", ctx, isContinueWhenError,
+	// rootTask := tasksch.NewSeqTask2("TransformJdSpu2Sku", ctx, isContinueWhenError,
-		func(rootTask *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
+	// 	func(rootTask *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
-			var (
+	// 		var (
-				locker sync.Mutex
+	// 			locker sync.Mutex
-				skuIDs []int
+	// 			skuIDs []int
-			)
+	// 		)
-			lastIndex := (step + 1) * batchSize
+	// 		lastIndex := (step + 1) * batchSize
-			if lastIndex > len(skuNameList) {
+	// 		if lastIndex > len(skuNameList) {
-				lastIndex = len(skuNameList)
+	// 			lastIndex = len(skuNameList)
-			}
+	// 		}
-			batchSkNameList := skuNameList[step*batchSize : lastIndex]
+	// 		batchSkNameList := skuNameList[step*batchSize : lastIndex]
-			subTask := tasksch.NewParallelTask(fmt.Sprintf("TransformJdSpu2Sku:%d", step), tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx,
+	// 		subTask := tasksch.NewParallelTask(fmt.Sprintf("TransformJdSpu2Sku:%d", step), tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx,
-				func(subTask *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+	// 			func(subTask *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
-					skuName := batchItemList[0].(*model.SkuName)
+	// 				skuName := batchItemList[0].(*model.SkuName)
-					if !jxutils.IsEmptyID(skuName.JdID) {
+	// 				if !jxutils.IsEmptyID(skuName.JdID) {
-						sql = `
+	// 					sql = `
-				SELECT *
+	// 			SELECT *
-				FROM sku
+	// 			FROM sku
-				WHERE name_id = ? AND deleted_at = ? AND status <> ?;
+	// 			WHERE name_id = ? AND deleted_at = ? AND status <> ?;
-				`
+	// 			`
-						sqlParams := []interface{}{
+	// 					sqlParams := []interface{}{
-							skuName.ID,
+	// 						skuName.ID,
-							utils.DefaultTimeValue,
+	// 						utils.DefaultTimeValue,
-							model.SkuStatusDeleted,
+	// 						model.SkuStatusDeleted,
-						}
+	// 					}
-						var skuList []*model.Sku
+	// 					var skuList []*model.Sku
-						if err = dao.GetRows(db, &skuList, sql, sqlParams...); err != nil {
+	// 					if err = dao.GetRows(db, &skuList, sql, sqlParams...); err != nil {
-							return "", err
+	// 						return "", err
-						}
+	// 					}
-						globals.SugarLogger.Debugf("TransformJdSpu2Sku skuList:%s", utils.Format4Output(skuList, false))
+	// 					globals.SugarLogger.Debugf("TransformJdSpu2Sku skuList:%s", utils.Format4Output(skuList, false))
-						if len(skuList) > 0 {
+	// 					if len(skuList) > 0 {
-							for _, sku := range skuList {
+	// 						for _, sku := range skuList {
-								locker.Lock()
+	// 							locker.Lock()
-								skuIDs = append(skuIDs, sku.ID)
+	// 							skuIDs = append(skuIDs, sku.ID)
-								locker.Unlock()
+	// 							locker.Unlock()
-								if !jxutils.IsEmptyID(sku.JdID) {
+	// 							if !jxutils.IsEmptyID(sku.JdID) {
-									if globals.EnableJdStoreWrite {
+	// 								if globals.EnableJdStoreWrite {
-										if err = api.JdAPI.UpdateSkuBaseInfo(utils.Int2Str(skuName.ID), utils.Int2Str(sku.ID), utils.Params2Map(jdapi.KeyFixedStatus, jdapi.SkuFixedStatusDeleted)); err != nil {
+	// 									if err = api.JdAPI.UpdateSkuBaseInfo(utils.Int2Str(skuName.ID), utils.Int2Str(sku.ID), utils.Params2Map(jdapi.KeyFixedStatus, jdapi.SkuFixedStatusDeleted)); err != nil {
-											if errExt, ok := err.(*utils.ErrorWithCode); ok && errExt.IntCode() == 11004 {
+	// 										if errExt, ok := err.(*utils.ErrorWithCode); ok && errExt.IntCode() == 11004 {
-												err = nil
+	// 											err = nil
-											} else {
+	// 										} else {
-												break
+	// 											break
-											}
+	// 										}
-										}
+	// 									}
-									}
+	// 								}
-								}
+	// 							}
-							}
+	// 						}
-						}
+	// 					}
-						if err == nil && globals.EnableJdStoreWrite {
+	// 					if err == nil && globals.EnableJdStoreWrite {
-							if err = api.JdAPI.UpdateSpu(utils.Int2Str(skuName.ID), utils.Params2Map(jdapi.KeyFixedStatus, jdapi.SkuFixedStatusOffline)); err == nil {
+	// 						if err = api.JdAPI.UpdateSpu(utils.Int2Str(skuName.ID), utils.Params2Map(jdapi.KeyFixedStatus, jdapi.SkuFixedStatusOffline)); err == nil {
-								err = api.JdAPI.UpdateSpu(utils.Int2Str(skuName.ID), utils.Params2Map(jdapi.KeyFixedStatus, jdapi.SkuFixedStatusDeleted))
+	// 							err = api.JdAPI.UpdateSpu(utils.Int2Str(skuName.ID), utils.Params2Map(jdapi.KeyFixedStatus, jdapi.SkuFixedStatusDeleted))
-							} else if errExt, ok := err.(*utils.ErrorWithCode); ok && errExt.IntCode() == 11035 {
+	// 						} else if errExt, ok := err.(*utils.ErrorWithCode); ok && errExt.IntCode() == 11035 {
-								err = nil
+	// 							err = nil
-							}
+	// 						}
-						}
+	// 					}
-						if err == nil {
+	// 					if err == nil {
-							skuName.IsSpu = 0
+	// 						skuName.IsSpu = 0
-							skuName.JdID = 0
+	// 						skuName.JdID = 0
-							if _, err = dao.UpdateEntity(db, skuName, "IsSpu", "JdID"); err == nil {
+	// 						if _, err = dao.UpdateEntity(db, skuName, "IsSpu", "JdID"); err == nil {
-								sql := `
+	// 							sql := `
-						UPDATE sku t1
+	// 					UPDATE sku t1
-						SET
+	// 					SET
-						t1.jd_sync_status = ?,
+	// 					t1.jd_sync_status = ?,
-						t1.jd_id = 0
+	// 					t1.jd_id = 0
-						WHERE t1.name_id = ? AND t1.deleted_at = ? AND t1.status <> ?
+	// 					WHERE t1.name_id = ? AND t1.deleted_at = ? AND t1.status <> ?
-						`
+	// 					`
-								sqlParams := []interface{}{
+	// 							sqlParams := []interface{}{
-									model.SyncFlagNewMask,
+	// 								model.SyncFlagNewMask,
-									skuName.ID,
+	// 								skuName.ID,
-									utils.DefaultTimeValue,
+	// 								utils.DefaultTimeValue,
-									model.SkuStatusDeleted,
+	// 								model.SkuStatusDeleted,
-								}
+	// 							}
-								if _, err = dao.ExecuteSQL(db, sql, sqlParams...); err == nil {
+	// 							if _, err = dao.ExecuteSQL(db, sql, sqlParams...); err == nil {
-									_, err = cms.CurVendorSync.SyncSku(ctx, db, skuName.ID, -1, false, isContinueWhenError, ctx.GetUserName())
+	// 								_, err = cms.CurVendorSync.SyncSku(ctx, db, skuName.ID, -1, false, isContinueWhenError, ctx.GetUserName())
-								}
+	// 							}
-							}
+	// 						}
-						}
+	// 					}
-					} else {
+	// 				} else {
-						globals.SugarLogger.Debugf("TransformJdSpu2Sku skuName:%d is fake", skuName.ID)
+	// 					globals.SugarLogger.Debugf("TransformJdSpu2Sku skuName:%d is fake", skuName.ID)
-					}
+	// 				}
-					return nil, err
+	// 				return nil, err
-				}, batchSkNameList)
+	// 			}, batchSkNameList)
-			rootTask.AddChild(subTask).Run()
+	// 		rootTask.AddChild(subTask).Run()
-			if _, err = subTask.GetResult(0); err == nil {
+	// 		if _, err = subTask.GetResult(0); err == nil {
-				if len(skuIDs) > 0 {
+	// 			if len(skuIDs) > 0 {
-					if _, err = dao.SetStoreSkuSyncStatus(db, model.VendorIDJD, nil, skuIDs, model.SyncFlagStoreSkuModifiedMask); err == nil {
+	// 				if _, err = dao.SetStoreSkuSyncStatus(db, model.VendorIDJD, nil, skuIDs, model.SyncFlagStoreSkuModifiedMask); err == nil {
-						// time.Sleep(20 * time.Second)
+	// 					// time.Sleep(20 * time.Second)
-						// _, err = cms.CurVendorSync.SyncStoresSkus(ctx, db, []int{model.VendorIDJD}, nil, skuIDs, false, isContinueWhenError)
+	// 					// _, err = cms.CurVendorSync.SyncStoresSkus(ctx, db, []int{model.VendorIDJD}, nil, skuIDs, false, isContinueWhenError)
-					}
+	// 				}
-				}
+	// 			}
-			}
+	// 		}
-			return nil, err
+	// 		return nil, err
-		}, (len(skuNameList)-1)/batchSize+1)
+	// 	}, (len(skuNameList)-1)/batchSize+1)
-	tasksch.ManageTask(rootTask).Run()
+	// tasksch.ManageTask(rootTask).Run()
-	if !isAsync {
+	// if !isAsync {
-		_, err = rootTask.GetResult(0)
+	// 	_, err = rootTask.GetResult(0)
-	} else {
+	// } else {
-		hint = rootTask.ID
+	// 	hint = rootTask.ID
-	}
+	// }
 	return hint, err
 }
 
@@ -1383,7 +1382,7 @@ func BuildSkuFromEbaiStore(ctx *jxcontext.Context, baiduShopID int64, isAsync, i
 							Weight:      int(utils.Str2Int64(utils.Interface2String(sku["weight"]))),
 							Status:      model.SkuStatusNormal,
 
-							LinkID: int(jxutils.StandardPrice2Int(utils.MustInterface2Float64(sku["sale_price"]))), // 临时传递价格用
+							SkuIndex: int(jxutils.StandardPrice2Int(utils.MustInterface2Float64(sku["sale_price"]))), // 临时传递价格用
 						},
 					}
 					if sku["enabled"].(string) == "0" {
@@ -1449,8 +1448,7 @@ func BuildSkuFromEbaiStore(ctx *jxcontext.Context, baiduShopID int64, isAsync, i
 						if cat.Name == "进口水果" {
 							jdCatID = 20342 // 其他进口水果
 						}
-						price := sku.LinkID
+						price := sku.SkuIndex
-						sku.LinkID = 0
 						skuName := jxutils.ComposeSkuNameOriginal(skuNameExt.Prefix, skuNameExt.Name, sku.Comment, skuNameExt.Unit, sku.SpecQuality, sku.SpecUnit, jdapi.MaxSkuNameCharCount)
 						fixedStatus := 1
 						if sku.Status != model.SkuStatusNormal {

business/jxutils/jxutils_cms.go

@@ -487,6 +487,7 @@ func CaculateSkuEarningPrice(shopPrice, salePrice int64, storePayPercentage int)
 	if salePrice == 0 || shopPrice > 0 && shopPrice < earningPrice {
 		earningPrice = shopPrice
 	}
+	storePayPercentage = ConstrainPayPercentage(storePayPercentage)
 	if storePayPercentage <= 0 {
 		storePayPercentage = model.DefaultEarningPricePercentage
 	}

business/model/api.go

@@ -35,8 +35,9 @@ type GoodsOrderExt struct {
 	WaybillCreatedAt  time.Time `orm:"type(datetime);index" json:"waybillCreatedAt"`
 	WaybillFinishedAt time.Time `orm:"type(datetime)" json:"waybillFinishedAt"`
 
-	DistrictName string `json:"districtName"`
+	DistrictName  string `json:"districtName"`
-	CityName     string `json:"cityName"`
+	CityName      string `json:"cityName"`
+	PayPercentage int    `json:"payPercentage"`
 
 	SkuInfo      string `json:"skuInfo,omitempty"`
 	ShortSkuInfo `json:"-"`

business/model/const.go

@@ -41,8 +41,10 @@ var (
 		OrderStatusUnlocked: "解锁",
 		OrderStatusLocked:   "锁定",
 		// OrderStatusApplyRefund:    "申请退款",
-		OrderStatusUndoApplyCancel: "取消申请取消",
+		OrderStatusUndoApplyCancel:    "取消申请取消",
-		OrderStatusApplyCancel:     "申请取消",
+		OrderStatusVendorRejectCancel: "拒绝取消",
+		OrderStatusVendorAgreeCancel:  "同意取消",
+		OrderStatusApplyCancel:        "申请取消",
 
 		OrderStatusUnknown: "一般事件",
 
@@ -98,6 +100,11 @@ var (
 		ComplaintReasons71: "骑手提前点击取货/送达",
 	}
 
+	SupplementTypeName = map[int]string{
+		BadAppraiseSupplement: "差评退款",
+		Coupon:                "优惠券",
+	}
+
 	MultiStoresVendorMap = map[int]int{
 		VendorIDJD:   1,
 		VendorIDMTWM: 0,
@@ -229,6 +236,11 @@ const (
 	ComplaintReasons71 = 71 //"骑手提前点击取货/送达",
 )
 
+const (
+	BadAppraiseSupplement = 1 //差评退款
+	Coupon                = 2 //优惠券
+)
+
 const (
 	WaybillStatusRefuseFailedGetGoods = -70
 	WaybillStatusUnknown              = 0

business/model/dao/act.go

@@ -395,14 +395,8 @@ func GetEffectiveActStoreSkuInfo(db *DaoDB, actID int, vendorIDs []int, actType
 		model.SyncFlagNewMask,
 		model.ActSkuFake,
 
-		utils.DefaultTimeValue,
+		utils.DefaultTimeValue, model.SyncFlagNewMask, model.ActSkuFake,
-		model.SyncFlagNewMask,
+		utils.DefaultTimeValue, model.ActStatusCreated, endAt, beginAt,
-		model.ActSkuFake,
-
-		utils.DefaultTimeValue,
-		model.ActStatusCreated,
-		endAt,
-		beginAt,
 	}
 	if len(vendorIDs) > 0 {
 		sql += " AND (t1.vendor_mask & ?) <> 0 AND t3.vendor_id IN (" + GenQuestionMarks(len(vendorIDs)) + ")"

business/model/dao/dao_order.go

@@ -105,7 +105,7 @@ func QueryOrders(db *DaoDB, vendorOrderID string, actID int, vendorIDs []int, st
 		sqlParams = append(sqlParams, storeID)
 	}
 	if !utils.IsTimeZero(fromDate) && !utils.IsTimeZero(toDate) {
-		sql += " AND a.order_created_at BETWEEN ? and ?"
+		sql += " AND a.order_created_at BETWEEN ? AND ?"
 		sqlParams = append(sqlParams, fromDate, toDate)
 	}
 	err = GetRows(db, &orderNewList, sql, sqlParams...)
@@ -728,6 +728,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
 	CAST(IF(t1.earning_price <> 0, t1.earning_price, IF(t1.shop_price <> 0 && t1.shop_price < t1.sale_price, t1.shop_price, t1.sale_price) * IF(t5.pay_percentage > 0, t5.pay_percentage, %d) / 100) AS SIGNED) earning_price,
 	t2.status waybill_status, t2.courier_name, t2.courier_mobile,
 	t2.actual_fee, t2.desired_fee, t2.waybill_created_at, t2.waybill_finished_at,
+	t5.pay_percentage,
 	city.name city_name, district.name district_name`, model.DefaultEarningPricePercentage)
 	if isIncludeSku {
 		sql += `,
@@ -1052,7 +1053,7 @@ func GetWayBillByOrderID(db *DaoDB, orderStatus, vendorID, waybillVendorID int,
 	return wayBillList, err
 }
 
-func GetOrdersSupplement(db *DaoDB, storIDs, vendorIDs []int, vendorOrderID string, fromTime, toTime time.Time, status, stype, offset, pageSize int) (orderSupplementFee []*model.OrderSupplementFee, totalCount int, err error) {
+func GetOrdersSupplement(db *DaoDB, storIDs, vendorIDs, statuss []int, vendorOrderID string, fromTime, toTime time.Time, stype, IsReverse, offset, pageSize int) (orderSupplementFee []*model.OrderSupplementFee, totalCount int, err error) {
 	sql := `
 		SELECT SQL_CALC_FOUND_ROWS * 
 		FROM order_supplement_fee
@@ -1075,23 +1076,27 @@ func GetOrdersSupplement(db *DaoDB, storIDs, vendorIDs []int, vendorOrderID stri
 		sqlParams = append(sqlParams, storIDs)
 	}
 	if len(vendorIDs) > 0 {
-		sql += " AND store_id IN (" + GenQuestionMarks(len(vendorIDs)) + ")"
+		sql += " AND vendor_id IN (" + GenQuestionMarks(len(vendorIDs)) + ")"
 		sqlParams = append(sqlParams, vendorIDs)
 	}
 	if vendorOrderID != "" {
 		sql += " AND vendor_order_id = ?"
 		sqlParams = append(sqlParams, vendorOrderID)
 	}
-	if status >= 0 {
+	if len(statuss) > 0 {
-		sql += " AND status = ?"
+		sql += " AND status IN (" + GenQuestionMarks(len(statuss)) + ")"
-		sqlParams = append(sqlParams, status)
+		sqlParams = append(sqlParams, statuss)
 	}
-	if stype >= 0 {
+	if stype > 0 {
 		sql += " AND type = ?"
 		sqlParams = append(sqlParams, stype)
 	}
-	sql += `
+	if IsReverse == -1 {
-		LIMIT ? OFFSET ?`
+		sql += " AND link_id = 0"
+	} else if IsReverse == 1 {
+		sql += " AND link_id <> 0"
+	}
+	sql += " LIMIT ? OFFSET ?"
 	sqlParams = append(sqlParams, pageSize, offset)
 	Begin(db)
 	defer Commit(db)
@@ -1100,3 +1105,54 @@ func GetOrdersSupplement(db *DaoDB, storIDs, vendorIDs []int, vendorOrderID stri
 	}
 	return orderSupplementFee, totalCount, err
 }
+
+func GetOrdersSupplementNoPage(db *DaoDB, ID int, storIDs, vendorIDs, statuss []int, vendorOrderID string, fromTime, toTime time.Time, stype, IsReverse int) (orderSupplementFee []*model.OrderSupplementFee, err error) {
+	sql := `
+		SELECT * 
+		FROM order_supplement_fee
+		WHERE 1=1
+		AND deleted_at = ?
+	`
+	sqlParams := []interface{}{
+		utils.DefaultTimeValue,
+	}
+	if !utils.IsTimeZero(fromTime) {
+		sql += " AND supplement_time >= ?"
+		sqlParams = append(sqlParams, fromTime)
+	}
+	if !utils.IsTimeZero(toTime) {
+		sql += " AND supplement_time <= ?"
+		sqlParams = append(sqlParams, toTime)
+	}
+	if len(storIDs) > 0 {
+		sql += " AND store_id IN (" + GenQuestionMarks(len(storIDs)) + ")"
+		sqlParams = append(sqlParams, storIDs)
+	}
+	if len(vendorIDs) > 0 {
+		sql += " AND vendor_id IN (" + GenQuestionMarks(len(vendorIDs)) + ")"
+		sqlParams = append(sqlParams, vendorIDs)
+	}
+	if vendorOrderID != "" {
+		sql += " AND vendor_order_id = ?"
+		sqlParams = append(sqlParams, vendorOrderID)
+	}
+	if len(statuss) > 0 {
+		sql += " AND status IN (" + GenQuestionMarks(len(statuss)) + ")"
+		sqlParams = append(sqlParams, statuss)
+	}
+	if stype > 0 {
+		sql += " AND type = ?"
+		sqlParams = append(sqlParams, stype)
+	}
+	if ID > 0 {
+		sql += " AND id = ?"
+		sqlParams = append(sqlParams, ID)
+	}
+	if IsReverse == -1 {
+		sql += " AND link_id = 0"
+	} else if IsReverse == 1 {
+		sql += " AND link_id <> 0"
+	}
+	err = GetRows(db, &orderSupplementFee, sql, sqlParams...)
+	return orderSupplementFee, err
+}

business/model/dao/new_config.go

@@ -49,3 +49,13 @@ func ValidateRoles(db *DaoDB, roles ...string) (err error) {
 	}
 	return errList.GetErrListAsOne()
 }
+
+func GetSysConfigAsInt64(db *DaoDB, key string) (value int64, err error) {
+	configList, err := QueryConfigs(db, key, model.ConfigTypeSys, "")
+	if err == nil && len(configList) > 0 {
+		value = utils.Str2Int64WithDefault(configList[0].Value, 0)
+	} else if true { //IsNoRowsError(err) { // todo 暂时忽略所有错误
+		err = nil
+	}
+	return value, err
+}

business/model/dao/report.go

@@ -36,8 +36,11 @@ type StatisticsReportForOrdersList struct {
 
 type PriceReferSnapshotExt struct {
 	model.PriceReferSnapshot
-	CityName string `json:"cityName"`
+	CityName    string `json:"cityName"`
-	SkuName  string `json:"skuName"`
+	SkuName     string `json:"skuName"`
+	SpecQuality float32
+	Unit        string
+	SpecUnit    string
 }
 
 //查询统计订单信息
@@ -186,12 +189,11 @@ func GetGetStatisticsReportForAfsOrders(db *DaoDB, storeIDs []int, fromDate time
 }
 
 func GetStatisticsReportForStoreSkusPrice(db *DaoDB, cityCodes, skuIDs []int) (priceReferSnapshot []*model.PriceReferSnapshot, err error) {
-	sql := `
+	var sql string
-	SELECT b.city_code,a.sku_id,
+	sql1 := `
-	ROUND(MAX(a.price/IF(b.pay_percentage=0,100,b.pay_percentage)*100)) max_price,
+	SELECT a.sku_id, c.name_id,
-	ROUND(MIN(a.price/IF(b.pay_percentage=0,100,b.pay_percentage)*100)) min_price,
+	`
-	ROUND(AVG(a.price/IF(b.pay_percentage=0,100,b.pay_percentage)*100)) avg_price,
+	sql2 := `
-	ROUND(SUBSTRING_INDEX(SUBSTRING_INDEX(GROUP_CONCAT((a.price/IF(b.pay_percentage=0,100,b.pay_percentage))*100 ORDER BY (a.price/IF(b.pay_percentage=0,100,b.pay_percentage))*100),',',Count(1)/2),',',-1)) mid_price,
 	MAX(a.jd_price) max_jd_price,
 	MIN(a.jd_price) min_jd_price,
 	ROUND(AVG(a.jd_price)) avg_jd_price,
@@ -212,6 +214,7 @@ func GetStatisticsReportForStoreSkusPrice(db *DaoDB, cityCodes, skuIDs []int) (p
 	t1.avg_vendor_price
 	FROM store_sku_bind a
 	JOIN store b ON a.store_id = b.id AND b.deleted_at = ? AND b.status != ?
+	JOIN sku c ON a.sku_id = c.id
 	LEFT JOIN (
 		SELECT SUM(t1.count),t1.sku_id,MAX(t1.sale_price) max_sale_price,MIN(t1.sale_price) min_sale_price,ROUND(AVG(t1.sale_price)) avg_sale_price,MAX(t1.vendor_price) max_vendor_price,MIN(t1.vendor_price) min_vendor_price,ROUND(AVG(t1.vendor_price)) avg_vendor_price
 		FROM order_sku t1
@@ -219,14 +222,13 @@ func GetStatisticsReportForStoreSkusPrice(db *DaoDB, cityCodes, skuIDs []int) (p
 		GROUP BY 2
 	)t1 ON t1.sku_id = a.sku_id
 	WHERE a.deleted_at = ?
-	AND a.status = ?
 	`
+	sql = sql1 + "b.city_code, " + sql2
 	sqlParams := []interface{}{
 		utils.DefaultTimeValue,
 		model.StoreStatusDisabled,
 		time.Now().AddDate(0, -1, 0),
 		utils.DefaultTimeValue,
-		model.SkuStatusNormal,
 	}
 	if len(skuIDs) > 0 {
 		sql += " AND a.sku_id IN (" + GenQuestionMarks(len(skuIDs)) + ")"
@@ -236,24 +238,40 @@ func GetStatisticsReportForStoreSkusPrice(db *DaoDB, cityCodes, skuIDs []int) (p
 		sql += " AND b.city_code IN (" + GenQuestionMarks(len(cityCodes)) + ")"
 		sqlParams = append(sqlParams, cityCodes)
 	}
+	sql += ` GROUP BY 1,2,3
+	UNION `
+	sql += sql1 + "0 city_code," + sql2
+	if len(skuIDs) > 0 {
+		sql += " AND a.sku_id IN (" + GenQuestionMarks(len(skuIDs)) + ")"
+		sqlParams = append(sqlParams, skuIDs)
+	}
+	if len(cityCodes) > 0 {
+		sql += " AND b.city_code IN (" + GenQuestionMarks(len(cityCodes)) + ")"
+		sqlParams = append(sqlParams, cityCodes)
+	}
 	sql += " GROUP BY 1,2"
+	sqlParams = append(sqlParams, sqlParams...)
 	if err = GetRows(db, &priceReferSnapshot, sql, sqlParams...); err == nil {
 		return priceReferSnapshot, nil
 	}
 	return nil, err
 }
 
-func GetPriceReferSnapshot(db *DaoDB, cityCodes, skuIDs []int, snapDate time.Time, offset, pageSize int) (priceReferSnapshot []*PriceReferSnapshotExt, totalCount int, err error) {
+func GetPriceReferSnapshot(db *DaoDB, cityCodes, skuIDs []int, skuNameID int, snapDate time.Time, offset, pageSize int) (priceReferSnapshot []*PriceReferSnapshotExt, totalCount int, err error) {
 	sql := `
-		SELECT SQL_CALC_FOUND_ROWS a.*,b.name city_name 
+		SELECT SQL_CALC_FOUND_ROWS a.*,IF(a.city_code = 0,'全国',b.name) city_name 
 		FROM price_refer_snapshot a
-		JOIN place b ON a.city_code = b.code
+		LEFT JOIN place b ON a.city_code = b.code
 		WHERE 1=1
 		AND a.deleted_at = ?
 	`
 	sqlParams := []interface{}{
 		utils.DefaultTimeValue,
 	}
+	if skuNameID > 0 {
+		sql += " AND a.name_id = ?"
+		sqlParams = append(sqlParams, skuNameID)
+	}
 	if len(skuIDs) > 0 {
 		sql += " AND a.sku_id IN (" + GenQuestionMarks(len(skuIDs)) + ")"
 		sqlParams = append(sqlParams, skuIDs)
@@ -284,3 +302,44 @@ func GetPriceReferSnapshot(db *DaoDB, cityCodes, skuIDs []int, snapDate time.Tim
 	}
 	return priceReferSnapshot, totalCount, err
 }
+
+func GetPriceReferSnapshotNoPage(db *DaoDB, cityCodes, skuIDs, skuNameIDs []int, snapDate time.Time) (priceReferSnapshot []*model.PriceReferSnapshot, err error) {
+	sql := `
+		SELECT  a.*
+		FROM price_refer_snapshot a
+		WHERE 1=1
+		AND a.deleted_at = ?
+	`
+	sqlParams := []interface{}{
+		utils.DefaultTimeValue,
+	}
+	if len(skuNameIDs) > 0 {
+		sql += " AND a.name_id IN (" + GenQuestionMarks(len(skuNameIDs)) + ")"
+		sqlParams = append(sqlParams, skuNameIDs)
+	}
+	if len(skuIDs) > 0 {
+		sql += " AND a.sku_id IN (" + GenQuestionMarks(len(skuIDs)) + ")"
+		sqlParams = append(sqlParams, skuIDs)
+	}
+	if len(cityCodes) > 0 {
+		sql += " AND a.city_code IN (" + GenQuestionMarks(len(cityCodes)) + ")"
+		sqlParams = append(sqlParams, cityCodes)
+	}
+	if !utils.IsTimeZero(snapDate) {
+		sql += " AND a.snapshot_at = ?"
+		sqlParams = append(sqlParams, snapDate)
+	}
+	err = GetRows(db, &priceReferSnapshot, sql, sqlParams...)
+	return priceReferSnapshot, err
+}
+
+func DeletePriceReferHistory(db *DaoDB, snapDate time.Time) (num int64, err error) {
+	sql := `
+		DELETE FROM price_refer_snapshot 
+		WHERE snapshot_at <= ?
+	`
+	sqlParams := []interface{}{
+		snapDate,
+	}
+	return ExecuteSQL(db, sql, sqlParams...)
+}

business/model/dao/sku.go

@@ -1,11 +1,8 @@
 package dao
 
 import (
-	"fmt"
-
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/model"
-	"git.rosy.net.cn/jx-callback/globals"
 )
 
 type SkuCategoryWithVendor struct {
@@ -154,31 +151,6 @@ func GetSkuByCats(db *DaoDB, catIDs []int) (skuList []*model.Sku, err error) {
 	return skuList, err
 }
 
-func SetSkuSyncStatus(db *DaoDB, vendorID int, skuIDs []int, syncStatus int) (num int64, err error) {
-	globals.SugarLogger.Debugf("SetSkuSyncStatus, vendorID:%d", vendorID)
-
-	fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID])
-	sql := fmt.Sprintf(`
-	UPDATE sku t1
-	SET t1.%s_sync_status = IF(t1.deleted_at = ?, t1.%s_sync_status | ?, 0)
-	`, fieldPrefix, fieldPrefix)
-	sqlParams := []interface{}{
-		utils.DefaultTimeValue,
-		syncStatus,
-	}
-	if (syncStatus & model.SyncFlagNewMask) != 0 {
-		sql += fmt.Sprintf(`,
-		t1.%s_id = 0
-		`, fieldPrefix)
-	}
-	sql += " WHERE 1 = 1"
-	if len(skuIDs) > 0 {
-		sql += " AND t1.id IN (" + GenQuestionMarks(len(skuIDs)) + ")"
-		sqlParams = append(sqlParams, skuIDs)
-	}
-	return ExecuteSQL(db, sql, sqlParams...)
-}
-
 // todo, GetSkuCategoryWithVendor与GetSkusWithVendor，
 // 如果mustDirty为true，应该是要thing_map为基表，LEFT JOIN原始实体表，否则当原始实体记录在未同步前被物理删除后，无法真正同步
 

business/model/dao/store.go

@@ -6,6 +6,7 @@ import (
 
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/globals"
 )
 
 // 带购物平台信息的
@@ -210,7 +211,7 @@ func GetStoreCourierList(db *DaoDB, storeIDs []int, status, auditStatus int) (co
 	return nil, err
 }
 
-func GetStoresMapList(db *DaoDB, vendorIDs, storeIDs []int, status, isSync int, pricePack string) (storeMapList []*model.StoreMap, err error) {
+func GetStoresMapList2(db *DaoDB, vendorIDs, storeIDs []int, status, isSync int, pricePack string, mustDirty bool) (storeMapList []*model.StoreMap, err error) {
 	sql := `
 	SELECT t1.*
 	FROM store_map t1
@@ -241,6 +242,9 @@ func GetStoresMapList(db *DaoDB, vendorIDs, storeIDs []int, status, isSync int,
 		sql += " AND t1.price_percentage_pack = ?"
 		sqlParams = append(sqlParams, pricePack)
 	}
+	if mustDirty {
+		sql += " AND t1.sync_status <> 0"
+	}
 	sql += " ORDER BY t1.store_id DESC, t1.vendor_id"
 	if err = GetRows(db, &storeMapList, sql, sqlParams...); err == nil {
 		return storeMapList, nil
@@ -248,6 +252,10 @@ func GetStoresMapList(db *DaoDB, vendorIDs, storeIDs []int, status, isSync int,
 	return nil, err
 }
 
+func GetStoresMapList(db *DaoDB, vendorIDs, storeIDs []int, status, isSync int, pricePack string) (storeMapList []*model.StoreMap, err error) {
+	return GetStoresMapList2(db, vendorIDs, storeIDs, status, isSync, pricePack, false)
+}
+
 // 此函数在检测到一个门店的所有平台状态一样，且不为StoreStatusOpened时，
 // 将平台门店状态全部改为StoreStatusOpened，则把京西门店状态改为之前那个统一的平台门店状态
 func FormalizeStoreStatus(db *DaoDB, storeID, storeStatus int) (err error) {
@@ -495,7 +503,7 @@ func GetStorePriceScore(db *DaoDB, storeIDs, vendorIDs []int, fromScore, toScore
 		FROM store_price_score_snapshot a
 		JOIN store b ON b.id = a.store_id
 		JOIN place e ON e.code = b.city_code
-		JOIN (SELECT a.store_id, count(d.type = ? OR NULL) direct_down_count, count(d.type = ? OR NULL) sec_kill_count
+		LEFT JOIN (SELECT a.store_id, count(d.type = ? OR NULL) direct_down_count, count(d.type = ? OR NULL) sec_kill_count
 				FROM store_sku_bind a
 		   	LEFT JOIN act_store_sku b ON a.store_id = b.store_id AND b.sku_id = a.sku_id
 		   	LEFT JOIN act_map c ON c.act_id = b.act_id
@@ -558,16 +566,15 @@ func GetStorePriceScore(db *DaoDB, storeIDs, vendorIDs []int, fromScore, toScore
 
 func GetStorePriceScoreSnapshot(db *DaoDB, snapDate time.Time) (storePriceScoreSnapshot []*model.StorePriceScoreSnapshot, err error) {
 	sql := `
-		SELECT c.store_id,ROUND(count(c.price <= a.mid_price or NULL)/count(*)*100,2) score
+		SELECT c.store_id,ROUND(count(c.unit_price/IF(d.pay_percentage < 50 , 70, d.pay_percentage)*100 <= a.mid_unit_price or NULL)/count(*)*100,2) score
 		FROM price_refer_snapshot a
-		JOIN store_sku_bind c ON c.sku_id = a.sku_id AND c.status = 1 AND c.deleted_at = ?
+		JOIN store_sku_bind c ON c.sku_id = a.sku_id AND c.status = ? AND c.deleted_at = ?
 		JOIN store d ON c.store_id = d.id AND d.city_code = a.city_code AND d.deleted_at = ? AND d.status != ?
 		WHERE 1=1
 	`
 	sqlParams := []interface{}{
-		utils.DefaultTimeValue,
+		model.StoreSkuBindStatusNormal, utils.DefaultTimeValue,
-		utils.DefaultTimeValue,
+		utils.DefaultTimeValue, model.StoreStatusDisabled,
-		model.StoreStatusDisabled,
 	}
 	if !utils.IsTimeZero(snapDate) {
 		sql += " AND a.snapshot_at = ?"
@@ -579,3 +586,26 @@ func GetStorePriceScoreSnapshot(db *DaoDB, snapDate time.Time) (storePriceScoreS
 	err = GetRows(db, &storePriceScoreSnapshot, sql, sqlParams...)
 	return storePriceScoreSnapshot, err
 }
+
+func SetStoreMapSyncStatus(db *DaoDB, vendorIDs, storeIDs []int, syncStatus int) (num int64, err error) {
+	globals.SugarLogger.Debugf("SetStoreMapSyncStatus, vendorIDs:%v, storeIDs:%v", vendorIDs, storeIDs)
+
+	sql := `
+	UPDATE store_map t1
+	SET t1.sync_status = t1.sync_status | ?
+	`
+	sqlParams := []interface{}{
+		syncStatus,
+	}
+	sql += " WHERE t1.is_sync <> 0 AND t1.deleted_at = ? AND t1.sync_status & ? = 0"
+	sqlParams = append(sqlParams, utils.DefaultTimeValue, model.SyncFlagDeletedMask)
+	if len(vendorIDs) > 0 {
+		sql += " AND t1.vendor_id IN (" + GenQuestionMarks(len(vendorIDs)) + ")"
+		sqlParams = append(sqlParams, vendorIDs)
+	}
+	if len(storeIDs) > 0 {
+		sql += " AND t1.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")"
+		sqlParams = append(sqlParams, storeIDs)
+	}
+	return ExecuteSQL(db, sql, sqlParams...)
+}

business/model/dao/store_sku.go

@@ -13,6 +13,11 @@ import (
 	"git.rosy.net.cn/jx-callback/globals"
 )
 
+type StoreSkuAndAct struct {
+	*model.StoreSkuBind
+	ActMap map[int]*model.StoreSkuAct
+}
+
 var (
 	dataResFieldMap = map[int]string{
 		model.VendorIDMTWM: "mtwm_url",
@@ -45,6 +50,8 @@ type StoreSkuSyncInfo struct {
 	StoreID int `orm:"column(store_id)"`
 	SkuID   int `orm:"column(sku_id)"` // 这个与Sku.ID的区别是SkuID是必然存在的
 
+	BoxFee int64
+
 	Price     int64
 	UnitPrice int64
 
@@ -130,6 +137,8 @@ type StoreSkuNameExt struct {
 
 	PendingOpType    int8 `json:"pendingOpType"`    // 取值同 StoreOpRequest.Type
 	PendingUnitPrice int  `json:"pendingUnitPrice"` // 这个是待审核的价格申请
+	Status           int
+	RealMidUnitPrice int `json:"realMidUnitPrice"`
 }
 
 // GetStoreSkus用
@@ -198,11 +207,19 @@ type StoreSkuExt struct {
 
 type SkuNameAndPlace struct {
 	model.SkuName
-	CityCode int    `json:"cityCode"`
+	CityCode int                 `json:"cityCode"`
-	CityName string `json:"cityName"`
+	CityName string              `json:"cityName"`
-	Sequence int    `json:"sequence"`
+	Sequence int                 `json:"sequence"`
-	Count    int    `json:"count"`
+	Count    int                 `json:"count"`
-	Type     int    `json:"type"`
+	Type     int                 `json:"type"`
+	Skus     []*model.SkuAndName `json:"skus"`
+}
+
+type StoreSkuPriceAndWeight struct {
+	VendorSkuID string `orm:"column(vendor_sku_id)"`
+	SkuID       int    `orm:"column(sku_id)"`
+	Weight      int
+	Price       int
 }
 
 // todo 应该通过需要同步的skuid来驱动同步分类，而不是当前这种分开的逻辑
@@ -629,6 +646,42 @@ func oldGetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSync
 	return skus, err
 }
 
+func GetStoreSkuPriceAndWeight(db *DaoDB, vendorStoreID string, vendorID int, vendorSkuIDs []string) (l []*StoreSkuPriceAndWeight, err error) {
+	var vendorSkuIDField, sqlThingMap string
+	var thingMapParams []interface{}
+	if vendorID == model.VendorIDJX {
+		vendorSkuIDField = "t1.id"
+	} else if model.MultiStoresVendorMap[vendorID] != 0 {
+		sqlThingMap = `
+	JOIN thing_map t4 ON t4.thing_type = ? AND t4.thing_id = t1.id AND t4.deleted_at = ? AND t4.vendor_id = t3.vendor_id AND t4.vendor_org_code = t3.vendor_org_code`
+		thingMapParams = []interface{}{
+			model.ThingTypeSku, utils.DefaultTimeValue,
+		}
+		vendorSkuIDField = "t4.vendor_thing_id"
+	} else {
+		vendorSkuIDField = fmt.Sprintf("t2.%s_id", ConvertDBFieldPrefix(model.VendorNames[vendorID]))
+	}
+	sql := fmt.Sprintf(`
+	SELECT %s vendor_sku_id, t1.id sku_id, t2.price, t1.weight
+	FROM sku t1
+	JOIN store_sku_bind t2 ON t2.sku_id = t1.id AND t2.deleted_at = ?
+	JOIN store_map t3 ON t3.store_id = t2.store_id AND t3.vendor_id = ? AND t3.vendor_store_id = ? AND t2.deleted_at = ?
+	%s
+	WHERE %s IN (`+GenQuestionMarks(len(vendorSkuIDs))+`)`, vendorSkuIDField, sqlThingMap, vendorSkuIDField)
+	sqlParams := []interface{}{
+		utils.DefaultTimeValue,
+		vendorID, vendorStoreID, utils.DefaultTimeValue,
+	}
+	sqlParams = append(sqlParams, thingMapParams...)
+	if vendorID == model.VendorIDJX {
+		sqlParams = append(sqlParams, utils.StringSlice2Int(vendorSkuIDs))
+	} else {
+		sqlParams = append(sqlParams, vendorSkuIDs)
+	}
+	err = GetRows(db, &l, sql, sqlParams...)
+	return l, err
+}
+
 // 这个函数之前是要设置没有删除或同步标志不为0的，会导致将同步标志不为0且删除了的把标志去掉，现在改为只设置没有删除的
 func SetStoreSkuSyncStatus(db *DaoDB, vendorID int, storeIDs []int, skuIDs []int, syncStatus int) (num int64, err error) {
 	globals.SugarLogger.Debugf("SetStoreSkuSyncStatus, storeIDs:%v, vendorID:%d", storeIDs, vendorID)
@@ -750,6 +803,55 @@ func GetStoresSkusInfo(db *DaoDB, storeIDs, skuIDs []int) (storeSkuList []*model
 	return storeSkuList, err
 }
 
+func GetStoresSkusAndActInfo(db *DaoDB, storeIDs, skuIDs, vendorIDs []int) (storeSkuAndActList []*StoreSkuAndAct, err error) {
+	storeSkuList, err := GetStoresSkusInfo(db, storeIDs, skuIDs)
+	if err == nil && len(storeSkuList) > 0 {
+		storeSkuActList, err2 := GetStoresSkusAct(db, storeIDs, skuIDs, vendorIDs)
+		if err = err2; err == nil {
+			actMap := make(map[int64][]*model.StoreSkuAct)
+			for _, v := range storeSkuActList {
+				actMap[jxutils.Combine2Int(v.StoreID, v.SkuID)] = append(actMap[jxutils.Combine2Int(v.StoreID, v.SkuID)], v)
+			}
+			for _, v := range storeSkuList {
+				storeSkuAct := &StoreSkuAndAct{
+					StoreSkuBind: v,
+					ActMap:       make(map[int]*model.StoreSkuAct),
+				}
+				for _, vv := range actMap[jxutils.Combine2Int(v.StoreID, v.SkuID)] {
+					storeSkuAct.ActMap[vv.VendorID] = vv
+				}
+				storeSkuAndActList = append(storeSkuAndActList, storeSkuAct)
+			}
+		}
+	}
+	return storeSkuAndActList, err
+}
+
+func GetStoresSkusAct(db *DaoDB, storeIDs, skuIDs, vendorIDs []int) (storeSkuActList []*model.StoreSkuAct, err error) {
+	sql := `
+	SELECT *
+	FROM store_sku_act t1
+	WHERE t1.deleted_at = ?
+	`
+	sqlParams := []interface{}{
+		utils.DefaultTimeValue,
+	}
+	if len(storeIDs) > 0 {
+		sql += " AND t1.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")"
+		sqlParams = append(sqlParams, storeIDs)
+	}
+	if len(skuIDs) > 0 {
+		sql += " AND t1.sku_id IN (" + GenQuestionMarks(len(skuIDs)) + ")"
+		sqlParams = append(sqlParams, skuIDs)
+	}
+	if len(vendorIDs) > 0 {
+		sql += " AND t1.vendor_id IN (" + GenQuestionMarks(len(vendorIDs)) + ")"
+		sqlParams = append(sqlParams, vendorIDs)
+	}
+	err = GetRows(db, &storeSkuActList, sql, sqlParams...)
+	return storeSkuActList, err
+}
+
 // vendorID, vendorStoreIDs和vendorSkuIDs都是必须参数
 func GetStoresSkusInfoByVendorInfo(db *DaoDB, vendorID int, vendorStoreIDs, vendorSkuIDs []string) (storeSkuList []*StoreSkuBindWithVendorInfo, err error) {
 	if len(vendorStoreIDs) == 0 || len(vendorSkuIDs) == 0 {
@@ -1006,7 +1108,7 @@ func GetStoreSkusByNameIDs(db *DaoDB, storeIDs []int, nameID int) (skuList []*St
 
 func GetTopSkusByStoreIDs(db *DaoDB, storeIDs []int) (storeSkuNameExt []*StoreSkuNameExt, err error) {
 	sql := `
-	SELECT t2.id sku_id,t3.*,t1.store_id,t1.store_name
+	SELECT 1 s, t1.count, t2.id sku_id, t3.*, t1.store_id, t1.store_name
 	FROM(
 		SELECT SUM(b.count) count,c.id,a.store_id,d.name store_name
 		FROM goods_order a
@@ -1034,10 +1136,32 @@ func GetTopSkusByStoreIDs(db *DaoDB, storeIDs []int) (storeSkuNameExt []*StoreSk
 		GROUP BY 2,3,4)t1
 	JOIN sku t2 ON t2.id = t1.id
 	JOIN sku_name t3 ON t3.id = t2.name_id
-	ORDER BY t1.count DESC
+	UNION ALL
+	SELECT 2 s, 0 count, a.sku_id, g.*, a.store_id, e.name store_name
+				FROM store_sku_bind a
+		   	LEFT JOIN act_store_sku b ON a.store_id = b.store_id AND b.sku_id = a.sku_id
+		   	LEFT JOIN act_map c ON c.act_id = b.act_id
+			LEFT JOIN act d ON d.id = c.act_id
+					JOIN store e ON e.id = a.store_id
+					JOIN sku f ON a.sku_id = f.id AND f.deleted_at = ?
+				JOIN sku_name g ON g.id = f.name_id AND g.deleted_at = ?
+			WHERE 1=1
+			`
+	sqlParams = append(sqlParams, salePriceLimit, utils.DefaultTimeValue, utils.DefaultTimeValue)
+	if len(storeIDs) > 0 {
+		sql += " AND a.store_id IN(" + GenQuestionMarks(len(storeIDs)) + ")"
+		sqlParams = append(sqlParams, storeIDs)
+	}
+	sql +=
+		`
+				AND NOW() BETWEEN d.begin_at AND d.end_at
+				AND a.status = ?
+				AND a.deleted_at = ?
+				AND (d.type = ? OR d.type = ?)
+	ORDER BY 1,2 DESC
 	LIMIT ?
 	`
-	sqlParams = append(sqlParams, salePriceLimit, 30)
+	sqlParams = append(sqlParams, model.StoreSkuBindStatusNormal, utils.DefaultTimeValue, model.ActSkuDirectDown, model.ActSkuSecKill, 30)
 	err = GetRows(db, &storeSkuNameExt, sql, sqlParams...)
 	var skuNamesInfo = &StoreSkuNamesInfo{
 		SkuNames: storeSkuNameExt,
@@ -1183,30 +1307,6 @@ func GetStoreSkuCategories(db *DaoDB, storeID, parentID int) (catList []*model.S
 	return catList, err
 }
 
-func RefershStoreSkusMidPrice(db *DaoDB, storeIDs []int) (count int64, err error) {
-	sql := `
-		UPDATE store_sku_bind a
-		JOIN store d ON d.id = a.store_id
-		JOIN price_refer_snapshot b ON a.sku_id = b.sku_id AND b.snapshot_at = ? AND d.city_code = b.city_code
-		SET a.price = (b.mid_price*IF(d.pay_percentage=0,100,d.pay_percentage))/100
-		WHERE 1=1
-		`
-	sqlParams := []interface{}{
-		utils.Time2Date(time.Now().AddDate(0, 0, -1)),
-	}
-	if len(storeIDs) > 0 {
-		sql += " AND a.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")"
-		sqlParams = append(sqlParams, storeIDs)
-	}
-	sql += `
-		AND (a.price/IF(d.pay_percentage=0,100,d.pay_percentage))*100 > b.mid_price
-		AND a.deleted_at = ?
-		AND a.status = ?
-	`
-	sqlParams = append(sqlParams, utils.DefaultTimeValue, model.SkuStatusNormal)
-	return ExecuteSQL(db, sql, sqlParams)
-}
-
 func GetStoreSkuNamePrice(db *DaoDB) (storeSkuNamePriceList []*model.StoreSkuNamePrice, err error) {
 	sql := `
 		SELECT * 
@@ -1345,49 +1445,103 @@ func GetDeletedStoreSkuBind(db *DaoDB, storeID, skuID int) (storeSkuBind *model.
 	return storeSkuBind
 }
 
-func GetMidPriceByNameID(db *DaoDB, cityCode, skuNameID int, snapDate time.Time) (midPrice int, err error) {
+func GetStoreSkuBindByNameID(db *DaoDB, storeID, nameID, status int) (storeSkuBind []*model.StoreSkuBind, err error) {
+	sql := `
+		SELECT c.* 
+		FROM sku a 
+		JOIN store_sku_bind c ON c.sku_id = a.id
+		WHERE c.store_id = ?
+		AND a.name_id = ?
+		AND c.deleted_at = ?
+		AND a.deleted_at = ?
+		AND c.status = ?
+	`
+	sqlParams := []interface{}{
+		storeID,
+		nameID,
+		utils.DefaultTimeValue,
+		utils.DefaultTimeValue,
+		status,
+	}
+	err = GetRows(db, &storeSkuBind, sql, sqlParams...)
+	return storeSkuBind, err
+}
+
+func GetPriceReferPrice(db *DaoDB, cityCode int, skuID int, snapDate time.Time) (result *PriceReferSnapshotExt, err error) {
 	var (
-		sku    []*model.SkuAndName
+		pRefer     *PriceReferSnapshotExt
-		skuMap = make(map[int]int)
+		priceRefer = &PriceReferSnapshotExt{}
 	)
 	sql := `
-		SELECT a.mid_price price, a.sku_id id, b.spec_quality, c.unit, b.spec_unit
+		SELECT a.max_unit_price, a.min_unit_price, a.avg_unit_price, a.mid_unit_price, a.sku_id id, b.spec_quality, c.unit, b.spec_unit
 		FROM price_refer_snapshot a
 		JOIN sku b ON a.sku_id = b.id 
 		JOIN sku_name c ON c.id = b.name_id
-		WHERE c.id = ?
+		WHERE 1=1
 		AND a.snapshot_at = ?
 		AND a.city_code = ?
 	`
 	sqlParams := []interface{}{
-		skuNameID,
 		snapDate,
 		cityCode,
 	}
-	err = GetRows(db, &sku, sql, sqlParams...)
+	if skuID > 0 {
-	if err != nil {
+		sql += " AND a.sku_id = ?"
-		return 0, err
+		sqlParams = append(sqlParams, skuID)
 	}
-	if len(sku) > 0 {
+	err = GetRow(db, &pRefer, sql, sqlParams...)
-		for _, v := range sku {
+	if err != nil {
-			var (
+		return nil, err
-				price       int
+	}
-				specQuality float64
+	if pRefer != nil {
-			)
+		var (
-			if v.Unit == model.SpecialUnit {
+			specQuality float64
-				if v.SpecUnit == model.SpecUnitNames[1] || v.SpecUnit == model.SpecUnitNames[2] {
+		)
-					specQuality = float64(v.SpecQuality) * 1000
+		if pRefer.Unit == model.SpecialUnit {
-				} else {
+			if pRefer.SpecUnit == model.SpecUnitNames[1] || pRefer.SpecUnit == model.SpecUnitNames[2] {
-					specQuality = float64(v.SpecQuality)
+				specQuality = float64(pRefer.SpecQuality) * 1000
-				}
-				price = int(utils.Float64TwoInt64(utils.Int2Float64(model.SpecialSpecQuality) / specQuality * utils.Int2Float64(v.Price)))
 			} else {
-				price = v.Price
+				specQuality = float64(pRefer.SpecQuality)
-			}
-			if skuMap[skuNameID] < price {
-				skuMap[skuNameID] = price
 			}
+			priceRefer.MaxPrice = int(utils.Float64TwoInt64(specQuality / utils.Int2Float64(model.SpecialSpecQuality) * utils.Int2Float64(pRefer.MaxUnitPrice)))
+			priceRefer.MinPrice = int(utils.Float64TwoInt64(specQuality / utils.Int2Float64(model.SpecialSpecQuality) * utils.Int2Float64(pRefer.MinUnitPrice)))
+			priceRefer.AvgPrice = int(utils.Float64TwoInt64(specQuality / utils.Int2Float64(model.SpecialSpecQuality) * utils.Int2Float64(pRefer.AvgUnitPrice)))
+			priceRefer.MidPrice = int(utils.Float64TwoInt64(specQuality / utils.Int2Float64(model.SpecialSpecQuality) * utils.Int2Float64(pRefer.MidUnitPrice)))
+		} else {
+			priceRefer.MaxPrice = pRefer.MaxUnitPrice
+			priceRefer.MinPrice = pRefer.MinUnitPrice
+			priceRefer.AvgPrice = pRefer.AvgUnitPrice
+			priceRefer.MidPrice = pRefer.MidUnitPrice
 		}
 	}
-	return skuMap[skuNameID], err
+	return priceRefer, err
+}
+
+func GetStoreSkusAndSkuName(db *DaoDB, storeIDs, skuIDs, nameIDs []int) (storeSkuNameExt []*StoreSkuNameExt, err error) {
+	sql := `
+	SELECT a.*,c.id
+	FROM store_sku_bind a
+	JOIN sku b ON b.id = a.sku_id AND b.deleted_at = ?
+	JOIN sku_name c ON c.id = b.name_id AND c.deleted_at = ?
+	WHERE a.deleted_at = ?
+	`
+	sqlParams := []interface{}{
+		utils.DefaultTimeValue,
+		utils.DefaultTimeValue,
+		utils.DefaultTimeValue,
+	}
+	if len(storeIDs) > 0 {
+		sql += " AND a.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")"
+		sqlParams = append(sqlParams, storeIDs)
+	}
+	if len(skuIDs) > 0 {
+		sql += " AND a.sku_id IN (" + GenQuestionMarks(len(skuIDs)) + ")"
+		sqlParams = append(sqlParams, skuIDs)
+	}
+	if len(nameIDs) > 0 {
+		sql += " AND b.name_id IN (" + GenQuestionMarks(len(nameIDs)) + ")"
+		sqlParams = append(sqlParams, nameIDs)
+	}
+	err = GetRows(db, &storeSkuNameExt, sql, sqlParams...)
+	return storeSkuNameExt, err
 }

business/model/dao/thing_map.go

@@ -1,10 +1,12 @@
 package dao
 
-import "git.rosy.net.cn/jx-callback/business/model"
+import (
+	"fmt"
 
-import "git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/baseapi/utils"
-
+	"git.rosy.net.cn/jx-callback/business/model"
-import "git.rosy.net.cn/jx-callback/globals"
+	"git.rosy.net.cn/jx-callback/globals"
+)
 
 func GetThingMapList(db *DaoDB, thingType int, vendorIDs, thingIDs []int) (cats []*model.ThingMap, err error) {
 	sql := `
@@ -38,7 +40,7 @@ func GetThingMapMap(db *DaoDB, thingType int, vendorIDs, thingIDs []int) (thingM
 func SetThingMapSyncStatus(db *DaoDB, vendorIDs []int, vendorOrgCodes []string, thingType int, thingIDs []int, syncStatus int8) (num int64, err error) {
 	sql := `
 	UPDATE thing_map t1
-	SET t1.sync_status |= ?
+	SET t1.sync_status = t1.sync_status | ?
 	WHERE t1.deleted_at = ? AND t1.thing_type = ?
 	`
 	sqlParams := []interface{}{
@@ -86,3 +88,33 @@ func SetSkuNameSyncStatus(db *DaoDB, vendorIDs []int, vendorOrgCodes []string, n
 	}
 	return num, err
 }
+
+func SetSkuSyncStatus(db *DaoDB, vendorID int, skuIDs []int, syncStatus int8) (num int64, err error) {
+	globals.SugarLogger.Debugf("SetSkuSyncStatus, vendorID:%d", vendorID)
+
+	if globals.IsUseThingMap {
+		num, err = SetThingMapSyncStatus(db, []int{vendorID}, nil, model.ThingTypeSku, skuIDs, syncStatus)
+	} else {
+		fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID])
+		sql := fmt.Sprintf(`
+	UPDATE sku t1
+	SET t1.%s_sync_status = IF(t1.deleted_at = ?, t1.%s_sync_status | ?, 0)
+	`, fieldPrefix, fieldPrefix)
+		sqlParams := []interface{}{
+			utils.DefaultTimeValue,
+			syncStatus,
+		}
+		if (syncStatus & model.SyncFlagNewMask) != 0 {
+			sql += fmt.Sprintf(`,
+		t1.%s_id = 0
+		`, fieldPrefix)
+		}
+		sql += " WHERE 1 = 1"
+		if len(skuIDs) > 0 {
+			sql += " AND t1.id IN (" + GenQuestionMarks(len(skuIDs)) + ")"
+			sqlParams = append(sqlParams, skuIDs)
+		}
+		num, err = ExecuteSQL(db, sql, sqlParams...)
+	}
+	return num, err
+}

business/model/event.go

@@ -0,0 +1,35 @@
+package model
+
+import "time"
+
+type OperateEvent struct {
+	ID           int64     `orm:"column(id)" json:"id"`
+	CreatedAt    time.Time `orm:"auto_now_add;type(datetime)" json:"createdAt"`
+	LastOperator string    `orm:"size(32)" json:"lastOperator"` // 最后操作员
+	AccessUUID   string    `orm:"column(access_uuid)" json:"accessUUID"`
+	UserID       string    `orm:"column(user_id)" json:"userID"`
+	APIFunction  string    `orm:"column(api_function)" json:"apiFunction"`
+}
+
+func (v *OperateEvent) TableIndex() [][]string {
+	return [][]string{
+		[]string{"AccessUUID", "UserID"},
+	}
+}
+
+type OperateEventDetail struct {
+	ID          int64  `orm:"column(id)" json:"id"`
+	OperateType int    `json:"operateType"` // 1为修改，2为新增，4为删除
+	ThingID     int    `orm:"column(thing_id)" json:"thingID"`
+	ThingType   int    `json:"thingType"` //各字段类型
+	StoreID     int    `orm:"column(store_id)" json:"storeID"`
+	AccessUUID  string `orm:"column(access_uuid)" json:"accessUUID"`
+	BeforeData  string `orm:"size(32)" json:"beforeData"`
+	AfterData   string `orm:"size(32)" json:"afterData"`
+}
+
+func (v *OperateEventDetail) TableIndex() [][]string {
+	return [][]string{
+		[]string{"AccessUUID", "ThingID", "StoreID"},
+	}
+}

business/model/model.go

@@ -27,7 +27,7 @@ const (
 
 	FieldCategoryID = "CategoryID"
 
-	FieldJdID = "JdID"
+	// FieldJdID = "JdID"
 	// FieldElmID  = "ElmID"
 	FieldEbaiID = "EbaiID"
 	FieldMtwmID = "MtwmID"

business/model/new_config.go

@@ -10,6 +10,9 @@ const (
 
 const (
 	ConfigSysFakeOrderMobiles = "FakeOrderMobiles" // 假订单手机
+	ConfigSysEbaiBoxFee       = "EbaiBoxFee"       // 饿百打包费
+	ConfigSysMtwmBoxFee       = "MtwmBoxFee"       // 美团外卖打包费
+	ConfigSysMtwmSkuBoxFee    = "MtwmSkuBoxFee"    // 美团外卖单商品打包费
 )
 
 var (

business/model/order.go

@@ -346,7 +346,22 @@ type OrderPayRefund struct {
 
 type OrderSupplementFee struct {
 	ModelIDCULD
-	VendorOrderID string `orm:"column(vendor_order_id);index;size(48)" json:"vendorOrderID"`
+	StoreID        int        `orm:"column(store_id)" json:"storeID"`
+	VendorOrderID  string     `orm:"column(vendor_order_id);size(48)" json:"vendorOrderID"`
+	VendorID       *int       `orm:"column(vendor_id);null" json:"vendorID"`
+	Status         int        `json:"status"`                       //账单状态，若已结账则不允许再修改 ，暂时 0为未结账，1为已结账,-1为作废
+	LinkID         int        `orm:"column(link_id)" json:"linkID"` //作为冲账标志关联某条扣款记录
+	SupplementTime *time.Time `orm:"type(datetime);null" json:"supplementTime"`
+	Type           int        `json:"type"`                                  //扣款类型，1为差评订单补贴，2为优惠券
+	SupplementFee  int        `json:"supplementFee"`                         //扣款金额
+	BillID         string     `orm:"column(bill_id);size(48)" json:"billID"` //账单ID
+	Comment        string     `orm:"size(255)" json:"comment"`
+}
+
+func (v *OrderSupplementFee) TableIndex() [][]string {
+	return [][]string{
+		[]string{"StoreID", "VendorOrderID", "SupplementTime"},
+	}
 }
 
 // 判断是否是购买平台自有物流

business/model/sku.go

@@ -93,6 +93,7 @@ var (
 		"鲜切",
 		"进口",
 		"冰镇",
+		"预售",
 	}
 
 	SpecialUnit        = "份"
@@ -147,10 +148,10 @@ type SkuCategory struct {
 
 	// ElmCategoryID int64 `orm:"column(elm_category_id)" json:"elmCategoryID"` // 这个是指对应的饿了么商品类别
 	// WscCategoryID int64 `orm:"column(wsc_category_id)" json:"wscCategoryID"` // 这个是指对应的美团外卖商品类别
-	Status       int8   `orm:"default(1)" json:"status"`  //分类状态，0表示禁用，1表示启用
+	Status int8   `orm:"default(1)" json:"status"` //分类状态，0表示禁用，1表示启用
-	Img          string `orm:"size(512)" json:"img"`      //分类图片
+	Img    string `orm:"size(512)" json:"img"`     //分类图片
-	JdID         int64  `orm:"column(jd_id)" json:"jdID"` // 这个是指商家自己的商品类别在京东平台上的ID
+	// JdID         int64  `orm:"column(jd_id);index" json:"jdID"` // 这个是指商家自己的商品类别在京东平台上的ID
-	JdSyncStatus int8   `orm:"default(2)" json:"jdSyncStatus"`
+	// JdSyncStatus int8   `orm:"default(2)" json:"jdSyncStatus"`
 }
 
 func (*SkuCategory) TableUnique() [][]string {
@@ -159,12 +160,6 @@ func (*SkuCategory) TableUnique() [][]string {
 	}
 }
 
-func (*SkuCategory) TableIndex() [][]string {
-	return [][]string{
-		[]string{"JdID", "DeletedAt"},
-	}
-}
-
 type SkuName struct {
 	ModelIDCULD
 
@@ -197,10 +192,10 @@ type SkuName struct {
 	Status int     `orm:"default(1)" json:"status"`    // skuname状态，取值同sku.Status
 	IsSpu  int8    `orm:"column(is_spu)" json:"isSpu"` // 用于指明是否SKUNAME当成SPU
 
-	JdID         int64 `orm:"column(jd_id);null;index" json:"jdID"`
+	// JdID         int64 `orm:"column(jd_id);null;index" json:"jdID"`
-	JdSyncStatus int8  `orm:"default(2)" json:"jdSyncStatus"`
+	// JdSyncStatus int8  `orm:"default(2)" json:"jdSyncStatus"`
 
-	LinkID int `orm:"column(link_id);null;index" json:"linkID"`
+	// LinkID int `orm:"column(link_id);null;index" json:"linkID"`
 }
 
 func (*SkuName) TableUnique() [][]string {
@@ -219,19 +214,19 @@ func (*SkuName) TableIndex() [][]string {
 type Sku struct {
 	ModelIDCULD
 
-	CategoryID   int     `orm:"column(category_id)" json:"categoryID"` // 特殊类别，一般用于秒杀，特价之类的特殊类别
+	CategoryID  int     `orm:"column(category_id)" json:"categoryID"` // 特殊类别，一般用于秒杀，特价之类的特殊类别
-	NameID       int     `orm:"column(name_id)" json:"nameID"`         // todo 这个索引应该要求唯一
+	NameID      int     `orm:"column(name_id)" json:"nameID"`         // todo 这个索引应该要求唯一
-	SkuIndex     int     `json:"-"`
+	SkuIndex    int     `json:"-"`
-	Comment      string  `orm:"size(255)" json:"comment"`
+	Comment     string  `orm:"size(255)" json:"comment"`
-	SpecQuality  float32 `json:"specQuality"`
+	SpecQuality float32 `json:"specQuality"`
-	SpecUnit     string  `orm:"size(8)" json:"specUnit"` // 质量或容量
+	SpecUnit    string  `orm:"size(8)" json:"specUnit"` // 质量或容量
-	Weight       int     `json:"weight"`                 // 重量/质量，单位为克，当相应的SkuName的SpecUnit为g或kg时，必须等于SpecQuality
+	Weight      int     `json:"weight"`                 // 重量/质量，单位为克，当相应的SkuName的SpecUnit为g或kg时，必须等于SpecQuality
-	Status       int     `json:"status"`
+	Status      int     `json:"status"`
-	Seq          int     `json:"seq"`
+	Seq         int     `json:"seq"`
-	JdID         int64   `orm:"column(jd_id);null;index" json:"jdID"`
+	// JdID         int64   `orm:"column(jd_id);null;index" json:"jdID"`
-	JdSyncStatus int8    `orm:"default(2)" json:"jdSyncStatus"`
+	// JdSyncStatus int8    `orm:"default(2)" json:"jdSyncStatus"`
 
-	LinkID int `orm:"column(link_id);null;index" json:"linkID"`
+	// LinkID int `orm:"column(link_id);null;index" json:"linkID"`
 }
 
 type SkuAndName struct {

business/model/store.go

@@ -444,10 +444,15 @@ type PriceReferSnapshot struct {
 	SnapshotAt     time.Time `orm:"type(datetime)" json:"snapshotAt"` // 这个不同于CreatedAt，SnapshotAt是逻辑上的时间，CreatedAt是实际存储的时间
 	CityCode       int       `json:"cityCode"`
 	SkuID          int       `orm:"column(sku_id)" json:"skuId"`
+	NameID         int       `orm:"column(name_id)" json:"nameID"`
 	MaxPrice       int       `json:"maxPrice"`
 	MinPrice       int       `json:"minPrice"`
 	AvgPrice       int       `json:"avgPrice"`
 	MidPrice       int       `json:"midPrice"`
+	MaxUnitPrice   int       `json:"maxUnitPrice"`
+	MinUnitPrice   int       `json:"minUnitPrice"`
+	AvgUnitPrice   int       `json:"avgUnitPrice"`
+	MidUnitPrice   int       `json:"midUnitPrice"`
 	MaxJdPrice     int       `json:"maxJdPrice"`
 	MinJdPrice     int       `json:"minJdPrice"`
 	AvgJdPrice     int       `json:"avgJdPrice"`
@@ -470,7 +475,7 @@ type PriceReferSnapshot struct {
 
 func (*PriceReferSnapshot) TableUnique() [][]string {
 	return [][]string{
-		[]string{"CityCode", "SkuID", "SnapshotAt"},
+		[]string{"CityCode", "NameID", "SkuID", "SnapshotAt"},
 	}
 }
 

business/model/store_sku.go

@@ -161,3 +161,32 @@ func (*StoreOpRequest) TableIndex() [][]string {
 		[]string{"StoreID", "Status", "Type"},
 	}
 }
+
+type StoreSkuAct struct {
+	ModelIDCULD // DeletedAt用于表示请求操作结束，而并不一定是删除
+
+	StoreID  int `orm:"column(store_id)"`
+	SkuID    int `orm:"column(sku_id)"`
+	VendorID int
+
+	ActID          int    `orm:"column(act_id);index" json:"actID"`
+	VendorActID    string `orm:"column(vendor_act_id);size(48);index" json:"vendorActID"`
+	SyncStatus     int8   `orm:"default(2)" json:"syncStatus"`
+	VendorPrice    int64  `json:"vendorPrice"`    // 创建活动时的平台价格
+	ActualActPrice int64  `json:"actualActPrice"` // 单品级活动用，创建活动时商品的活动价格
+
+	EarningActID int `orm:"column(earning_act_id);index" json:"earningActID"`
+	EarningPrice int `json:"earningPrice"`
+}
+
+func (*StoreSkuAct) TableUnique() [][]string {
+	return [][]string{
+		[]string{"StoreID", "SkuID", "VendorID", "DeletedAt"},
+	}
+}
+
+func (*StoreSkuAct) TableIndex() [][]string {
+	return [][]string{
+		[]string{"SkuID", "DeletedAt"},
+	}
+}

business/netspider/netspider.go

@@ -51,30 +51,34 @@ func GetCityShops(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorIDs []
 func getStorePageInfo(ctx *jxcontext.Context, handler partner.IPurchasePlatformNetSpiderHandler, cityCode int, vendorStoreID string) (storePageInfo *model.PageShop, err error) {
 	storePageInfo, err = handler.GetStorePageInfo(ctx, vendorStoreID)
 	if err == nil && storePageInfo != nil {
-		if !(storePageInfo.Lng != 0 && storePageInfo.Lat != 0) {
+		updatePageShopCityDistrictInfo(ctx, storePageInfo, cityCode)
-			storePageInfo.Lng, storePageInfo.Lat, storePageInfo.DistrictCode = api.AutonaviAPI.GetCoordinateFromAddress(storePageInfo.Address, utils.Int2Str(cityCode))
-			if storePageInfo.DistrictCode == 0 && cityCode != 0 {
-				if place, err := dao.GetPlaceByCode(dao.GetDB(), cityCode); err == nil {
-					storePageInfo.Lng, storePageInfo.Lat, storePageInfo.DistrictCode = api.AutonaviAPI.GetCoordinateFromAddress(storePageInfo.Address, utils.Int2Str(place.ParentCode))
-				}
-			}
-		} else if storePageInfo.DistrictCode == 0 {
-			storePageInfo.DistrictCode = api.AutonaviAPI.GetCoordinateDistrictCode(storePageInfo.Lng, storePageInfo.Lat)
-		}
-		if storePageInfo.CityCode == 0 {
-			if storePageInfo.DistrictCode != 0 {
-				if place, err := dao.GetPlaceByCode(dao.GetDB(), storePageInfo.DistrictCode); err == nil {
-					storePageInfo.CityCode = place.ParentCode
-				}
-			}
-			if storePageInfo.CityCode == 0 {
-				storePageInfo.CityCode = cityCode
-			}
-		}
 	}
 	return storePageInfo, err
 }
 
+func updatePageShopCityDistrictInfo(ctx *jxcontext.Context, storePageInfo *model.PageShop, cityCode int) {
+	if !(storePageInfo.Lng != 0 && storePageInfo.Lat != 0) {
+		storePageInfo.Lng, storePageInfo.Lat, storePageInfo.DistrictCode = api.AutonaviAPI.GetCoordinateFromAddress(storePageInfo.Address, utils.Int2Str(cityCode))
+		if storePageInfo.DistrictCode == 0 && cityCode != 0 {
+			if place, err := dao.GetPlaceByCode(dao.GetDB(), cityCode); err == nil {
+				storePageInfo.Lng, storePageInfo.Lat, storePageInfo.DistrictCode = api.AutonaviAPI.GetCoordinateFromAddress(storePageInfo.Address, utils.Int2Str(place.ParentCode))
+			}
+		}
+	} else if storePageInfo.DistrictCode == 0 {
+		storePageInfo.DistrictCode = api.AutonaviAPI.GetCoordinateDistrictCode(storePageInfo.Lng, storePageInfo.Lat)
+	}
+	if storePageInfo.CityCode == 0 {
+		if storePageInfo.DistrictCode != 0 {
+			if place, err := dao.GetPlaceByCode(dao.GetDB(), storePageInfo.DistrictCode); err == nil {
+				storePageInfo.CityCode = place.ParentCode
+			}
+		}
+		if storePageInfo.CityCode == 0 {
+			storePageInfo.CityCode = cityCode
+		}
+	}
+}
+
 func getStoreListByCoordinates(ctx *jxcontext.Context, parentTask tasksch.ITask, vendorID, cityCode int, coordList []*ditu.Coordinate) (storeList []*model.PageShop, err error) {
 	if len(coordList) > 0 {
 		if handler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IPurchasePlatformNetSpiderHandler); handler != nil {
@@ -230,28 +234,23 @@ func GetAndStoreCitiesShops(ctx *jxcontext.Context, vendorIDs []int, cityCodeLis
 	return hint, err
 }
 
-func RefreshPageStore(ctx *jxcontext.Context) (err error) {
+func RefreshPageShops(ctx *jxcontext.Context) (err error) {
 	sql := `
 	SELECT *
 	FROM page_shop t1
-	WHERE t1.vendor_id = 0
+	WHERE t1.district_code = 0 AND t1.lng != 0 AND t1.lat != 0`
-	`
 	db := dao.GetDB()
 	var shopList []*model.PageShop
 	if err = dao.GetRows(db, &shopList, sql); err != nil {
 		return err
 	}
-	for _, v := range shopList {
+	task := tasksch.NewParallelTask(fmt.Sprintf("刷新网页门店信息:%d", len(shopList)), nil, ctx,
-		if handler, _ := partner.GetPurchasePlatformFromVendorID(v.VendorID).(partner.IPurchasePlatformNetSpiderHandler); handler != nil {
+		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
-			storePageInfo, err2 := getStorePageInfo(ctx, handler, v.CityCode, v.VendorStoreID)
+			pageShop := batchItemList[0].(*model.PageShop)
-			if err2 == nil {
+			updatePageShopCityDistrictInfo(ctx, pageShop, pageShop.CityCode)
-				v.RecentOrderNum = storePageInfo.RecentOrderNum
+			_, err = dao.UpdateEntity(db, pageShop, "CityCode", "DistrictCode", "Lng", "Lat")
-				v.SkuCount = storePageInfo.SkuCount
+			return retVal, err
-				dao.UpdateEntity(db, v, "RecentOrderNum", "SkuCount")
+		}, shopList)
-			} else {
+	tasksch.HandleTask(task, nil, true).Run()
-				globals.SugarLogger.Debugf("RefreshPageStore err:%v", err)
-			}
-		}
-	}
 	return err
 }

business/partner/purchase/ebai/order.go

@@ -88,11 +88,18 @@ func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (s
 }
 
 func (p *PurchaseHandler) getOrder(vendorOrderID string) (order *model.GoodsOrder, orderMap map[string]interface{}, err error) {
-	result, err := api.EbaiAPI.OrderGet(vendorOrderID)
+	for i := 0; i < 2; i++ {
-	if err == nil {
+		orderMap, err = api.EbaiAPI.OrderGet(vendorOrderID)
-		order = p.Map2Order(result)
+		if err == nil {
+			order = p.Map2Order(orderMap)
+			// 饿百订单有时会出现取不到baidu_shop_id的情况，重试
+			if order.VendorStoreID != "" {
+				break
+			}
+		}
+		time.Sleep(100 * time.Millisecond)
 	}
-	return order, result, err
+	return order, orderMap, err
 }
 
 func (p *PurchaseHandler) GetOrder4PartRefund(vendorOrderID string) (order *model.GoodsOrder, err error) {
@@ -187,15 +194,15 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 	vendorOrderID := orderMap["order_id"].(string)
 	order = &model.GoodsOrder{
 		VendorOrderID:         vendorOrderID,
-		VendorOrderID2:        orderMap["eleme_order_id"].(string),
+		VendorOrderID2:        utils.Interface2String(orderMap["eleme_order_id"]),
 		VendorID:              model.VendorIDEBAI,
-		VendorStoreID:         shopMap["baidu_shop_id"].(string),
+		VendorStoreID:         utils.Interface2String(shopMap["baidu_shop_id"]),
 		StoreID:               int(utils.Str2Int64WithDefault(utils.Interface2String(shopMap["id"]), 0)),
-		StoreName:             shopMap["name"].(string),
+		StoreName:             utils.Interface2String(shopMap["name"]),
 		VendorUserID:          utils.Interface2String(userMap["user_id"]),
-		ConsigneeName:         userMap["name"].(string),
+		ConsigneeName:         utils.Interface2String(userMap["name"]),
-		ConsigneeMobile:       jxutils.FormalizeMobile(userMap["phone"].(string)),
+		ConsigneeMobile:       jxutils.FormalizeMobile(utils.Interface2String(userMap["phone"])),
-		ConsigneeAddress:      userMap["address"].(string),
+		ConsigneeAddress:      utils.Interface2String(userMap["address"]),
 		CoordinateType:        model.CoordinateTypeBaiDu,
 		BuyerComment:          utils.TrimBlankChar(utils.Interface2String(orderMap["remark"])),
 		ExpectedDeliveredTime: getTimeFromInterface(orderMap["send_time"]),
@@ -453,6 +460,10 @@ func (c *PurchaseHandler) onOrderNew(msg *ebaiapi.CallbackMsg, orderStatus *mode
 	vendorOrderID := GetOrderIDFromMsg(msg)
 	order, orderMap, err := c.getOrder(vendorOrderID)
 	if err == nil {
+		// 饿百订单有时会出现取不到baidu_shop_id的情况，返回错误让服务器重试
+		if order.VendorStoreID == "" {
+			return api.EbaiAPI.Err2CallbackResponse(msg.Cmd, fmt.Errorf("订单%s的baidu_shop_id为空", order.VendorOrderID), "")
+		}
 		if err = partner.CurOrderManager.OnOrderNew(order, orderStatus); err == nil {
 			utils.CallFuncAsync(func() {
 				c.OnOrderDetail(orderMap, partner.CreatedPeration)

business/partner/purchase/ebai/store.go

@@ -100,9 +100,7 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo
 		retVal.DeliveryType = EbaiDeliveryType2Jx(utils.Interface2String(result["delivery_type"]))
 
 		retVal.SetOpTime(ebaiOpTime2Jx(result["business_time"]))
-		if ebaiStatus, err2 := api.EbaiAPI.ShopBusStatusGet("", baiduShopID, ebaiapi.PlatformFlagElm); err2 == nil {
+		retVal.Status, _ = p.GetStoreStatus(ctx, vendorOrgCode, 0, vendorStoreID)
-			retVal.Status = EbaiBusStatus2JxStatus(ebaiStatus)
-		}
 
 		tel2 := utils.Interface2String(result["ivr_phone"])
 		if tel2 != "" && tel2 != retVal.Tel1 {
@@ -188,7 +186,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 				if err == nil {
 					if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreStatus) != 0 {
 						mergeStatus := jxutils.MergeStoreStatus(store.Status, store.EbaiStoreStatus)
-						if err = p.updateStoreStatus(userName, storeID, store.VendorStoreID, mergeStatus, store2.Status); err != nil {
+						if err = p.UpdateStoreStatus(jxcontext.AdminCtx, store.VendorOrgCode, storeID, store.VendorStoreID, mergeStatus); err != nil {
 							return err
 						}
 					}
@@ -400,6 +398,9 @@ func genStoreMapFromStore(store *tEbaiStoreInfo) map[string]interface{} {
 			params["name"] = jxutils.ComposeStoreName(store.Name, model.VendorIDEBAI)
 		}
 	}
+	boxFee, _ := dao.GetSysConfigAsInt64(dao.GetDB(), model.ConfigSysEbaiBoxFee)
+	params["package_box_price"] = boxFee
+
 	params["address"] = store.Address
 	// todo 饿百 开店审核通过后不允许修改商户信息
 	if store.SyncStatus&(model.SyncFlagNewMask /*|model.SyncFlagStoreAddress*/) != 0 {
@@ -465,27 +466,21 @@ func (p *PurchaseHandler) EnableAutoAcceptOrder(ctx *jxcontext.Context, vendorOr
 }
 
 func (c *PurchaseHandler) UpdateStoreStatus(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string, status int) (err error) {
-	store, err := c.ReadStore(ctx, vendorOrgCode, vendorStoreID)
+	if globals.EnableEbaiStoreWrite {
-	if err != nil {
+		if status == model.StoreStatusOpened {
-		return err
+			err = api.EbaiAPI.ShopOpen("", utils.Str2Int64(vendorStoreID))
-	}
+		} else if status == model.StoreStatusHaveRest || status == model.StoreStatusClosed {
-	return c.updateStoreStatus(ctx.GetUserName(), storeID, vendorStoreID, status, store.Status)
+			err = api.EbaiAPI.ShopClose("", utils.Str2Int64(vendorStoreID))
-}
+		} else if status == model.StoreStatusDisabled {
-
+			err = api.EbaiAPI.ShopClose("", utils.Str2Int64(vendorStoreID))
-func (c *PurchaseHandler) updateStoreStatus(userName string, storeID int, vendorStoreID string, status, currentStatus int) (err error) {
+			// err = api.EbaiAPI.ShopOffline("", utils.Str2Int64(vendorStoreID))
-	if !isStoreStatusSame(currentStatus, status) {
-		if globals.EnableEbaiStoreWrite {
-			if status == model.StoreStatusOpened {
-				err = api.EbaiAPI.ShopOpen("", utils.Str2Int64(vendorStoreID))
-			} else if status == model.StoreStatusHaveRest || status == model.StoreStatusClosed {
-				err = api.EbaiAPI.ShopClose("", utils.Str2Int64(vendorStoreID))
-			} else if status == model.StoreStatusDisabled {
-				err = api.EbaiAPI.ShopClose("", utils.Str2Int64(vendorStoreID))
-				// err = api.EbaiAPI.ShopOffline("", utils.Str2Int64(vendorStoreID))
-			}
 		}
-		if intErr, ok := err.(*utils.ErrorWithCode); ok && intErr.IntCode() == 201100 {
+		if err != nil {
-			err = nil
+			if remoteStatus, err2 := c.GetStoreStatus(ctx, vendorOrgCode, storeID, vendorStoreID); err2 == nil && remoteStatus == status {
+				err = nil
+			} else if intErr, ok := err.(*utils.ErrorWithCode); ok && intErr.IntCode() == 201100 {
+				err = nil
+			}
 		}
 	}
 	return err

business/partner/purchase/jd/act.go

@@ -13,6 +13,7 @@ import (
 
 	"git.rosy.net.cn/baseapi/platformapi/jdapi"
 	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/baseapi/utils/errlist"
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
 	"git.rosy.net.cn/jx-callback/business/model"
@@ -39,6 +40,12 @@ var (
 	actMap jxutils.SyncMapWithTimeout
 )
 
+// 是否按单一门店商品维度创建活动
+func isCreateTypeSingleStoreSku() bool {
+	return false
+	// return !globals.IsProductEnv()
+}
+
 func splitPromotionSku(skus []*jdapi.PromotionSku, maxCount int) (skusList [][]*jdapi.PromotionSku) {
 	for {
 		skusLen := len(skus)
@@ -213,18 +220,35 @@ func createSkuAct(ctx *jxcontext.Context, act *model.Act2, actStoreSku []*model.
 	return vendorActID, err
 }
 
-func cancelSkuActSkus(ctx *jxcontext.Context, vendorOrgCode string, actType int, vendorActID string, actStoreSku []*model.ActStoreSku2) (err error) {
+func proxyCreateSkuAct(ctx *jxcontext.Context, act *model.Act2, actStoreSku []*model.ActStoreSku2) (vendorActID string, err error) {
+	if isCreateTypeSingleStoreSku() && len(actStoreSku) > 1 {
+		errList := errlist.New()
+		vendorActID := act.VendorActID
+		act.VendorActID = "placeholder"
+		for _, v := range actStoreSku {
+			_, err := createSkuAct(ctx, act, []*model.ActStoreSku2{v})
+			errList.AddErr(err)
+		}
+		act.VendorActID = vendorActID
+		err = errList.GetErrListAsOne()
+	} else {
+		vendorActID, err = createSkuAct(ctx, act, actStoreSku)
+	}
+	return vendorActID, err
+}
+
+func cancelSkuActSkus(ctx *jxcontext.Context, act *model.Act2, vendorActID string, actStoreSku []*model.ActStoreSku2) (err error) {
 	if vendorActID != "" {
 		if skuList := storeSku2Jd(actStoreSku, model.IsSyncStatusNeedDelete); len(skuList) > 0 {
-			err = CancelPromotionSku(vendorOrgCode, actType, utils.Str2Int64(vendorActID), "", skuList, ctx.GetTrackInfo())
+			err = CancelPromotionSku(act.VendorOrgCode, act.Type, utils.Str2Int64(vendorActID), "", skuList, ctx.GetTrackInfo())
 		}
 	}
 	return err
 }
 
-func cancelSkuAct(ctx *jxcontext.Context, vendorOrgCode string, actType int, vendorActID string) (err error) {
+func cancelSkuAct(ctx *jxcontext.Context, act *model.Act2, vendorActID string) (err error) {
 	if vendorActID != "" {
-		err = CancelPromotion(vendorOrgCode, actType, utils.Str2Int64(vendorActID), "", ctx.GetTrackInfo())
+		err = CancelPromotion(act.VendorOrgCode, act.Type, utils.Str2Int64(vendorActID), "", ctx.GetTrackInfo())
 	}
 	return err
 }
@@ -237,67 +261,80 @@ func (c *PurchaseHandler) SyncAct(ctx *jxcontext.Context, parentTask tasksch.ITa
 	var updateItems []*dao.KVUpdateItem
 
 	actStoreSkuMap := partner.SplitActStoreSku(actStoreSkuList)
+	actSkuCount := 0
+	toDelActSkuCount := 0
 	for storeID := range actStoreSkuMap {
 		for _, actStoreSku := range actStoreSkuMap[storeID] {
-			vendorActInfoMap[actStoreSku.VendorActID] = append(vendorActInfoMap[actStoreSku.VendorActID], actStoreSku)
+			vendorActID := actStoreSku.VendorActID
+			if vendorActID == "" {
+				vendorActID = act.VendorActID
+			}
+			actSkuCount++
+			vendorActInfoMap[vendorActID] = append(vendorActInfoMap[vendorActID], actStoreSku)
 			if model.IsSyncStatusDelete(actStoreSku.SyncStatus) {
-				vendorActID := actStoreSku.VendorActID
+				toDelActSkuCount++
-				if vendorActID == "" {
-					vendorActID = act.VendorActID
-				}
 				deleteActInfoMap[vendorActID] = append(deleteActInfoMap[vendorActID], actStoreSku)
 			} else if model.IsSyncStatusNew(actStoreSku.SyncStatus) {
 				actStoreSkuList4Create = append(actStoreSkuList4Create, actStoreSku)
 			}
 		}
 	}
+	// 如果是全删，直接添加删除（即取消）标志
+	if actSkuCount == toDelActSkuCount {
+		act.SyncStatus |= model.SyncFlagDeletedMask
+	}
 	db := dao.GetDB()
 	err = func() (err error) {
 		if model.IsSyncStatusDelete(act.SyncStatus) {
+			errList := errlist.New()
 			for vendorActID := range vendorActInfoMap {
 				if vendorActID != "" {
-					if err = cancelSkuAct(ctx, act.VendorOrgCode, act.Type, vendorActID); err != nil {
+					if err = cancelSkuAct(ctx, act, vendorActID); err == nil {
-						return err
+						updateItems = append(updateItems, partner.ActStoreSku2Update(ctx, vendorActInfoMap[vendorActID], model.SyncFlagModifiedMask)...)
+					} else {
+						errList.AddErr(err)
 					}
 				}
 			}
-			for _, actStoreSkuList := range vendorActInfoMap {
+			if err = errList.GetErrListAsOne(); err == nil {
-				updateItems = append(updateItems, partner.ActStoreSku2Update(ctx, actStoreSkuList, model.SyncFlagModifiedMask)...)
+				updateItems = append(updateItems, partner.Act2Update(ctx, act, model.SyncFlagModifiedMask))
 			}
-			updateItems = append(updateItems, partner.Act2Update(ctx, act, model.SyncFlagModifiedMask))
 		} else if model.IsSyncStatusNew(act.SyncStatus) {
-			if act.VendorActID, err = createSkuAct(ctx, act, actStoreSkuList4Create); err != nil {
+			if act.VendorActID, err = proxyCreateSkuAct(ctx, act, actStoreSkuList4Create); err == nil {
+				updateItems = append(updateItems, partner.ActStoreSku2Update(ctx, actStoreSkuList4Create, model.SyncFlagNewMask)...)
+				updateItems = append(updateItems, partner.Act2Update(ctx, act, model.SyncFlagNewMask))
+			} else {
 				if act.VendorActID != "" {
 					actMap := partner.Act2ActMap(act)
-					dao.UpdateEntity(db, actMap, "VendorActID")
+					dao.UpdateEntity(db, actMap, model.FieldVendorActID)
 				}
-				return err
 			}
-			updateItems = append(updateItems, partner.ActStoreSku2Update(ctx, actStoreSkuList4Create, model.SyncFlagNewMask)...)
-			updateItems = append(updateItems, partner.Act2Update(ctx, act, model.SyncFlagNewMask))
 		} else if model.IsSyncStatusUpdate(act.SyncStatus) {
-			// globals.SugarLogger.Debug(utils.Format4Output(updateItems, false))
+			errList := errlist.New()
 			if len(actStoreSkuList4Create) > 0 {
-				if _, err = createSkuAct(ctx, act, actStoreSkuList4Create); err != nil {
+				if _, err = proxyCreateSkuAct(ctx, act, actStoreSkuList4Create); err == nil {
-					return err
+					updateItems = append(updateItems, partner.ActStoreSku2Update(ctx, actStoreSkuList4Create, model.SyncFlagNewMask)...)
+				} else {
+					errList.AddErr(err)
 				}
-				updateItems = append(updateItems, partner.ActStoreSku2Update(ctx, actStoreSkuList4Create, model.SyncFlagNewMask)...)
 			}
 			for vendorActID := range deleteActInfoMap {
 				if vendorActID != "" {
 					if len(vendorActInfoMap[vendorActID]) == len(deleteActInfoMap[vendorActID]) {
-						// todo 如果这个取消导致了整活动被取消的话，怎么设置京西活动的状态
+						err = cancelSkuAct(ctx, act, vendorActID)
-						err = cancelSkuAct(ctx, act.VendorOrgCode, act.Type, vendorActID)
 					} else {
-						err = cancelSkuActSkus(ctx, act.VendorOrgCode, act.Type, vendorActID, deleteActInfoMap[vendorActID])
+						err = cancelSkuActSkus(ctx, act, vendorActID, deleteActInfoMap[vendorActID])
 					}
-					if err != nil {
+					if err == nil {
-						return err
+						updateItems = append(updateItems, partner.ActStoreSku2Update(ctx, deleteActInfoMap[vendorActID], model.SyncFlagDeletedMask)...)
+					} else {
+						errList.AddErr(err)
 					}
+				} else {
+					updateItems = append(updateItems, partner.ActStoreSku2Update(ctx, deleteActInfoMap[vendorActID], model.SyncFlagDeletedMask)...)
 				}
-				updateItems = append(updateItems, partner.ActStoreSku2Update(ctx, deleteActInfoMap[vendorActID], model.SyncFlagDeletedMask)...)
 			}
-			if err == nil {
+			if err = errList.GetErrListAsOne(); err == nil {
 				updateItems = append(updateItems, partner.Act2Update(ctx, act, model.SyncFlagModifiedMask))
 			}
 		}

business/partner/purchase/jd/store.go

@@ -152,6 +152,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 				} else {
 					storeParams.StationName = jxutils.ComposeStoreName(store.Name, model.VendorIDJD)
 				}
+				storeParams.StationName = utils.LimitUTF8StringLen(storeParams.StationName, jdapi.MaxStoreNameLen)
 			}
 			if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreAddress) != 0 {
 				storeParams.StationAddress = store.Address

business/partner/purchase/jx/localjx/order.go

@@ -160,7 +160,7 @@ func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64,
 }
 
 // 买家取消（或申请取消）订单
-func BuyerCancelOrder(ctx *jxcontext.Context, orderID int64) (canceled bool, err error) {
+func BuyerCancelOrder(ctx *jxcontext.Context, orderID int64, reason string) (canceled bool, err error) {
 	order, err := partner.CurOrderManager.LoadOrder(utils.Int64ToStr(orderID), model.VendorIDJX)
 	if err == nil {
 		if order.Status < model.OrderStatusNew {

business/partner/purchase/mtwm/store.go

@@ -156,6 +156,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 		errList.AddErr(p.UpdateStoreStatus(jxcontext.AdminCtx, storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID, mergedStoreStatus))
 	}
 	errList.AddErr(p.UpdateStoreOpTime(jxcontext.AdminCtx, storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID, storeDetail.GetOpTimeList()))
+	errList.AddErr(p.UpdateStoreBoxFee(jxcontext.AdminCtx, storeDetail.VendorOrgCode, storeID, storeDetail.VendorStoreID))
 	return errList.GetErrListAsOne()
 }
 
@@ -290,3 +291,13 @@ func (c *PurchaseHandler) GetAllStoresVendorID(ctx *jxcontext.Context, vendorOrg
 func (c *PurchaseHandler) UpdateStoreCustomID(ctx *jxcontext.Context, vendorOrgCode, vendorStoreID string, storeID int64) (err error) {
 	return err
 }
+
+func (c *PurchaseHandler) UpdateStoreBoxFee(ctx *jxcontext.Context, vendorOrgCode string, storeID int, vendorStoreID string) (err error) {
+	boxFee, err := dao.GetSysConfigAsInt64(dao.GetDB(), model.ConfigSysMtwmBoxFee)
+	if err == nil {
+		if globals.EnableMtwmStoreWrite && globals.IsProductEnv() {
+			err = api.MtwmAPI.PackagePriceUpdate(vendorStoreID, 1, int(boxFee))
+		}
+	}
+	return err
+}

business/partner/purchase/mtwm/store_sku2.go

@@ -259,8 +259,8 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 		}
 		foodData["min_order_count"] = 1
 		foodData["unit"] = storeSku.Unit
-		foodData["box_num"] = 0
+		foodData["box_num"] = 1
-		foodData["box_price"] = 0.0
+		foodData["box_price"] = jxutils.IntPrice2Standard(storeSku.BoxFee)
 		catCode := tryCatName2Code(storeSku.VendorCatID)
 		if catCode != "" {
 			foodData["category_code"] = catCode

conf/app.conf

@@ -15,7 +15,7 @@ dadaAppSecret = "2c717ad914767d6e2beb3f743db9e477"
 mtwmAppID = "589"
 mtwmSecret = "a81eb3df418d83d6a1a4b7c572156d2f"
 mtwmCallbackURL = "http://callback.jxc4.com"
-mtwmCookieStr = "_lxsdk_cuid=16eb02a8a02c8-0a92cb9af9798c-3d375b01-15f900-16eb02a8a02c8; _lxsdk=16eb02a8a02c8-0a92cb9af9798c-3d375b01-15f900-16eb02a8a02c8; device_uuid=!aaa93749-2445-4e1e-b178-956ac0ea5e45; pushToken=0sMxJkF87HeJFNGInMgnpvQ3ohIqeo_UMZ8VDif29S6s*; _lx_utm=utm_source%3DBaidu%26utm_medium%3Dorganic; wpush_server_url=wss://wpush.meituan.com; acctId=26599188; token=0o7UnNs2yauqdj86R145ow78W9cT9krlWpKPmCan2z7Q*; brandId=-1; wmPoiId=-1; isOfflineSelfOpen=0; city_id=0; isChain=1; existBrandPoi=true; ignore_set_router_proxy=true; region_id=; region_version=0; newCategory=false; bsid=PgNahlgfXvqnBiqv9tIi9zg7LDWtV8n70tkl_GhfueXgrLxV9BEb1rP9emUMnUUKPI6rANs_Y-chSdYLZS3KCA; cityId=510100; provinceId=510000; city_location_id=0; location_id=0; JSESSIONID=uht6v2iau9s6fx86r1ue6vzd; set_info=%7B%22wmPoiId%22%3A-1%2C%22ignoreSetRouterProxy%22%3Atrue%7D; igateApp=shangouepc; LX_SC_CONSTANT=c_nehoktcu; shopCategory=food; _lxsdk_s=16f40af4486-049-a66-a48%7C26337904%7C37"
+mtwmCookieStr = "wm_order_channel=default; au_trace_key_net=default; _lxsdk_cuid=16a06076fa9c8-0330615db0f347-36697e04-1fa400-16a06076fa9c8; openh5_uuid=16a06076fa9c8-0330615db0f347-36697e04-1fa400-16a06076fa9c8; _ga=GA1.2.742821845.1555040388; uuid=ff9a9ceb627b4d048ebc.1556697582.1.0.0; userTicket=cwXEdWCAJIRgPjfNStZsTmqQePWfcObedoccxrnr; _hc.v=a527d080-6348-1e6c-395d-475a233de80b.1562829123; ci=59; PHPSESSID=nhn07e1r1n9oajc1ej3v4v8er3; Hm_lvt_f66b37722f586a240d4621318a5a6ebe=1568298023; Hm_lpvt_f66b37722f586a240d4621318a5a6ebe=1568298023; cssVersion=c3ad7e95; uuid_update=true; pushToken=0PTEye2MCahYqwz010SbhEGgUF8dr6pveNGaRFnxlJ3c*; isNewCome=1; IJSESSIONID=naw7ir3cnvwfg5o3o127449x; iuuid=61ADFD82525B2276FFCD8FD5E468656291EB433CE7EC2A8434F1BF6125D8AA35; cityname=%E6%88%90%E9%83%BD; _lxsdk=61ADFD82525B2276FFCD8FD5E468656291EB433CE7EC2A8434F1BF6125D8AA35; __utma=74597006.742821845.1555040388.1571712803.1571712803.1; __utmc=74597006; __utmz=74597006.1571712803.1.1.utmcsr=(direct)|utmccn=(direct)|utmcmd=(none); ci3=1; i_extend=H__a100001__b1; u=74293087; n=%E6%9A%96%E6%B4%8B%E6%B4%8B780; lt=Pxd4W47VjdorJdY-Qs4r0rEFjEoAAAAAVAkAAEblXap8JtOLIKqbabMh1AaulNrmblM4kitHSR9Wr44XiLBiUK09aXgFsHz7wDhD5Q; unc=%E6%9A%96%E6%B4%8B%E6%B4%8B780; lat=39.8655; lng=116.57676; firstTime=1577779818810; wpush_server_url=wss://wpush.meituan.com; acctId=57396785; brandId=-1; isOfflineSelfOpen=0; city_id=0; isChain=1; existBrandPoi=true; ignore_set_router_proxy=true; region_id=; region_version=0; newCategory=false; bsid=ubkO2RZRklE5Mhx5plDp5sw3PmdlL-lEgF90ORUM2nftSnKRHW6qas5r_P5cD6gKYUEFdqwq6B5OmIcoWvFITw; cityId=510100; provinceId=510000; city_location_id=0; location_id=0; igateApp=shangouepc; token=07-rPReTAv3zyn8KmJ3j0BGhdPMjX-NtV9lergp-rX14*; device_uuid=!99973228-2370-4ea8-8963-d97a4b996372; wmPoiId=2461723; wmPoiName=%E4%BA%AC%E8%A5%BF%E8%8F%9C%E5%B8%82%EF%BC%88%E6%8A%9A%E7%90%B4%E5%93%81%E8%B4%A8%E5%BA%97%EF%BC%89; logistics_support=1; set_info=%7B%22wmPoiId%22%3A2461723%2C%22ignoreSetRouterProxy%22%3Atrue%7D; JSESSIONID=b6vmlh6yfbwcinb21amavei; shopCategory=market; _lxsdk_s=16f788b94cc-e59-145-809%7C57396785%7C7"
 
 autonaviKey = "ef64f638f31e05cb7bde28790f7309fe"
 

controllers/auth2.go

@@ -66,7 +66,13 @@ func (c *Auth2Controller) CreateCaptcha() {
 // @router /SendVerifyCode [post]
 func (c *Auth2Controller) SendVerifyCode() {
 	c.callSendVerifyCode(func(params *tAuth2SendVerifyCodeParams) (retVal interface{}, errCode string, err error) {
-		err = auth2.SendVerifyCode(params.AuthToken, params.CaptchaID, params.CaptchaValue, params.AuthID)
+		_, _, err = auth2.SendVerifyCode(params.AuthToken, params.CaptchaID, params.CaptchaValue, params.AuthID)
+		// if err == nil && authInfo != nil {
+		// 	user, err2 := dao.GetUserByID(dao.GetDB(), "user_id", authInfo.GetID())
+		// 	if err2 == nil && user.Type&(model.UserTypeBoss|model.UserTypeOperator) != 0 {
+		// 		retVal = code
+		// 	}
+		// }
 		return retVal, "", err
 	})
 }

controllers/cms_store_sku.go

@@ -244,6 +244,23 @@ func (c *StoreSkuController) UpdateStoresSkusByBind() {
 	})
 }
 
+// @Title 修改门店SkuName价格
+// @Description 修改门店SkuName价格(支持活动中改价)
+// @Param	token			header		string	true	"认证token"
+// @Param	storeID			formData	int		true	"门店ID"
+// @Param	nameID			formData	int		true	"SkuName ID"
+// @Param	unitPrice		formData	int		true	"单价"
+// @Param	isAsync			formData	bool	false	"是否异步操作"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /UpdateStoreSkuNamePrice [put]
+func (c *StoreSkuController) UpdateStoreSkuNamePrice() {
+	c.callUpdateStoreSkuNamePrice(func(params *tStoreSkuUpdateStoreSkuNamePriceParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = cms.UpdateStoreSkuNamePrice(params.Ctx, params.StoreID, params.NameID, params.UnitPrice, params.IsAsync)
+		return retVal, "", err
+	})
+}
+
 // @Title 拷贝门店SKU信息
 // @Description 拷贝门店SKU信息（此函数当前只是本地数据操作，要同步到远端需要调用SyncStoresSkus）
 // @Param	token			header		string	true	"认证token"
@@ -450,7 +467,7 @@ func (c *StoreSkuController) GetMissingStoreSkuFromOrder() {
 
 // @Title 根据门店信息查找推荐商品(按销量)
 // @Description 根据门店信息查找推荐商品(按销量)
-// @Param	token			header		string	true	"认证token"
+// @Param	token			header		string	false	"认证token"
 // @Param	storeIDs		query		string	true	"门店列表"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
@@ -482,7 +499,7 @@ func (c *StoreSkuController) GetTopSkusByCityCode() {
 
 // @Title 根据门店信息查找推荐分类(按商品销量)
 // @Description 根据门店信息查找推荐分类(按商品销量)
-// @Param	token			header		string	true	"认证token"
+// @Param	token			header		string	false	"认证token"
 // @Param	storeIDs		query		string	true	"门店列表"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
@@ -554,7 +571,7 @@ func (c *StoreSkuController) FocusStoreSkusByExcel() {
 
 // @Title 得到门店的分类列表
 // @Description 得到门店的分类列表(按商品销量)
-// @Param	token			header		string	true	"认证token"
+// @Param	token			header		string	false	"认证token"
 // @Param	storeID			query		int		true	"门店ID"
 // @Param	parentID		query		int		false	"父分类id"
 // @Success 200 {object} controllers.CallResult

controllers/cms_sync.go

@@ -144,6 +144,33 @@ func (c *SyncController) DeleteRemoteStoreSkus() {
 	})
 }
 
+// @Title 同步门店
+// @Description 同步门店
+// @Param	token			header		string	true	"认证token"
+// @Param	vendorIDs		formData		string	false	"平台ID(京东0 美团1 饿百3)列表"
+// @Param	vendorOrgCodes	formData		string	false	"平台账号列表"
+// @Param	storeIDs		formData		string	false	"门店ID列表"
+// @Param	isForce			formData		bool	false	"是否强制（设置修改标志）"
+// @Param	isAsync			formData		bool	false	"是否异步"
+// @Param	isContinueWhenError	formData	bool	false	"单个同步失败是否继续，缺省false"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /SyncStores [post]
+func (c *SyncController) SyncStores() {
+	c.callSyncStores(func(params *tSyncSyncStoresParams) (retVal interface{}, errCode string, err error) {
+		var vendorIDs, storeIDs []int
+		var vendorOrgCodes []string
+		if err = jxutils.Strings2Objs(params.VendorIDs, &vendorIDs, params.StoreIDs, &storeIDs, params.VendorOrgCodes, &vendorOrgCodes); err == nil {
+			db := dao.GetDB()
+			if params.IsForce {
+				dao.SetStoreMapSyncStatus(db, vendorIDs, storeIDs, model.SyncFlagModifiedMask)
+			}
+			retVal, err = cms.CurVendorSync.SyncStore2(params.Ctx, db, vendorIDs, storeIDs, true, params.IsAsync)
+		}
+		return retVal, "", err
+	})
+}
+
 // @Title 同步商家分类（多门店平台）
 // @Description 同步商家分类（多门店平台）
 // @Param	token			header		string	true	"认证token"

controllers/cms_user2.go

@@ -20,6 +20,7 @@ type User2Controller struct {
 
 // @Title 用户注册
 // @Description 用户注册
+// @Param	token				header		string	false	"管理员token"
 // @Param	payload				formData	string	true	"json数据，User对象(手机号必填)"
 // @Param	mobileVerifyCode	formData	string	false	"手机验证码（通过auth2.SendVerifyCode获得）（mobileVerifyCode与authToken不能同时为空）"
 // @Param	authToken			formData	string	false	"之前通过login得到的认证TOKEN（mobileVerifyCode与authToken不能同时为空）"
@@ -29,16 +30,18 @@ type User2Controller struct {
 func (c *User2Controller) RegisterUser() {
 	c.callRegisterUser(func(params *tUser2RegisterUserParams) (retVal interface{}, errCode string, err error) {
 		var (
-			user       model.User
+			user                     model.User
-			inAuthInfo *auth2.AuthInfo
+			inAuthInfo, manTokenInfo *auth2.AuthInfo
 		)
 		if params.AuthToken != "" {
 			inAuthInfo, err = auth2.GetTokenInfo(params.AuthToken)
+		} else if params.Token != "" {
+			manTokenInfo, err = auth2.GetTokenInfo(params.Token)
 		}
 		if err == nil {
 			if err = jxutils.Strings2Objs(params.Payload, &user); err == nil {
 				user.Type = 0
-				retVal, err = cms.RegisterUserWithMobile(params.Ctx, &user, params.MobileVerifyCode, inAuthInfo)
+				retVal, err = cms.RegisterUserWithMobile(params.Ctx, &user, params.MobileVerifyCode, inAuthInfo, manTokenInfo)
 			}
 		}
 		return retVal, errCode, err

controllers/jx_order.go

@@ -925,3 +925,66 @@ func (c *OrderController) ComplaintRider() {
 		return retVal, "", err
 	})
 }
+
+// @Title 查询门店订单扣款记录
+// @Description 查询门店订单扣款记录
+// @Param	token			header		string	true	"认证token"
+// @Param	storeIDs		query		string	false	"门店ID列表"
+// @Param	vendorOrderID	query		string	false	"订单ID"
+// @Param	vendorIDs		query		string	false	"订单所属厂商ID列表"
+// @Param	fromTime		query		string	false	"开始日期（包含），格式（2006-01-02），如果订单号为空此项必须要求"
+// @Param	toTime			query		string	false	"结束日期（包含），格式（2006-01-02），如果订单号为空此项必须要求"
+// @Param	statuss			query		string	false	"账单状态列表，0是未结账，1是已结账,-1为作废"
+// @Param	type			query		int		false	"扣款类型，1为差评补贴，2为优惠券"
+// @Param	isReverse		query		int		false	"只查冲账记录，0为默认都查，1为只查冲账，-1为不查冲账"
+// @Param	offset			query		int		false	"结果起始序号（以0开始，缺省为0）"
+// @Param	pageSize		query		int		false	"结果页大小（缺省为50，-1表示全部）"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetOrdersSupplement [get]
+func (c *OrderController) GetOrdersSupplement() {
+	var vendorIDList, storeIDList, statusList []int
+	c.callGetOrdersSupplement(func(params *tOrderGetOrdersSupplementParams) (retVal interface{}, errCode string, err error) {
+		if err = jxutils.Strings2Objs(params.VendorIDs, &vendorIDList, params.StoreIDs, &storeIDList, params.Statuss, &statusList); err == nil {
+			retVal, err = orderman.GetOrdersSupplement(params.Ctx, storeIDList, vendorIDList, statusList, params.VendorOrderID, params.FromTime, params.ToTime, params.Type, params.IsReverse, params.Offset, params.PageSize)
+		}
+		return retVal, "", err
+	})
+}
+
+// @Title 新增修改扣款记录
+// @Description 新增修改扣款记录
+// @Param	token		header		string	true	"认证token"
+// @Param	payload		formData	string	true	"json数据,格式为OrdersSupplement"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /AddUpdateOrdersSupplement [post]
+func (c *OrderController) AddUpdateOrdersSupplement() {
+	c.callAddUpdateOrdersSupplement(func(params *tOrderAddUpdateOrdersSupplementParams) (retVal interface{}, errCode string, err error) {
+		ordersSupplement := &model.OrderSupplementFee{}
+		if err = utils.UnmarshalUseNumber([]byte(params.Payload), ordersSupplement); err == nil {
+			retVal, err = orderman.AddUpdateOrdersSupplement(params.Ctx, ordersSupplement)
+		}
+		return retVal, "", err
+	})
+}
+
+// @Title 重新计算订单结算信息
+// @Description 重新计算订单结算信息
+// @Param	token			header		string	true	"认证token"
+// @Param	fromTime		formData	string	true	"订单起始时间"
+// @Param	toTime			formData	string	false	"订单结束时间"
+// @Param	isAsync				formData	bool	false	"是否异步操作"
+// @Param	isContinueWhenError	formData	bool	false	"单个同步失败是否继续，缺省false"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /RefreshOrdersPriceInfo [post]
+func (c *OrderController) RefreshOrdersPriceInfo() {
+	c.callRefreshOrdersPriceInfo(func(params *tOrderRefreshOrdersPriceInfoParams) (retVal interface{}, errCode string, err error) {
+		timeList, err := jxutils.BatchStr2Time(params.FromTime, params.ToTime)
+		if err == nil {
+			retVal, err = orderman.RefreshOrdersPriceInfo(params.Ctx, timeList[0], timeList[1], params.IsAsync, params.IsContinueWhenError)
+		}
+		return retVal, "", err
+	})
+}

controllers/jx_order2.go

@@ -46,6 +46,21 @@ func (c *JxOrderController) Pay4Order() {
 	})
 }
 
+// @Title 买家取消（或申请取消）订单
+// @Description 买家取消（或申请取消）订单
+// @Param	token			header		string	true	"认证token"
+// @Param	vendorOrderID	formData	string	true	"订单ID"
+// @Param	reason			formData	string	true	"原因"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /BuyerCancelOrder [post]
+func (c *JxOrderController) BuyerCancelOrder() {
+	c.callBuyerCancelOrder(func(params *tJxorderBuyerCancelOrderParams) (retVal interface{}, errCode string, err error) {
+		retVal, err = localjx.BuyerCancelOrder(params.Ctx, utils.Str2Int64(params.VendorOrderID), params.Reason)
+		return retVal, "", err
+	})
+}
+
 // @Title 查询网络打印机状态
 // @Description 查询网络打印机状态
 // @Param	token			header		string	true	"认证token"

controllers/jx_report.go

@@ -1,6 +1,7 @@
 package controllers
 
 import (
+	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
 	"git.rosy.net.cn/jx-callback/business/jxstore/report"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"github.com/astaxie/beego"
@@ -78,7 +79,20 @@ func (c *ReportController) StatisticsReportForStoreSkusPrice() {
 // @router /PriceRefer [post]
 func (c *ReportController) PriceRefer() {
 	c.callPriceRefer(func(params *tReportPriceReferParams) (retVal interface{}, errCode string, err error) {
-		report.BeginSavePriceRefer(params.Ctx, nil, nil)
+		report.BeginSavePriceRefer(params.Ctx, nil, nil, true, true)
+		return retVal, "", err
+	})
+}
+
+// @Title 自动关注商品（针对后加的商品规格未关注）
+// @Description 自动关注商品（针对后加的商品规格未关注）
+// @Param	token			header		string	true	"认证token"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /AutoFocusStoreSkus [post]
+func (c *ReportController) AutoFocusStoreSkus() {
+	c.callAutoFocusStoreSkus(func(params *tReportAutoFocusStoreSkusParams) (retVal interface{}, errCode string, err error) {
+		cms.AutoFocusStoreSkusWithoutFocus(params.Ctx, nil, false)
 		return retVal, "", err
 	})
 }

controllers/net_spider.go

@@ -136,3 +136,16 @@ func (l PageShopList) Less(i, j int) bool {
 func (l PageShopList) Swap(i, j int) {
 	l[i], l[j] = l[j], l[i]
 }
+
+// @Title 刷新网页门店信息
+// @Description 刷新网页门店信息
+// @Param	token			header		string	true	"认证token"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /RefreshPageShops [post]
+func (c *NetSpiderController) RefreshPageShops() {
+	c.callRefreshPageShops(func(params *tNetspiderRefreshPageShopsParams) (retVal interface{}, errCode string, err error) {
+		err = netspider.RefreshPageShops(params.Ctx)
+		return retVal, "", err
+	})
+}

globals/beegodb/beegodb.go

@@ -41,6 +41,9 @@ func Init() {
 	orm.RegisterModel(&model.PriceReferSnapshot{})
 	orm.RegisterModel(&model.StorePriceScoreSnapshot{})
 	orm.RegisterModel(&model.StoreSkuNamePrice{})
+	orm.RegisterModel(&model.OrderSupplementFee{})
+	orm.RegisterModel(&model.OperateEvent{})
+	orm.RegisterModel(&model.OperateEventDetail{})
 
 	// orm.RegisterModel(&model.ActivityForSku{})
 	// orm.RegisterModel(&legacymodel.JxBadComments2{})
@@ -53,6 +56,8 @@ func Init() {
 	orm.RegisterModel(&model.OrderFinancial{}, &model.AfsOrder{}, &model.OrderDiscountFinancial{}, &model.OrderSkuFinancial{})
 	orm.RegisterModel(&model.Act{}, &model.ActOrderRule{}, &model.ActStoreSku{})
 	orm.RegisterModel(&model.ActMap{}, &model.ActStoreSkuMap{})
+	// orm.RegisterModel(&model.StoreSkuAct{})
+
 	orm.RegisterModel(&model.NewConfig{})
 
 	orm.RegisterModel(&model.CasbinRule{})

routers/commentsRouter_controllers.go

@@ -702,6 +702,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:NetSpiderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:NetSpiderController"],
+        beego.ControllerComments{
+            Method: "RefreshPageShops",
+            Router: `/RefreshPageShops`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
         beego.ControllerComments{
             Method: "AcceptOrRefuseFailedGetOrder",
@@ -711,6 +720,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
+        beego.ControllerComments{
+            Method: "AddUpdateOrdersSupplement",
+            Router: `/AddUpdateOrdersSupplement`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
         beego.ControllerComments{
             Method: "AdjustOrder",
@@ -927,6 +945,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
+        beego.ControllerComments{
+            Method: "GetOrdersSupplement",
+            Router: `/GetOrdersSupplement`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
         beego.ControllerComments{
             Method: "GetPrinterStatus",
@@ -1026,6 +1053,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
+        beego.ControllerComments{
+            Method: "RefreshOrdersPriceInfo",
+            Router: `/RefreshOrdersPriceInfo`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:OrderController"],
         beego.ControllerComments{
             Method: "RefreshOrdersWithoutJxStoreID",
@@ -1080,6 +1116,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ReportController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ReportController"],
+        beego.ControllerComments{
+            Method: "AutoFocusStoreSkus",
+            Router: `/AutoFocusStoreSkus`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ReportController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:ReportController"],
         beego.ControllerComments{
             Method: "PriceRefer",
@@ -1791,6 +1836,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"],
+        beego.ControllerComments{
+            Method: "UpdateStoreSkuNamePrice",
+            Router: `/UpdateStoreSkuNamePrice`,
+            AllowHTTPMethods: []string{"put"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:StoreSkuController"],
         beego.ControllerComments{
             Method: "UpdateStoreSkus",
@@ -1908,6 +1962,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SyncController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SyncController"],
+        beego.ControllerComments{
+            Method: "SyncStores",
+            Router: `/SyncStores`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SyncController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SyncController"],
         beego.ControllerComments{
             Method: "SyncStoresCategory",