Merge commit '00431b701dbcc97601060fe2e5bc1e84e8ff60cb'

2019-11-06 10:01:48 +08:00
parent bb0e76ecca 00431b701d
commit 72cffac45d
47 changed files with 1156 additions and 383 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ param_parser.go
 *.o
 *.exe
 *.exe~
+.vscode
--- a/business/cs/weimob_order.go
+++ b/business/cs/weimob_order.go
@@ -0,0 +1,105 @@
+package cs
+
+import (
+	"git.rosy.net.cn/baseapi/platformapi/weimobapi"
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/authz/autils"
+	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/model/dao"
+	"git.rosy.net.cn/jx-callback/globals"
+	"git.rosy.net.cn/jx-callback/globals/api"
+)
+
+const (
+	minCSOrderPayment = 0    // 供货订单的最小金额（单位为元）
+	maxUnitPrice      = 3000 // 为防止误填单价，限制单价最高（单位为分）
+)
+
+func OnCallbackMsg(msg *weimobapi.CallbackMsg) (response *weimobapi.CallbackResponse) {
+	orderID := utils.Int64ToStr(msg.OrderNo)
+	jxutils.CallMsgHandler(func() {
+		response = onOrderMsg(msg)
+	}, jxutils.ComposeUniversalOrderID(orderID, model.VendorIDWSC))
+	return response
+}
+
+func onOrderMsg(msg *weimobapi.CallbackMsg) (response *weimobapi.CallbackResponse) {
+	globals.SugarLogger.Debugf("onOrderMsg:%s", utils.Format4Output(msg, true))
+	if msg.Event == weimobapi.MsgEventOrderStatusChange {
+		if utils.ForceInterface2Int64(msg.MsgBody["orderStatus"]) == weimobapi.MsgOrderStatusFinished {
+			if orderDetail, err := api.WeimobAPI.QueryOrderDetail2(msg.OrderNo, false); err == nil {
+				if orderDetail.OrderStatus == weimobapi.OrderStatusFinished && orderDetail.PaymentAmount >= minCSOrderPayment {
+					changeStoreSkusByOrder(orderDetail)
+				}
+			} else {
+				globals.SugarLogger.Debugf("onOrderMsg order:%s failed with err:%v", msg.OrderNo, err)
+				response = weimobapi.Err2CallbackResponse(err, "")
+			}
+		}
+	}
+	return response
+}
+
+func changeStoreSkusByOrder(order *weimobapi.OrderDetail) {
+	globals.SugarLogger.Debugf("changeStoreSkusByOrder order:%s", utils.Format4Output(order, true))
+	receiverMobile := order.DeliveryDetail.LogisticsDeliveryDetail.ReceiverMobile
+	if storeList, err := GetStoreList4Mobile(dao.GetDB(), []string{receiverMobile}); err == nil {
+		if len(storeList) >= 1 {
+			var skuBindInfos []*cms.StoreSkuBindInfo
+			storeID := storeList[0].ID
+			globals.SugarLogger.Debugf("changeStoreSkusByOrder storeID:%d", storeID)
+			for _, v := range order.ItemList {
+				nameID := int(utils.Str2Int64WithDefault(v.SkuCode, 0))
+				unitPrice := v.CostPrice
+				if nameID > 0 && (unitPrice > 0 && unitPrice < maxUnitPrice) {
+					skuBindInfos = append(skuBindInfos, &cms.StoreSkuBindInfo{
+						StoreID:   storeID,
+						NameID:    nameID,
+						UnitPrice: int(jxutils.StandardPrice2Int(unitPrice)),
+						IsFocus:   1,
+						IsSale:    1,
+					})
+				} else {
+					globals.SugarLogger.Infof("[运营]，微商城订单:%s，商品:%s没有设置正确的SkuName编码或单价，当前商家编码:%s，市场价:%s", order.OrderNo, v.SkuNum, v.SkuCode, jxutils.IntPrice2StandardString(jxutils.StandardPrice2Int(unitPrice)))
+				}
+			}
+			if len(skuBindInfos) > 0 {
+				cms.UpdateStoreSkus(jxcontext.NewWithUserName(nil, utils.LimitStringLen(utils.Int64ToStr(order.OrderNo), 32), nil, nil), storeID, skuBindInfos, true, true)
+			} else {
+				globals.SugarLogger.Debugf("changeStoreSkusByOrder storeID:%d is empty", storeID)
+			}
+		} else {
+			globals.SugarLogger.Infof("[运营]，微商城订单:%s，手机:%s找不到唯一一个京西门店%d", order.OrderNo, receiverMobile, len(storeList))
+		}
+	} else {
+		globals.SugarLogger.Warnf("changeStoreSkusByOrder receiverMobile:%s failed with err:%v", receiverMobile, err)
+	}
+}
+
+func GetStoreList4Mobile(db *dao.DaoDB, mobileList []string) (storeList []*model.Store, err error) {
+	sql := `
+	SELECT t1.*
+	FROM store t1
+	WHERE t1.deleted_at = ? /*AND t1.change_price_type = ?*/`
+	sqlParams := []interface{}{
+		utils.DefaultTimeValue,
+		// model.StoreChangePriceTypeBossDisabled,
+	}
+	if len(mobileList) > 0 {
+		questionMarks := dao.GenQuestionMarks(len(mobileList))
+		sql += " AND (t1.tel1 IN (" + questionMarks + ") OR t1.tel2 IN (" + questionMarks + `)
+		OR (SELECT
+			COUNT(*)
+			FROM casbin_rule t2
+			JOIN user t3 ON t3.user_id = t2.v0 AND t3.mobile IN (` + questionMarks + `)
+			WHERE t2.v1 = CONCAT(?, t1.id)
+		) > 0)
+		`
+		sqlParams = append(sqlParams, mobileList, mobileList, mobileList, autils.NewStoreBossRole(-1).GetFullName())
+	}
+	err = dao.GetRows(db, &storeList, sql, sqlParams...)
+	return storeList, err
+}
--- a/business/cs/weimob_order_test.go
+++ b/business/cs/weimob_order_test.go
@@ -0,0 +1,24 @@
+package cs
+
+import (
+	"testing"
+
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/model/dao"
+	"git.rosy.net.cn/jx-callback/globals/api2"
+	"git.rosy.net.cn/jx-callback/globals/testinit"
+)
+
+func init() {
+	testinit.Init()
+	api2.Init()
+}
+
+func TestGetStoreList4Mobile(t *testing.T) {
+	storeList, err := GetStoreList4Mobile(dao.GetDB(), []string{"18180948107"})
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log(utils.Format4Output(storeList, false))
+	t.Log(len(storeList))
+}
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -11,6 +11,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
+	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/globals"
 	"github.com/astaxie/beego/orm"
 )
@@ -151,6 +152,17 @@ func (c *OrderManager) OnOrderAdjust(order *model.GoodsOrder, orderStatus *model
 }

 func (c *OrderManager) OnOrderStatusChanged(orderStatus *model.OrderStatus) (err error) {
+	// 有些平台（比如美团外卖），在新订单事件没有成功返回，但在重发订单消息前，订单状态转换，则不会再重发新订单事件，特殊处理一下
+	if orderStatus.Status == model.OrderStatusAccepted {
+		if _, err2 := c.LoadOrder(orderStatus.VendorOrderID, orderStatus.VendorID); err2 == ErrCanNotFindOrder {
+			if handler := partner.GetPurchaseOrderHandlerFromVendorID(orderStatus.VendorID); handler != nil {
+				if order, err2 := handler.GetOrder(orderStatus.VendorOrderID); err2 == nil {
+					c.OnOrderNew(order, orderStatus)
+				}
+			}
+		}
+	}
+
 	db := dao.GetDB()
 	dao.Begin(db)
 	defer func() {
@@ -349,9 +361,9 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.
 					if skuBindInfo.Price == 0 {
 						globals.SugarLogger.Infof("updateOrderSkuOtherInfo [运营%s]%s订单sku门店价格为零（一般原因为没有门店价格信息），orderID:%s, StoreID:%d, SkuID:%d, sku:%v", opNumStr, model.VendorChineseNames[order.VendorID], order.VendorOrderID, jxStoreID, v.JxSkuID, v)
 					}
-					v.EarningPrice = jxutils.CaculateSkuEarningPrice(v.ShopPrice, v.SalePrice, storePayPercentage)
 				}
 			}
+			v.EarningPrice = jxutils.CaculateSkuEarningPrice(v.ShopPrice, v.SalePrice, storePayPercentage)

 			if skuID := jxutils.GetSkuIDFromOrderSku(v); skuID > 0 {
 				skuIDMap[skuID] = 1
@@ -385,37 +397,19 @@ func (c *OrderManager) updateOrderOtherInfo(order *model.GoodsOrder, db *dao.Dao
 	globals.SugarLogger.Debugf("updateOrderOtherInfo orderID:%s, VendorStoreID:%s", order.VendorOrderID, order.VendorStoreID)

 	payPercentage := 0
-	if order.VendorID != model.VendorIDJX {
-		storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, order.VendorStoreID, order.VendorID)
-		if err != nil {
-			if !dao.IsNoRowsError(err) {
-				globals.SugarLogger.Warnf("updateOrderOtherInfo GetStoreDetailByVendorStoreID orderID:%s, VendorStoreID:%s, error:%v", order.VendorOrderID, order.VendorStoreID, err)
-				return err
-			}
-			if time.Now().Sub(order.OrderCreatedAt) < 1*time.Hour {
-				globals.SugarLogger.Infof("updateOrderOtherInfo [运营]订单在京西与平台都找不到京西门店信息,订单:%s,平台门店ID:%s,平台:%s", order.VendorOrderID, order.VendorStoreID, model.VendorChineseNames[order.VendorID])
-			}
-			err = nil
-		} else {
-			order.JxStoreID = storeDetail.Store.ID
-			payPercentage = storeDetail.PayPercentage
+	storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, order.VendorStoreID, order.VendorID)
+	if err != nil {
+		if !dao.IsNoRowsError(err) {
+			globals.SugarLogger.Warnf("updateOrderOtherInfo GetStoreDetailByVendorStoreID orderID:%s, VendorStoreID:%s, error:%v", order.VendorOrderID, order.VendorStoreID, err)
+			return err
 		}
+		if time.Now().Sub(order.OrderCreatedAt) < 1*time.Hour {
+			globals.SugarLogger.Infof("updateOrderOtherInfo [运营]订单在京西与平台都找不到京西门店信息,订单:%s,平台门店ID:%s,平台:%s", order.VendorOrderID, order.VendorStoreID, model.VendorChineseNames[order.VendorID])
+		}
+		err = nil
 	} else {
-		store := &model.Store{}
-		store.ID = order.StoreID
-		if err = dao.GetEntity(dao.GetDB(), store); err != nil {
-			if !dao.IsNoRowsError(err) {
-				globals.SugarLogger.Warnf("updateOrderOtherInfo GetEntity orderID:%s, VendorStoreID:%s, error:%v", order.VendorOrderID, order.VendorStoreID, err)
-				return err
-			}
-			if time.Now().Sub(order.OrderCreatedAt) < 1*time.Hour {
-				globals.SugarLogger.Infof("updateOrderOtherInfo b, [运营]订单在京西与平台都找不到京西门店信息,订单:%s,平台门店ID:%s,平台:%s", order.VendorOrderID, order.VendorStoreID, model.VendorChineseNames[order.VendorID])
-			}
-			err = nil
-		} else {
-			payPercentage = store.PayPercentage
-		}
-		order.JxStoreID = order.StoreID
+		order.JxStoreID = storeDetail.Store.ID
+		payPercentage = storeDetail.PayPercentage
 	}
 	if err = c.updateOrderSkuOtherInfo(order, db, payPercentage); err == nil {
 		jxutils.RefreshOrderSkuRelated(order)
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -96,7 +96,7 @@ func (c *OrderManager) GetOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID str
 	IF(t1.shop_price = 0, t1.sale_price, t1.shop_price) shop_price,
 	t1.sale_price,
 	t1.earning_price,
-	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) real_earning_price,
+	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, ?) / 100) AS SIGNED) real_earning_price,
 	t1.weight,
 	t1.sku_type,
 	t1.promotion_type,
@@ -105,18 +105,17 @@ func (c *OrderManager) GetOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID str
 	t1.store_sub_name,
 	t1.vendor_price,
 	%s full_sku_name,
-	`, model.DefaultEarningPricePercentage, fullSkuNameSQL)
-	db := dao.GetDB()
-	err = dao.GetRows(db, &skus, sql+`
-		t3.img image
-		FROM order_sku t1
-		LEFT JOIN goods_order t6 ON t6.vendor_order_id = t1.vendor_order_id AND t6.vendor_id = t1.vendor_id
-		LEFT JOIN store t5 ON t5.id = IF(t6.jx_store_id <> 0, t6.jx_store_id, t6.store_id)
-		LEFT JOIN sku t2 ON IF(t1.jx_sku_id != 0, t1.jx_sku_id, t1.sku_id) = t2.id/* AND t2.deleted_at = ?*/
-		LEFT JOIN sku_name t3 ON t2.name_id = t3.id/* AND t3.deleted_at = ?*/
-		WHERE t1.vendor_order_id = ? AND t1.vendor_id = ?
-		ORDER BY t1.sku_name
-		`, /*, utils.DefaultTimeValue, utils.DefaultTimeValue*/ vendorOrderID, vendorID)
+	t2.name_id,
+	t3.img image
+	FROM order_sku t1
+	LEFT JOIN goods_order t6 ON t6.vendor_order_id = t1.vendor_order_id AND t6.vendor_id = t1.vendor_id
+	LEFT JOIN store t5 ON t5.id = IF(t6.jx_store_id <> 0, t6.jx_store_id, t6.store_id)
+	LEFT JOIN sku t2 ON IF(t1.jx_sku_id != 0, t1.jx_sku_id, t1.sku_id) = t2.id/* AND t2.deleted_at = ?*/
+	LEFT JOIN sku_name t3 ON t2.name_id = t3.id/* AND t3.deleted_at = ?*/
+	WHERE t1.vendor_order_id = ? AND t1.vendor_id = ?
+	ORDER BY t1.sku_name
+	`, fullSkuNameSQL)
+	err = dao.GetRows(dao.GetDB(), &skus, sql /*, utils.DefaultTimeValue, utils.DefaultTimeValue*/, model.DefaultEarningPricePercentage, vendorOrderID, vendorID)
 	if err != nil {
 		globals.SugarLogger.Infof("GetOrderSkuInfo orderID:%s vendorID:%d failed with error:%v", vendorOrderID, vendorID, err)
 		return nil, err
--- a/business/jxcallback/scheduler/basesch/basesch.go
+++ b/business/jxcallback/scheduler/basesch/basesch.go
@@ -179,7 +179,7 @@ func (c *BaseScheduler) CancelWaybill(bill *model.Waybill, cancelReasonID int, c
 	// 部分快递平台在取消成功后有时会不发运单取消消息过来（比如达达，904200512000442），为避免二次取消报错，添加状态判断
 	if c.IsReallyCallPlatformAPI && bill.OrderVendorID != bill.WaybillVendorID && bill.Status != model.WaybillStatusCanceled {
 		if handlerInfo := partner.GetDeliveryPlatformFromVendorID(bill.WaybillVendorID); handlerInfo != nil {
-			if err = utils.CallFuncLogError(func() error {
+			if err = utils.CallFuncLogErrorWithInfo(func() error {
 				return handlerInfo.Handler.CancelWaybill(bill, cancelReasonID, cancelReason)
 			}, "CancelWaybill bill:%v", bill); err == nil {
 				bill.Status = model.WaybillStatusCanceled
--- a/business/jxstore/act/act.go
+++ b/business/jxstore/act/act.go
@@ -120,49 +120,55 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
 				storeDetail, err2 := dao.GetStoreDetail(db, storeID, vendorID)
 				if err = err2; err == nil {
 					for _, v := range oneStoreSkuParam {
-						if storeSkuInfo := storeSkuMap[jxutils.Combine2Int(v.StoreID, v.SkuID)]; storeSkuInfo != nil {
-							validVendorMap[vendorID] = 1
-							validSkuMap[v.SkuID] = 1
-							pricePercentage := jxutils.GetPricePercentage(storeDetail.PricePercentagePackObj, storeSkuInfo.Price, int(storeDetail.PricePercentage))
-							actSkuMap := &model.ActStoreSkuMap{
-								ActID:    act.ID,
-								StoreID:  storeID,
-								SkuID:    v.SkuID,
-								VendorID: vendorID,
-
-								SyncStatus:  model.SyncFlagNewMask,
-								VendorPrice: int64(jxutils.CaculateSkuVendorPrice(storeSkuInfo.Price, pricePercentage)),
+						validVendorMap[vendorID] = 1
+						validSkuMap[v.SkuID] = 1
+						v.ActID = act.ID
+						actSkuMap := &model.ActStoreSkuMap{
+							ActID:    act.ID,
+							StoreID:  storeID,
+							SkuID:    v.SkuID,
+							VendorID: vendorID,
+						}
+						v.OriginalPrice = actSkuMap.VendorPrice
+						storeSkuInfo := storeSkuMap[jxutils.Combine2Int(v.StoreID, v.SkuID)]
+						if storeSkuInfo != nil {
+							jxPrice := storeSkuInfo.Price
+							pricePercentage := jxutils.GetPricePercentage(storeDetail.PricePercentagePackObj, jxPrice, int(storeDetail.PricePercentage))
+							actSkuMap.VendorPrice = int64(jxutils.CaculateSkuVendorPrice(jxPrice, pricePercentage))
+							v.OriginalPrice = int64(jxPrice)
+						}
+						var err2 error
+						if act.Type != model.ActSkuFake {
+							if storeSkuInfo == nil {
+								v.ErrMsg = fmt.Sprintf("门店:%d没有关注商品:%d", v.StoreID, v.SkuID)
+								wrongSkuList = append(wrongSkuList, v)
+								continue
 							}
-							v.OriginalPrice = actSkuMap.VendorPrice
-							if act.Type == model.ActSkuFake {
-								actSkuMap.ActualActPrice = 0
+							actSkuMap.SyncStatus = model.SyncFlagNewMask
+							if v.ActPrice != 0 {
+								actSkuMap.ActualActPrice = v.ActPrice
 							} else {
-								if v.ActPrice != 0 {
-									actSkuMap.ActualActPrice = v.ActPrice
-								} else {
-									percentage := act.PricePercentage
-									if v.PricePercentage != 0 {
-										percentage = v.PricePercentage
-									}
-									actSkuMap.ActualActPrice = int64(jxutils.CaculateSkuVendorPrice(int(actSkuMap.VendorPrice), percentage))
-									if actSkuMap.ActualActPrice > 10 {
-										actSkuMap.ActualActPrice = int64(math.Round(float64(actSkuMap.ActualActPrice)/10) * 10)
-									}
+								percentage := act.PricePercentage
+								if v.PricePercentage != 0 {
+									percentage = v.PricePercentage
 								}
-								if actSkuMap.ActualActPrice <= 0 {
-									actSkuMap.ActualActPrice = 1
+								actSkuMap.ActualActPrice = int64(jxutils.CaculateSkuVendorPrice(int(actSkuMap.VendorPrice), percentage))
+								if actSkuMap.ActualActPrice > 10 {
+									actSkuMap.ActualActPrice = int64(math.Round(float64(actSkuMap.ActualActPrice)/10) * 10)
 								}
 							}
-							if err2 := checkDiscountValidation(act.Type, int(actSkuMap.ActualActPrice*100/actSkuMap.VendorPrice)); err2 != nil {
+							if actSkuMap.ActualActPrice <= 0 {
+								actSkuMap.ActualActPrice = 1
+							}
+							if err2 = checkDiscountValidation(act.Type, int(actSkuMap.ActualActPrice*100/actSkuMap.VendorPrice)); err2 != nil {
 								v.ErrMsg = err2.Error()
 								v.ActualActPrice = actSkuMap.ActualActPrice
 								wrongSkuList = append(wrongSkuList, v)
-							} else {
-								dao.WrapAddIDCULDEntity(actSkuMap, ctx.GetUserName())
-								actStoreSkuMapList = append(actStoreSkuMapList, actSkuMap)
 							}
-						} else {
-							globals.SugarLogger.Debugf("ActStoreSkuParam2Model storeID:%d, skuID:%d没有关注", v.StoreID, v.SkuID)
+						}
+						if err2 == nil {
+							dao.WrapAddIDCULDEntity(actSkuMap, ctx.GetUserName())
+							actStoreSkuMapList = append(actStoreSkuMapList, actSkuMap)
 						}
 					}
 					wholeValidVendorMap[vendorID] = 1
@@ -175,13 +181,9 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
 			if len(wrongSkuList) == 0 {
 				for _, v := range oneStoreSkuParam {
 					if validSkuMap[v.SkuID] == 1 { // todo 这里是否需要判断
-						if storeSkuInfo := storeSkuMap[jxutils.Combine2Int(v.StoreID, v.SkuID)]; storeSkuInfo != nil {
-							storeSku := &v.ActStoreSku
-							storeSku.ActID = act.ID
-							storeSku.OriginalPrice = int64(storeSkuInfo.Price)
-							dao.WrapAddIDCULDEntity(storeSku, ctx.GetUserName())
-							actStoreSkuList = append(actStoreSkuList, storeSku)
-						}
+						storeSku := &v.ActStoreSku
+						dao.WrapAddIDCULDEntity(storeSku, ctx.GetUserName())
+						actStoreSkuList = append(actStoreSkuList, storeSku)
 					}
 				}
 			}
@@ -409,6 +411,9 @@ func CreateAct(ctx *jxcontext.Context, act *model.Act, vendorIDs []int, actRules

 			SyncStatus: model.SyncFlagNewMask,
 		}
+		if act.Type == model.ActSkuFake {
+			actMap.SyncStatus = 0
+		}
 		dao.WrapAddIDCULDEntity(actMap, ctx.GetUserName())
 		actMapList = append(actMapList, actMap)
 	}
--- a/business/jxstore/cms/cms.go
+++ b/business/jxstore/cms/cms.go
@@ -28,6 +28,7 @@ import (

 const (
 	SendMsgTypeOpenStoreRequest = "openStoreRequest"
+	SendMsgTypeSuggestRequest   = "suggestRequest"
 )

 var (
@@ -44,6 +45,14 @@ var (
 			// "徐建华",
 			// "周扬",
 		},
+		SendMsgTypeSuggestRequest: []string{
+			"石锋",
+			// "徐建华",
+			// "周扬",
+		},
+	}
+	needConfirmRequestMap = map[string]int{
+		SendMsgTypeOpenStoreRequest: 1,
 	}
 )

@@ -162,8 +171,10 @@ func GetCoordinateDistrictCode(ctx *jxcontext.Context, lng, lat float64) (code i
 }

 func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, msgContent string) (err error) {
-	if _, err = mobile.AutherObj.VerifySecret(mobileNum, verifyCode); err != nil {
-		return err
+	if needConfirmRequestMap[msgType] == 1 {
+		if _, err = mobile.AutherObj.VerifySecret(mobileNum, verifyCode); err != nil {
+			return err
+		}
 	}
 	db := dao.GetDB()
 	for _, v := range receiveMsgUsersMap[msgType] {
@@ -336,15 +347,21 @@ func UpdateConfig(ctx *jxcontext.Context, key, configType, value string) (hint s
 			dao.Rollback(db)
 			return "", err
 		}
-		for _, v := range storeMapList {
-			if _, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, &model.StoreSkuBind{}, nil, ctx.GetUserName(), map[string]interface{}{
-				model.FieldStoreID: v.StoreID,
-			}, dao.GetSyncStatusStructField(model.VendorNames[v.VendorID]), model.SyncFlagPriceMask); err != nil {
-				dao.Rollback(db)
-				return "", err
-			}
-		}
 		dao.Commit(db)
+		vendorStoreMap := make(map[int][]int)
+		for _, v := range storeMapList {
+			vendorStoreMap[v.VendorID] = append(vendorStoreMap[v.VendorID], v.StoreID)
+		}
+		for vendorID, storeIDs := range vendorStoreMap {
+			dao.SetStoreSkuSyncStatus(db, vendorID, storeIDs, nil, model.SyncFlagPriceMask)
+		}
+		// for _, v := range storeMapList {
+		// 	if _, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, &model.StoreSkuBind{}, nil, ctx.GetUserName(), map[string]interface{}{
+		// 		model.FieldStoreID: v.StoreID,
+		// 	}, dao.GetSyncStatusStructField(model.VendorNames[v.VendorID]), model.SyncFlagPriceMask); err != nil {
+		// 		return "", err
+		// 	}
+		// }
 	case model.ConfigTypeFreightPack:
 		dao.Commit(db)
 		storeMapList, err := dao.GetStoresMapList(db, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "")
--- a/business/jxstore/cms/sku.go
+++ b/business/jxstore/cms/sku.go
@@ -541,6 +541,7 @@ func AddSkuName(ctx *jxcontext.Context, skuNameExt *model.SkuNameExt, userName s
 		}
 	}

+	skuNameExt.Name = utils.TrimBlankChar(skuNameExt.Name)
 	if hasSensitiveWord, err := CheckHasSensitiveWord(skuNameExt.Name); hasSensitiveWord {
 		return nil, err
 	}
@@ -658,9 +659,12 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
 		return 0, err
 	}

-	newSkuName := utils.Interface2String(payload["name"])
-	if hasSensitiveWord, err := CheckHasSensitiveWord(newSkuName); hasSensitiveWord {
-		return 0, err
+	if payload["name"] != nil {
+		newSkuName := utils.TrimBlankChar(utils.Interface2String(payload["name"]))
+		if hasSensitiveWord, err := CheckHasSensitiveWord(newSkuName); hasSensitiveWord {
+			return 0, err
+		}
+		payload["name"] = newSkuName
 	}

 	delete(payload, "isSpu")
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -123,12 +123,16 @@ type StoreSkuBindInfo struct {

 type tStoreSkuBindAndSpec struct {
 	model.StoreSkuBind
-	Name         string
-	SpecQuality  float32
-	SpecUnit     string
-	SkuNamePrice int
-	SkuNameUnit  string
-	RealSkuID    int `orm:"column(real_sku_id)"`
+	SkuStatus     int
+	SkuNameStatus int
+	Name          string
+	SpecQuality   float32
+	SpecUnit      string
+	SkuNamePrice  int
+	SkuNameUnit   string
+	RealSkuID     int `orm:"column(real_sku_id)"`
+
+	ChangePriceType int8 `json:"changePriceType"` // 修改价格类型，即是否需要审核
 }

 type SkuSaleInfo struct {
@@ -905,6 +909,10 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
 	// 	return nil, err
 	// }
 	// globals.SugarLogger.Debugf("updateStoresSkusWithoutSync2, storeIDs:%v, skuBindInfos:%s", storeIDs, utils.Format4Output(skuBindInfos, false))
+	isUserCanDirectChangePrice := true
+	if user := ctx.GetFullUser(); user != nil {
+		isUserCanDirectChangePrice = user.Type&model.UserTypeOperator != 0
+	}

 	userName := ctx.GetUserName()
 	needSyncIDMap := make(map[int]int)
@@ -924,12 +932,13 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
 			sql := `
 			SELECT
 			t2.*,
-			t1.id real_sku_id, t1.spec_quality, t1.spec_unit,`
+			t1.id real_sku_id, t1.status sku_status, t1.spec_quality, t1.spec_unit,`
 			if needGetExistingUnitPrice {
 				sql += " IF(t5.unit_price > 0, t5.unit_price, t3.price) sku_name_price,"
 			}
 			sql += `
-			t3.unit sku_name_unit, t3.name
+			t3.unit sku_name_unit, t3.name, t3.status sku_name_status,
+			ts.change_price_type
 			FROM sku t1
 			JOIN store ts ON ts.id = ? AND ts.deleted_at = ?
 			LEFT JOIN store_sku_bind t2 ON t2.sku_id = t1.id AND t2.store_id = ts.id AND t2.deleted_at = ?
@@ -979,10 +988,11 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
 					for _, v := range allBinds {
 						var num int64
 						inSkuBind := inSkuBinsMap[v.RealSkuID]
+						isCanChangePrice := (isUserCanDirectChangePrice || v.ChangePriceType != model.StoreChangePriceTypeBossDisabled)
 						// globals.SugarLogger.Debug(utils.Format4Output(inSkuBind, false))
 						var skuBind *model.StoreSkuBind
 						if v.ID == 0 {
-							if skuBindInfo.IsFocus == 1 {
+							if skuBindInfo.IsFocus == 1 && v.SkuNameStatus == model.SkuStatusNormal && v.SkuStatus == model.SkuStatusNormal && isCanChangePrice {
 								skuBind = &model.StoreSkuBind{
 									StoreID:    storeID,
 									SkuID:      v.RealSkuID,
@@ -1006,7 +1016,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
 						} else {
 							skuBind = &v.StoreSkuBind

-							if skuBindInfo.IsFocus == -1 {
+							if skuBindInfo.IsFocus == -1 && isCanChangePrice {
 								if num, err = dao.DeleteEntityLogically(db, skuBind, map[string]interface{}{
 									model.FieldStatus:         model.StoreSkuBindStatusDeleted,
 									model.FieldJdSyncStatus:   model.SyncFlagDeletedMask,
@@ -1036,7 +1046,7 @@ func updateStoresSkusWithoutSync(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs
 									setStoreSkuBindStatus(skuBind, model.SyncFlagSaleMask)
 									updateFieldMap[model.FieldStatus] = 1
 								}
-								if skuBindInfo.UnitPrice != 0 { // 这里是否需要加此条件限制
+								if skuBindInfo.UnitPrice != 0 && isCanChangePrice { // 这里是否需要加此条件限制
 									skuBind.UnitPrice = unitPrice
 									skuBind.Price = jxutils.CaculateSkuPrice(unitPrice, v.SpecQuality, v.SpecUnit, v.SkuNameUnit)
 									setStoreSkuBindStatus(skuBind, model.SyncFlagPriceMask)
--- a/business/jxstore/cms/store_sku_check.go
+++ b/business/jxstore/cms/store_sku_check.go
@@ -6,6 +6,8 @@ import (
 	"sync"
 	"time"

+	"git.rosy.net.cn/jx-callback/business/model/dao"
+
 	"git.rosy.net.cn/baseapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
@@ -14,7 +16,6 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/partner"
-	"git.rosy.net.cn/jx-callback/business/partner/putils"
 	"git.rosy.net.cn/jx-callback/globals"
 )

@@ -26,9 +27,16 @@ const (
 	fileExt                      = ".xlsx"
 )

+//错误类型
 const (
-	DatAanalyse1 = "京东商品库直接创建，正常数据"
-	DatAanalyse2 = "(可能无经营许可)"
+	DatAanalyse1 = "京西门店未关注，应删除对应的平台门店商品"
+	DatAanalyse2 = "平台商品库未创建成功(可能无经营许可等) "
+	DatAanalyse3 = "商品名不同 "
+	DatAanalyse4 = "商品可售状态不同 "
+	DatAanalyse5 = "京西商品库没有，平台商品库有 "
+	DatAanalyse6 = "京西商品库有，平台商品库没有"
+	DatAanalyse7 = "同步状态异常"
+	DatAanalyse8 = "平台门店未关注或平台门店商品库存为0，应添加对应的平台门店商品"
 )

 var (
@@ -55,6 +63,16 @@ var (
 		"平台可售状态",
 		"数据分析",
 	}
+
+	deoptTitleList = []string{
+		"SkuID",
+		"京西商品名",
+		"平台商品名",
+		"京西可售状态",
+		"平台可售状态",
+		"数据分析",
+	}
+
 	statisticTitleList = []string{
 		"京西和平台商品状态",
 		"待创建",
@@ -75,12 +93,14 @@ var (
 		{"京西有，平台有", "否", "下架"},
 		{"京西有，平台有", "否", "上架"},
 	}
-	diffData DiffDataLock
+	diffData      DiffDataLock
+	depotDiffData DeoptDiffDataLock

-	multiStoreAllSkuInfoMap  map[int]map[int]*partner.SkuNameInfo
-	multiStoreAllSkuInfoList map[int][]*partner.StoreSkuInfo
-
-	filterCloseSkuIds []int
+	multiStoreAllSkuInfoMap       map[int]map[int]*partner.SkuNameInfo
+	multiStoreAllSkuInfoList      map[int][]*partner.StoreSkuInfo
+	skuNameInfoList               []*partner.SkuNameInfo
+	filterVendorDepotUnSaleSkuIds []int
+	filterJxDepotUnSaleSkuIds     []int
 )

 type DiffDataLock struct {
@@ -88,6 +108,20 @@ type DiffDataLock struct {
 	locker      sync.RWMutex
 }

+type DeoptDiffDataLock struct {
+	diffDataMap map[int][]DepotDiffData
+	locker      sync.RWMutex
+}
+
+type DepotDiffData struct {
+	SkuID         string `json:"SkuID"`
+	JxSkuName     string `json:"京西商品名"`
+	VendorSkuName string `json:"平台商品名"`
+	JxStatus      string `json:"京西可售状态"`
+	VendorStatus  string `json:"平台可售状态"`
+	DatAanalyse   string `json:"数据分析"`
+}
+
 type DiffData struct {
 	JxStoreID       string `json:"京西门店ID"`
 	VendorStoreID   string `json:"平台门店ID"`
@@ -111,6 +145,16 @@ type StatisticData struct {
 	Percent        string `json:"占比"`
 }

+func (d *DeoptDiffDataLock) AppendData2(vendorID int, depotDiffData DepotDiffData) {
+	d.locker.Lock()
+	defer d.locker.Unlock()
+	d.diffDataMap[vendorID] = append(d.diffDataMap[vendorID], depotDiffData)
+}
+
+func (d *DeoptDiffDataLock) InitData2() {
+	d.diffDataMap = make(map[int][]DepotDiffData)
+}
+
 func (d *DiffDataLock) AppendData(vendorID int, diffData DiffData) {
 	d.locker.Lock()
 	defer d.locker.Unlock()
@@ -134,9 +178,21 @@ func GetMultiStoreAllSkuInfoList(vendorID int) []*partner.StoreSkuInfo {
 	return multiStoreAllSkuInfoList[vendorID]
 }

+//过滤掉平台下架的
+func StoreSkuFullList2BareFilter(storeSkuFull []*partner.SkuNameInfo) (bareStoreSkuList []*partner.StoreSkuInfo) {
+	for _, v := range storeSkuFull {
+		for _, v2 := range v.SkuList {
+			if v2.Status > model.SkuStatusDontSale {
+				bareStoreSkuList = append(bareStoreSkuList, &v2.StoreSkuInfo)
+			}
+		}
+	}
+	return bareStoreSkuList
+}
+
 func GetMultiStoreAllSkuInfo(ctx *jxcontext.Context, vendorMap map[int]bool) {
 	InitMultiStoreData()
-	filterCloseSkuIds = filterCloseSkuIds[0:0]
+	filterVendorDepotUnSaleSkuIds = filterVendorDepotUnSaleSkuIds[0:0]
 	for vendorID, _ := range vendorNameList {
 		//filter for vendorID
 		if len(vendorMap) > 0 {
@@ -146,16 +202,20 @@ func GetMultiStoreAllSkuInfo(ctx *jxcontext.Context, vendorMap map[int]bool) {
 		}
 		if partner.IsMultiStore(vendorID) {
 			multiHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.IMultipleStoresHandler)
-			allSkuNameInfoList, err := multiHandler.GetSkusForCheck(ctx, 0, "", "")
+			allSkuNameInfoList, err := multiHandler.GetSkus(ctx, 0, "", "")
+			skuNameInfoList = allSkuNameInfoList
 			if err != nil {
 				baseapi.SugarLogger.Errorf("GetMultiStoreAllSkuInfo error:%v", err)
 			} else {
-				multiStoreAllSkuInfoList[vendorID] = putils.StoreSkuFullList2Bare(allSkuNameInfoList) //map[平台ID：[]StoreSkuInfo1,StoreSkuInfo2...]
+				multiStoreAllSkuInfoList[vendorID] = StoreSkuFullList2BareFilter(allSkuNameInfoList) //map[平台ID：[]StoreSkuInfo1,StoreSkuInfo2...]
 				tempMap := make(map[int]*partner.SkuNameInfo)
 				for _, value := range allSkuNameInfoList {
 					for _, skuInfo := range value.SkuList {
-						filterCloseSkuIds = append(filterCloseSkuIds, skuInfo.SkuID)
-						tempMap[skuInfo.SkuID] = value
+						//表示平台商品库未下架的
+						if skuInfo.Status > model.SkuStatusDontSale {
+							filterVendorDepotUnSaleSkuIds = append(filterVendorDepotUnSaleSkuIds, skuInfo.SkuID)
+							tempMap[skuInfo.SkuID] = value
+						}
 					}
 				}
 				multiStoreAllSkuInfoMap[vendorID] = tempMap //map[平台ID][map[skuID1：SkuNameInfo1，skuID2：SkuNameInfo2]...]
@@ -186,6 +246,14 @@ func GetFilterVendorSkuInfoMap(vendorSkuInfoList []*partner.SkuNameInfo) map[int
 	return filterVendorSkuInfoMap
 }

+func GetFilterJxSkuInfoMap2(jxSkuInfoList []*model.SkuAndName) map[int]*model.SkuAndName {
+	filterVendorSkuInfoMap := make(map[int]*model.SkuAndName)
+	for _, value := range jxSkuInfoList {
+		filterVendorSkuInfoMap[value.ID] = value
+	}
+	return filterVendorSkuInfoMap
+}
+
 func GetFilterMultiStoreSkuInfoMap(vendorID int, skuInfoList []*partner.StoreSkuInfo) map[int]*partner.SkuNameInfo {
 	allSkuInfoMap := GetMultiStoreAllSkuInfoMap(vendorID)
 	filterSkuInfoMap := make(map[int]*partner.SkuNameInfo)
@@ -257,8 +325,16 @@ func IsSkuCanSale(saleStatus int) bool {
 func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName string, filterJxSkuInfoMap map[int]*StoreSkuNameExt, filterVendorSkuInfoMap map[int]*partner.SkuNameInfo) {
 	for skuID, jxSkuInfo := range filterJxSkuInfoMap {
 		skuIDStr := utils.Int2Str(skuID)
-		//jxSkuDetailName : 前缀 ([荐]) + 分类名(xxx水饺) + 数量单位(约..g/份) + 注释 (补充..)
-		jxSkuDetailName := jxutils.ComposeSkuName(jxSkuInfo.SkuName.Prefix, jxSkuInfo.SkuName.Name, jxSkuInfo.Skus2[0].Comment, jxSkuInfo.SkuName.Unit, jxSkuInfo.Skus2[0].SkuSpecQuality, jxSkuInfo.Skus2[0].SkuSpecUnit, 0)
+		var jxSkuDetailName string
+		//多规格商品不用比较数量单位
+		if jxSkuInfo.IsSpu == 0 {
+			//jxSkuDetailName : 前缀 ([荐]) + 分类名(xxx水饺) + 数量单位(约..g/份) + 注释 (补充..)
+			jxSkuDetailName = jxutils.ComposeSkuName(jxSkuInfo.SkuName.Prefix, jxSkuInfo.SkuName.Name, jxSkuInfo.Skus2[0].Comment, jxSkuInfo.SkuName.Unit, jxSkuInfo.Skus2[0].SkuSpecQuality, jxSkuInfo.Skus2[0].SkuSpecUnit, 0)
+		} else {
+			//jxSkuDetailName : 前缀 ([荐]) + 分类名(xxx水饺) + 数量单位(约..g/份) + 注释 (补充..)
+			jxSkuDetailName = jxutils.ComposeSkuName(jxSkuInfo.SkuName.Prefix, jxSkuInfo.SkuName.Name, jxSkuInfo.Skus2[0].Comment, "", jxSkuInfo.Skus2[0].SkuSpecQuality, "", 0)
+		}
+
 		//jxSkuSaleStatus : 商品状态 ，skustatus 优先级高于 StoreSkuStatus
 		jxSkuSaleStatus := jxutils.MergeSkuStatus(jxSkuInfo.Skus2[0].SkuStatus, jxSkuInfo.Skus2[0].StoreSkuStatus)
 		jxSkuSaleStatusName := GetSkuSaleStatusName(jxSkuSaleStatus)
@@ -286,26 +362,144 @@ func CompareJxAndVendor(vendorID int, storeIDStr, vendorStoreID, storeName strin
 				isNameDiff = false
 			}
 			if isSaleStatusDiff || isNameDiff {
-				outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, syncStatus, toBeCreate, toBeDel, jxSkuDetailName, vendorSkuDetailName, jxSkuSaleStatusName, vendorSkuSaleStatusName, ""}
+				reason := ""
+				if isNameDiff {
+					reason += DatAanalyse3
+				}
+				if isSaleStatusDiff {
+					reason += DatAanalyse4
+				}
+				if status != model.SkuStatusDontSale {
+					reason += DatAanalyse7
+				}
+				outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, syncStatus, toBeCreate, toBeDel, jxSkuDetailName, vendorSkuDetailName, jxSkuSaleStatusName, vendorSkuSaleStatusName, reason}
 				diffData.AppendData(vendorID, outPutData)
 			}
+			if !isSaleStatusDiff && !isNameDiff {
+				if status != model.SkuStatusDontSale {
+					outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, syncStatus, toBeCreate, toBeDel, jxSkuDetailName, vendorSkuDetailName, jxSkuSaleStatusName, vendorSkuSaleStatusName, DatAanalyse7}
+					diffData.AppendData(vendorID, outPutData)
+				}
+			}
 		} else {
 			if isFilterToBeCreateAndNotSale && model.IsSyncStatusNeedCreate(status) && !IsSkuCanSale(jxSkuSaleStatus) {
 				continue
 			}
-			outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, syncStatus, toBeCreate, toBeDel, jxSkuDetailName, "", jxSkuSaleStatusName, "", ""}
+			reason := ""
+			if status == model.SkuStatusDontSale {
+				reason = DatAanalyse8
+			} else {
+				reason = DatAanalyse2
+			}
+			if status != model.SkuStatusDontSale {
+				reason += DatAanalyse7
+			}
+			outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, syncStatus, toBeCreate, toBeDel, jxSkuDetailName, "", jxSkuSaleStatusName, "", reason}
 			diffData.AppendData(vendorID, outPutData)
 		}
 	}
 	for skuID, vendorSkuInfo := range filterVendorSkuInfoMap {
-		skuIDStr := utils.Int2Str(skuID)
-		vendorSkuDetailName := vendorSkuInfo.SkuList[0].SkuName
-		vendorSkuSaleStatusName := GetSkuSaleStatusName(vendorSkuInfo.SkuList[0].Status)
+		if vendorSkuInfo != nil {
+			if len(vendorSkuInfo.SkuList) > 0 {
+				skuIDStr := utils.Int2Str(skuID)
+				vendorSkuDetailName := vendorSkuInfo.SkuList[0].SkuName
+				vendorSkuSaleStatusName := GetSkuSaleStatusName(vendorSkuInfo.SkuList[0].Status)

-		jxSkuInfo := filterJxSkuInfoMap[skuID]
-		if jxSkuInfo == nil {
-			outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, "", "", "", "", vendorSkuDetailName, "", vendorSkuSaleStatusName, DatAanalyse1}
-			diffData.AppendData(vendorID, outPutData)
+				jxSkuInfo := filterJxSkuInfoMap[skuID]
+				if jxSkuInfo == nil {
+					outPutData := DiffData{storeIDStr, vendorStoreID, storeName, skuIDStr, "", "", "", "", vendorSkuDetailName, "", vendorSkuSaleStatusName, DatAanalyse1}
+					diffData.AppendData(vendorID, outPutData)
+				}
+			} else {
+				globals.SugarLogger.Warnf("CompareJxAndVendor vendorSkuInfo.SkuList:%d is nil", skuID)
+			}
+		} else {
+			globals.SugarLogger.Warnf("CompareJxAndVendor skuID:%d is nil", skuID)
+		}
+	}
+}
+
+func FilterJxDepotUnSaleSkuID() {
+	db := dao.GetDB()
+	filterJxDepotUnSaleSkuIds = filterJxDepotUnSaleSkuIds[0:0]
+	skuList, _ := dao.GetSkus(db, filterVendorDepotUnSaleSkuIds, []int{}, []int{}, []int{})
+	filterJxSkuInfoMap2 := GetFilterJxSkuInfoMap2(skuList)
+	for skuid, jxSkuInfo := range filterJxSkuInfoMap2 {
+		//过滤掉平台库下架，且京西库下架的商品，为下面比较门店商品用
+		if jxSkuInfo.Status != model.SkuStatusDontSale {
+			filterJxDepotUnSaleSkuIds = append(filterJxDepotUnSaleSkuIds, skuid)
+		}
+	}
+}
+
+func CompareJxAndMultiVenderDepot(ctx *jxcontext.Context, vendorMap map[int]bool) {
+	db := dao.GetDB()
+	for vendorID, _ := range vendorNameList {
+		//filter for vendorID
+		if len(vendorMap) > 0 {
+			if _, ok := vendorMap[vendorID]; !ok {
+				continue
+			}
+		}
+		if partner.IsMultiStore(vendorID) {
+			FilterJxDepotUnSaleSkuID()
+			filterVendorSkuInfoMap := GetFilterVendorSkuInfoMap(skuNameInfoList)
+			skuNameInfoList = skuNameInfoList[0:0]
+			skuList, _ := dao.GetSkus(db, []int{}, []int{}, []int{}, []int{})
+			filterJxSkuInfoMap2 := GetFilterJxSkuInfoMap2(skuList)
+			for skuid, jxSkuInfo := range filterJxSkuInfoMap2 {
+				var jxSkuDetailName string
+				//多规格商品不用比较数量单位
+				if jxSkuInfo.IsSpu == 0 {
+					jxSkuDetailName = jxutils.ComposeSkuName(jxSkuInfo.Prefix, jxSkuInfo.Name, jxSkuInfo.Comment, jxSkuInfo.Unit, jxSkuInfo.SpecQuality, jxSkuInfo.SpecUnit, 0)
+				} else {
+					jxSkuDetailName = jxutils.ComposeSkuName(jxSkuInfo.Prefix, jxSkuInfo.Name, jxSkuInfo.Comment, "", jxSkuInfo.SpecQuality, "", 0)
+				}
+
+				vendorSkuInfoMap := filterVendorSkuInfoMap[skuid]
+				jxSkuSaleStatus := jxSkuInfo.Status
+				jxSkuSaleStatusName := GetSkuSaleStatusName(jxSkuSaleStatus)
+				skuIDStr := utils.Int2Str(skuid)
+				if vendorSkuInfoMap != nil {
+					vendorSkuSaleStatusName := GetSkuSaleStatusName(vendorSkuInfoMap.SkuList[0].Status)
+					vendorSkuDetailName := vendorSkuInfoMap.SkuList[0].SkuName
+					isSaleStatusDiff := jxSkuSaleStatusName != vendorSkuSaleStatusName
+					isNameDiff := strings.Compare(jxSkuDetailName, vendorSkuDetailName) != 0
+					if isNameDiff || isSaleStatusDiff {
+						reason := ""
+						if isNameDiff {
+							reason += DatAanalyse3
+						}
+						if isSaleStatusDiff {
+							reason += DatAanalyse4
+						}
+						outPutData := DepotDiffData{skuIDStr, jxSkuDetailName, vendorSkuDetailName, jxSkuSaleStatusName, vendorSkuSaleStatusName, reason}
+						depotDiffData.AppendData2(vendorID, outPutData)
+					}
+				} else {
+					outPutData := DepotDiffData{skuIDStr, jxSkuDetailName, "", jxSkuSaleStatusName, "", DatAanalyse6}
+					depotDiffData.AppendData2(vendorID, outPutData)
+				}
+			}
+			for skuID, vendorSkuInfo := range filterVendorSkuInfoMap {
+				if vendorSkuInfo != nil {
+					if len(vendorSkuInfo.SkuList) > 0 {
+						skuIDStr := utils.Int2Str(skuID)
+						vendorSkuDetailName := vendorSkuInfo.SkuList[0].SkuName
+						vendorSkuSaleStatusName := GetSkuSaleStatusName(vendorSkuInfo.SkuList[0].Status)
+
+						jxSkuInfo := filterJxSkuInfoMap2[skuID]
+						if jxSkuInfo == nil {
+							outPutData := DepotDiffData{skuIDStr, "", vendorSkuDetailName, "", vendorSkuSaleStatusName, DatAanalyse5}
+							depotDiffData.AppendData2(vendorID, outPutData)
+						}
+					} else {
+						globals.SugarLogger.Warnf("CompareJxAndMultiVenderDepot vendorSkuInfo.SkuList:%d is nil", skuID)
+					}
+				} else {
+					globals.SugarLogger.Warnf("CompareJxAndMultiVenderDepot skuID:%d is nil", skuID)
+				}
+			}
 		}
 	}
 }
@@ -330,6 +524,10 @@ func CheckSkuDiffBetweenJxAndVendor(ctx *jxcontext.Context, vendorIDList []int,
 			//2.为multiStoreAllSkuInfoList 和 multiStoreAllSkuInfoMap 赋值
 			GetMultiStoreAllSkuInfo(ctx, vendorMap)
 		case 1:
+			//对比京西库和多门店平台的库的信息
+			depotDiffData.InitData2()
+			CompareJxAndMultiVenderDepot(ctx, vendorMap)
+		case 2:
 			//1.获取京西本地所有门店信息 store、place、user表联查  jxStoreInfoList
 			//2.过滤所有门店信息，只留下传进来的vendorMap，storeIDMap中对应的平台和门台信息  filterStoreList
 			//3.判断是否多平台门店，两种情况两种处理
@@ -345,15 +543,26 @@ func CheckSkuDiffBetweenJxAndVendor(ctx *jxcontext.Context, vendorIDList []int,
 					storeIDStr := utils.Int2Str(storeID)
 					storeName := jxStoreInfoListValue.Name
 					if jxStoreInfoListValue.StoreMaps != nil {
-						isGetJxSkuInfoData := false
-						var filterJxSkuInfoMap map[int]*StoreSkuNameExt
+						var filterJxSkuInfoMapSingle map[int]*StoreSkuNameExt
+						var filterJxSkuInfoMapMulti map[int]*StoreSkuNameExt
 						for _, vendorListValue := range jxStoreInfoListValue.StoreMaps {
 							vendorID := int(utils.MustInterface2Int64(vendorListValue["vendorID"]))
-
-							if isGetJxSkuInfoData == false { //only get once jx sku info list every store id
-								isGetJxSkuInfoData = true
-								jxSkuInfoData, _ := GetStoreSkus(ctx, storeID, filterCloseSkuIds, true, "", true, false, map[string]interface{}{}, 0, -1)
-								filterJxSkuInfoMap = GetFilterJxSkuInfoMap(jxSkuInfoData.SkuNames) //map[京西商品ID:StoreSkuNameExt]
+							//京西的门店商品只取一次
+							flag := false
+							jxSkuInfoDataSingle := &StoreSkuNamesInfo{}
+							jxSkuInfoDataMulti := &StoreSkuNamesInfo{}
+							if partner.IsMultiStore(vendorID) {
+								if flag == false {
+									jxSkuInfoDataMulti, _ = GetStoreSkus(ctx, storeID, filterJxDepotUnSaleSkuIds, true, "", true, false, map[string]interface{}{}, 0, -1)
+									filterJxSkuInfoMapMulti = GetFilterJxSkuInfoMap(jxSkuInfoDataMulti.SkuNames) //map[京西商品ID:StoreSkuNameExt]
+									flag = true
+								}
+							} else {
+								if flag == false {
+									jxSkuInfoDataSingle, _ = GetStoreSkus(ctx, storeID, []int{}, true, "", true, false, map[string]interface{}{}, 0, -1)
+									filterJxSkuInfoMapSingle = GetFilterJxSkuInfoMap(jxSkuInfoDataSingle.SkuNames) //map[京西商品ID:StoreSkuNameExt]
+									flag = true
+								}
 							}

 							vendorStoreID := utils.Interface2String(vendorListValue["vendorStoreID"])
@@ -367,7 +576,7 @@ func CheckSkuDiffBetweenJxAndVendor(ctx *jxcontext.Context, vendorIDList []int,
 									baseapi.SugarLogger.Infof("CheckSkuDiffBetweenJxAndVendor GetStoreSkusBareInfo error:%v", err)
 								} else if len(skuBareInfoList) > 0 {
 									filterSkuInfoMap := GetFilterMultiStoreSkuInfoMap(vendorID, skuBareInfoList) //map[京东商品ID:SkuNameInfo]
-									CompareJxAndVendor(vendorID, storeIDStr, vendorStoreID, storeName, filterJxSkuInfoMap, filterSkuInfoMap)
+									CompareJxAndVendor(vendorID, storeIDStr, vendorStoreID, storeName, filterJxSkuInfoMapMulti, filterSkuInfoMap)
 								}
 							} else {
 								singleStoreHandler := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler)
@@ -376,7 +585,7 @@ func CheckSkuDiffBetweenJxAndVendor(ctx *jxcontext.Context, vendorIDList []int,
 									baseapi.SugarLogger.Infof("CheckSkuDiffBetweenJxAndVendor GetStoreSkusFullInfo error:%v", err)
 								} else if len(vendorSkuInfoList) > 0 {
 									filterVendorSkuInfoMap := GetFilterVendorSkuInfoMap(vendorSkuInfoList) //map[平台商品ID:SkuNameInfo]
-									CompareJxAndVendor(vendorID, storeIDStr, vendorStoreID, storeName, filterJxSkuInfoMap, filterVendorSkuInfoMap)
+									CompareJxAndVendor(vendorID, storeIDStr, vendorStoreID, storeName, filterJxSkuInfoMapSingle, filterVendorSkuInfoMap)
 								}
 							}
 						}
@@ -390,8 +599,8 @@ func CheckSkuDiffBetweenJxAndVendor(ctx *jxcontext.Context, vendorIDList []int,
 					baseapi.SugarLogger.Debugf("CheckSkuDiffBetweenJxAndVendor taskParallel error:%v", err)
 				}
 			}
-		case 2:
-			WriteToExcel(task, diffData.diffDataMap)
+		case 3:
+			WriteToExcel(task, diffData.diffDataMap, depotDiffData.diffDataMap)
 			endProcessTime := time.Now().Unix()
 			diff := endProcessTime - startProcessTime
 			baseapi.SugarLogger.Debugf("CheckSkuDiffBetweenJxAndVendor end time: %v", time.Now())
@@ -399,7 +608,7 @@ func CheckSkuDiffBetweenJxAndVendor(ctx *jxcontext.Context, vendorIDList []int,
 		}
 		return result, err
 	}
-	taskSeq := tasksch.NewSeqTask("京西和平台商品差异对比-序列任务", ctx, taskSeqFunc, 3)
+	taskSeq := tasksch.NewSeqTask("京西和平台商品差异对比-序列任务", ctx, taskSeqFunc, 4)
 	tasksch.HandleTask(taskSeq, nil, true).Run()
 }

@@ -464,10 +673,18 @@ func AddStatisticSheet(sheetName string, data []DiffData) (sheet *excel.Obj2Exce
 	return sheet
 }

-func WriteToExcel(task *tasksch.SeqTask, data map[int][]DiffData) {
+func WriteToExcel(task *tasksch.SeqTask, data map[int][]DiffData, depotData map[int][]DepotDiffData) {
 	var sheetList []*excel.Obj2ExcelSheetConfig
 	for key, value := range data {
 		sheetName := vendorNameList[key]
+		if partner.IsMultiStore(key) {
+			excelConfDepot := &excel.Obj2ExcelSheetConfig{
+				Title:       sheetName + "商品库与京西商品库对比",
+				Data:        depotData[key],
+				CaptionList: deoptTitleList,
+			}
+			sheetList = append(sheetList, excelConfDepot)
+		}
 		excelConf := &excel.Obj2ExcelSheetConfig{
 			Title:       sheetName,
 			Data:        value,
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -232,7 +232,7 @@ func (v *VendorSync) SyncSku(ctx *jxcontext.Context, db *dao.DaoDB, nameID, skuI

 func (v *VendorSync) SyncSkus(ctx *jxcontext.Context, db *dao.DaoDB, nameIDs []int, skuIDs []int, isAsync, isContinueWhenError bool, userName string) (hint string, err error) {
 	globals.SugarLogger.Debugf("SyncSku trackInfo:%s, nameIDs:%v, skuIDs:%v, userName:%s", ctx.GetTrackInfo(), nameIDs, skuIDs, userName)
-	isManagedIt := len(nameIDs) > 1 || len(nameIDs) == 0 || len(skuIDs) > 1 || len(skuIDs) == 0
+	isManagedIt := !(len(nameIDs) > 0 && len(nameIDs) <= 2 || len(skuIDs) > 0 && len(skuIDs) < 8)
 	return v.LoopMultiStoresVendors(ctx, db, fmt.Sprintf("同步商品信息, nameIDs:%v, skuIDs:%v", nameIDs, skuIDs), isAsync, isManagedIt,
 		func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
 			var resultList []interface{}
@@ -358,7 +358,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, skuIDs, excludeSkuIDs []int, setSyncStatus int, isAsync, isContinueWhenError bool) (hint string, err error) {
+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,
@@ -373,11 +373,13 @@ func (v *VendorSync) SyncStoresSkus2(ctx *jxcontext.Context, db *dao.DaoDB, vend
 					tasksch.NewParallelConfig().SetParallelCount(parallelCount).SetIsContinueWhenError(isContinueWhenError), ctx,
 					func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 						storeMap := batchItemList[0].(*model.StoreMap)
-						if setSyncStatus != 0 {
-							dao.SetStoreSkuSyncStatus(db, storeMap.VendorID, []int{storeMap.StoreID}, skuIDs, setSyncStatus)
-						}
-						if _, err = v.proxySyncStoreSku(ctx, task, storeMap, nil, skuIDs, excludeSkuIDs, false, isContinueWhenError); err != nil {
-							globals.SugarLogger.Debugf("SyncStoresSkus2 failed2 store:%d failed with error:%v", storeMap.StoreID, err)
+						if syncDisabled || storeMap.Status > model.StoreStatusDisabled {
+							if setSyncStatus != 0 {
+								dao.SetStoreSkuSyncStatus(db, storeMap.VendorID, []int{storeMap.StoreID}, skuIDs, setSyncStatus)
+							}
+							if _, err = v.proxySyncStoreSku(ctx, task, storeMap, nil, skuIDs, excludeSkuIDs, false, isContinueWhenError); err != nil {
+								globals.SugarLogger.Debugf("SyncStoresSkus2 failed2 store:%d failed with error:%v", storeMap.StoreID, err)
+							}
 						}
 						return nil, err
 					}, loopMapInfo.StoreMapList)
@@ -387,18 +389,6 @@ func (v *VendorSync) SyncStoresSkus2(ctx *jxcontext.Context, db *dao.DaoDB, vend
 			return nil, partner.AddVendorInfo2Err(err, loopMapInfo.VendorID)
 		}, isContinueWhenError)
 	if task != nil {
-		// if vendorErr := partner.IsErrChangePriceFailed(task.GetOriginalErr()); vendorErr != nil {
-		// 	platformList := make([]string, len(task.GetDetailErrList()))
-		// 	for k, v := range task.GetDetailErrList() {
-		// 		if vendorErr := partner.IsErrVendorError(v); vendorErr != nil {
-		// 			platformList[k] = model.VendorChineseNames[vendorErr.VendorID()]
-		// 		} else {
-		// 			platformList[k] = "未知"
-		// 		}
-		// 	}
-		// 	err = fmt.Errorf("同步价格失败\n失败平台：%s", strings.Join(platformList, ","))
-		// } else {
-		// }
 		err = makeSyncError(err)
 	}
 	return hint, err
@@ -409,36 +399,22 @@ func (v *VendorSync) SyncStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, vendo
 	if isForce {
 		setSyncStatus = model.SyncFlagStoreSkuModifiedMask
 	}
-	return v.SyncStoresSkus2(ctx, db, vendorIDs, storeIDs, skuIDs, nil, setSyncStatus, isAsync, isContinueWhenError)
+	return v.SyncStoresSkus2(ctx, db, vendorIDs, storeIDs, true, skuIDs, nil, setSyncStatus, isAsync, isContinueWhenError)
 }

-// func isUseOldSyncLogic(storeMap *model.StoreMap) bool {
-// 	return false
-// 	return globals.IsProductEnv() && storeMap.StoreID != 102652 // 绿城四季鲜店
-// }
-
 func (v *VendorSync) proxySyncStoreCategory(ctx *jxcontext.Context, parentTask tasksch.ITask, storeMap *model.StoreMap, nameIDs, skuIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
-	// if isUseOldSyncLogic(storeMap) {
-	// 	return v.GetStoreHandler(storeMap.VendorID).(partner.ISingleStoreHandler).SyncStoreCategory(ctx, parentTask, storeMap.StoreID, isAsync)
-	// }
 	return SyncStorCategories(ctx, parentTask, storeMap.VendorID, storeMap.StoreID, storeMap.VendorStoreID, nil, skuIDs, isAsync, isContinueWhenError)
 }

 func (v *VendorSync) proxySyncStoreSku(ctx *jxcontext.Context, parentTask tasksch.ITask, storeMap *model.StoreMap, nameIDs, skuIDs, excludeSkuIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
-	// if isUseOldSyncLogic(storeMap) {
-	// 	return v.GetStoreHandler(storeMap.VendorID).SyncStoreSkus(ctx, parentTask, storeMap.StoreID, skuIDs, isAsync, isContinueWhenError)
-	// }
 	return SyncStoreSkuNew(ctx, parentTask, storeMap.VendorID, storeMap.StoreID, storeMap.VendorStoreID, nil, skuIDs, excludeSkuIDs, isAsync, isContinueWhenError)
 }

 func (v *VendorSync) proxyFullSyncStoreSku(ctx *jxcontext.Context, parentTask tasksch.ITask, storeMap *model.StoreMap, isAsync, isContinueWhenError bool) (hint string, err error) {
-	// if isUseOldSyncLogic(storeMap) {
-	// 	return v.GetStoreHandler(storeMap.VendorID).FullSyncStoreSkus(ctx, parentTask, storeMap.StoreID, isAsync, isContinueWhenError)
-	// }
 	return FullSyncStoreSkuNew(ctx, parentTask, storeMap.VendorID, storeMap.StoreID, storeMap.VendorStoreID, isAsync, isContinueWhenError)
 }

-func (v *VendorSync) FullSyncStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs []int, storeIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
+func (v *VendorSync) FullSyncStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs []int, storeIDs []int, syncDisabled, isAsync, isContinueWhenError bool) (hint string, err error) {
 	globals.SugarLogger.Debug("FullSyncStoresSkus")
 	hint, err = v.LoopStoresMap(ctx, db, fmt.Sprintf("初始化门店商品信息:%v", storeIDs), isAsync, true, vendorIDs, storeIDs,
 		func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
@@ -452,8 +428,10 @@ func (v *VendorSync) FullSyncStoresSkus(ctx *jxcontext.Context, db *dao.DaoDB, v
 					tasksch.NewParallelConfig().SetParallelCount(parallelCount).SetIsContinueWhenError(isContinueWhenError), ctx,
 					func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 						storeMap := batchItemList[0].(*model.StoreMap)
-						if _, err = v.proxyFullSyncStoreSku(ctx, task, storeMap, false, isContinueWhenError); err != nil {
-							globals.SugarLogger.Debugf("FullSyncStoresSkus failed2 store:%d failed with error:%v", storeMap.StoreID, err)
+						if syncDisabled || storeMap.Status > model.StoreStatusDisabled {
+							if _, err = v.proxyFullSyncStoreSku(ctx, task, storeMap, false, isContinueWhenError); err != nil {
+								globals.SugarLogger.Debugf("FullSyncStoresSkus failed2 store:%d failed with error:%v", storeMap.StoreID, err)
+							}
 						}
 						return nil, err
 					}, loopMapInfo.StoreMapList)
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -238,10 +238,12 @@ 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.StoreSkuSyncStatus = 0
-			if utils.IsTimeZero(sku.BindDeletedAt) {
+			if utils.IsTimeZero(sku.BindDeletedAt) && (sku.ID == 0 || sku.NameID == 0) {
 				kvs[model.FieldDeletedAt] = time.Now()
 			}
-			kvs[dao.GetVendorThingIDStructField(model.VendorNames[vendorID])] = 0
+			if !dao.IsVendorThingIDEmpty(sku.VendorSkuID) && !partner.IsMultiStore(vendorID) {
+				kvs[dao.GetVendorThingIDStructField(model.VendorNames[vendorID])] = 0
+			}
 		} else {
 			sku.StoreSkuSyncStatus = sku.StoreSkuSyncStatus & model.SyncFlagPriceMask
 		}
@@ -402,6 +404,10 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo
 							stockList = append(stockList, bareSku)
 						} else {
 							offlineList = append(offlineList, bareSku)
+							// 因为京东平台以是否有库存表示是否关注，所以不论是否可售，都要设置库存
+							if singleStoreHandler == nil {
+								stockList = append(stockList, bareSku)
+							}
 						}
 					}
 				}
--- a/business/jxstore/misc/misc.go
+++ b/business/jxstore/misc/misc.go
@@ -124,12 +124,12 @@ func doDailyWork() {
 	globals.SugarLogger.Debug("doDailyWork")
 	cms.SyncStoresCourierInfo(jxcontext.AdminCtx, nil, false, true)
 	netprinter.RebindAllPrinters(jxcontext.AdminCtx, false, true)
-	// cms.CurVendorSync.FullSyncStoresSkus(jxcontext.AdminCtx, dao.GetDB(), []int{model.VendorIDJD}, nil, true, true)
+	// cms.CurVendorSync.FullSyncStoresSkus(jxcontext.AdminCtx, dao.GetDB(), []int{model.VendorIDJD}, nil, false, true, true)

-	cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, dao.GetDB(), []int{model.VendorIDJD}, nil, nil, []int{27379}, model.SyncFlagSaleMask|model.SyncFlagPriceMask, true, true)
+	cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, dao.GetDB(), []int{model.VendorIDJD}, nil, false, nil, []int{27379}, model.SyncFlagSaleMask|model.SyncFlagPriceMask, true, true)

 	SaveImportantTaskID(TaskNameSyncStoreSku, SpecialTaskID)
-	taskID, _ := cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, dao.GetDB(), []int{model.VendorIDEBAI, model.VendorIDMTWM}, nil, nil, nil, model.SyncFlagSaleMask|model.SyncFlagPriceMask, true, true)
+	taskID, _ := cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, dao.GetDB(), []int{model.VendorIDEBAI, model.VendorIDMTWM}, nil, false, nil, nil, model.SyncFlagSaleMask|model.SyncFlagPriceMask, true, true)
 	SaveImportantTaskID(TaskNameSyncStoreSku, taskID)

 	InitEx()
--- a/business/jxstore/report/report.go
+++ b/business/jxstore/report/report.go
@@ -0,0 +1,35 @@
+package report
+
+import (
+	"errors"
+	"fmt"
+	"math"
+
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
+	"git.rosy.net.cn/jx-callback/business/model/dao"
+)
+
+func GetStatisticsReportForOrders(ctx *jxcontext.Context, storeIDs []int, fromDate string, toDate string) (statisticsReportForOrdersList []*dao.StatisticsReportForOrdersList, err error) {
+	db := dao.GetDB()
+	fromDateParm := utils.Str2Time(fromDate)
+	toDateParm := utils.Str2Time(toDate)
+	//若时间间隔大于3个月则不允许查询
+	if math.Ceil(toDateParm.Sub(fromDateParm).Hours()/24) > 92 {
+		return nil, errors.New(fmt.Sprintf("查询间隔时间不允许大于3个月！: 时间范围：[%v]  至  [%v]", fromDate, toDate))
+	}
+	statisticsReportForOrdersList, err = dao.GetStatisticsReportForOrders(db, storeIDs, fromDateParm, toDateParm)
+	return statisticsReportForOrdersList, err
+}
+
+func GetStatisticsReportForAfsOrders(ctx *jxcontext.Context, storeIDs []int, fromDate string, toDate string) (statisticsReportForOrdersList []*dao.StatisticsReportForOrdersList, err error) {
+	db := dao.GetDB()
+	fromDateParm := utils.Str2Time(fromDate)
+	toDateParm := utils.Str2Time(toDate)
+	//若时间间隔大于3个月则不允许查询
+	if math.Ceil(toDateParm.Sub(fromDateParm).Hours()/24) > 92 {
+		return nil, errors.New(fmt.Sprintf("查询间隔时间不允许大于3个月！: 时间范围：[%v]  至  [%v]", fromDate, toDate))
+	}
+	statisticsReportForOrdersList, err = dao.GetGetStatisticsReportForAfsOrders(db, storeIDs, fromDateParm, toDateParm)
+	return statisticsReportForOrdersList, err
+}
--- a/business/jxutils/eventhub/eventhub.go
+++ b/business/jxutils/eventhub/eventhub.go
@@ -43,7 +43,6 @@ type EventInfo struct {

 type tRegisterInfo struct {
 	notifyChan    chan *EventInfo
-	eventCategory string
 	eventTypeList []string
 	criteria      interface{}
 }
@@ -177,8 +176,7 @@ func (e *EventHub) registerConsumer(eventCategory string, eventTypeList []string
 		realEventTypeList[index] = composeEventType(eventCategory, eventType)
 	}
 	info := &tRegisterInfo{
-		eventCategory: eventCategory,
-		eventTypeList: eventTypeList,
+		eventTypeList: realEventTypeList,
 		notifyChan:    make(chan *EventInfo, 1),
 		criteria:      criteria,
 	}
--- a/business/jxutils/eventhub/syseventhub/syseventhub.go
+++ b/business/jxutils/eventhub/syseventhub/syseventhub.go
@@ -13,7 +13,9 @@ import (
 const (
 	EventCategory = "sys"

-	EventTypeWXToken = "wxtoken"
+	EventTypeWXToken     = "wxToken"
+	EventTypeYLYToken    = "ylyToken"
+	EventTypeWeimobToken = "weimobToken"
 )

 type Hub struct {
@@ -23,7 +25,7 @@ type Hub struct {
 type Criteria struct {
 }

-type WXTokenInfo struct {
+type TokenInfo struct {
 	IsNew bool   `json:"isNew"`
 	Token string `json:"token"`
 }
@@ -55,22 +57,58 @@ func (h *Hub) OnNewWXToken(token string) {
 	})
 }

-func (h *Hub) GetWXToken(oldToken string, waitTime time.Duration) (tokenInfo *WXTokenInfo) {
-	token := api.WeixinAPI.CBGetToken()
+func (h *Hub) OnNewYLYToken(token string) {
+	h.eventHub.PostNewEvent(EventCategory, &eventhub.EventInfo{
+		Type: EventTypeYLYToken,
+		Data: token,
+	})
+}
+
+func (h *Hub) OnNewWeimobToken(token string) {
+	h.eventHub.PostNewEvent(EventCategory, &eventhub.EventInfo{
+		Type: EventTypeWeimobToken,
+		Data: token,
+	})
+}
+
+func (h *Hub) GetToken(tokenType, oldToken string, waitTime time.Duration) (tokenInfo *TokenInfo) {
+	var token string
+	switch tokenType {
+	case EventTypeWXToken:
+		token = api.WeixinAPI.CBGetToken()
+	case EventTypeYLYToken:
+		token = api.YilianyunAPI.GetToken()
+	case EventTypeWeimobToken:
+		if weimobToken := api.WeimobAPI.GetToken(); weimobToken != nil {
+			token = string(utils.MustMarshal(weimobToken))
+		}
+	}
 	if token != oldToken {
-		tokenInfo = &WXTokenInfo{
+		tokenInfo = &TokenInfo{
 			IsNew: false,
 			Token: token,
 		}
 	} else {
-		eventInfo, err := h.eventHub.GetEvent(EventCategory, []string{EventTypeWXToken}, nil, waitTime)
+		eventInfo, err := h.eventHub.GetEvent(EventCategory, []string{tokenType}, nil, waitTime)
 		if err == nil && eventInfo != nil {
-			tokenInfo = &WXTokenInfo{
+			tokenInfo = &TokenInfo{
 				IsNew: true,
 				Token: eventInfo.Data.(string),
 			}
 		}
 	}
-	globals.SugarLogger.Debugf("GetWXToken tokenInfo:%s", utils.Format4Output(tokenInfo, true))
+	globals.SugarLogger.Debugf("GetToken tokenType:%s tokenInfo:%s", tokenType, utils.Format4Output(tokenInfo, true))
 	return tokenInfo
 }
+
+func (h *Hub) GetWXToken(oldToken string, waitTime time.Duration) (tokenInfo *TokenInfo) {
+	return h.GetToken(EventTypeWXToken, oldToken, waitTime)
+}
+
+func (h *Hub) GetYLYToken(oldToken string, waitTime time.Duration) (tokenInfo *TokenInfo) {
+	return h.GetToken(EventTypeYLYToken, oldToken, waitTime)
+}
+
+func (h *Hub) GetWeimobToken(oldToken string, waitTime time.Duration) (tokenInfo *TokenInfo) {
+	return h.GetToken(EventTypeWeimobToken, oldToken, waitTime)
+}
--- a/business/jxutils/jxcontext/jxcontext.go
+++ b/business/jxutils/jxcontext/jxcontext.go
@@ -6,6 +6,7 @@ import (

 	"git.rosy.net.cn/jx-callback/business/auth2"
 	"git.rosy.net.cn/jx-callback/business/model"
+	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/globals"
 )

@@ -156,3 +157,14 @@ func (ctx *Context) GetUserID() (userID string) {
 	}
 	return userID
 }
+
+func (ctx *Context) GetFullUser() (user *model.User) {
+	token := ctx.GetToken()
+	authInfo, err2 := auth2.GetTokenInfo(token)
+	if err2 == nil {
+		if authInfo.TokenType == auth2.TokenTypeNormal {
+			user, _ = dao.GetUserByID(dao.GetDB(), "user_id", authInfo.GetID())
+		}
+	}
+	return user
+}
--- a/business/jxutils/jxutils.go
+++ b/business/jxutils/jxutils.go
@@ -144,7 +144,7 @@ func GetPossibleVendorIDFromVendorOrderID(vendorOrderID string) (vendorID int) {
 		// 改造点：
 		// 1、订单号位数变化，由原有15位数增加1位数调整为16位数，对接商家需检查是否有对订单号位数做长度校验。
 		// 2、第一位数字发生变化，由原来9开头调整为当年年份后两位数如：2020年订单开头为20；
-		if orderIDLen == len("925265130002541") || orderIDLen == len("1925265130002541")+1 {
+		if orderIDLen == len("925265130002541") || orderIDLen == len("1925265130002541") {
 			vendorID = model.VendorIDJD
 		} else if orderIDLen == len("3022716176275221584") {
 			// vendorID = model.VendorIDELM
--- a/business/jxutils/tasks/configrefresh.go
+++ b/business/jxutils/tasks/configrefresh.go
@@ -26,7 +26,6 @@ import (
 const (
 	weixinTokenExpires    = 7200 * time.Second
 	dingdingTokenExpires  = 7200 * time.Second
-	elmTokenExpires       = 20 * 24 * 3600 * time.Second
 	weimobTokenExpires    = 7200 * time.Second
 	yilianyunTokenExpires = 30 * 24 * 3600 * time.Second

@@ -35,16 +34,6 @@ const (
 	minRefreshGap = 1 * time.Second
 )

-type ElmTokenForCompatible struct {
-	Error            string `json:"error"`
-	ErrorDescription string `json:"error_description"`
-	AccessToken      string `json:"accessToken"`
-	TokenType        string `json:"tokenType"`
-	Expires          int    `json:"expires"`
-	RefreshToken     string `json:"refreshToken"`
-	Success          bool   `json:"success"`
-}
-
 type CallResult struct {
 	Code string `json:"code"`
 	Desc string `json:"desc"`
@@ -126,19 +115,17 @@ func RefreshWeixinToken() (err error) {
 	if api.WeixinAPI != nil {
 		err = RefreshConfig("wechat", weixinTokenExpires, func() (token string, expireTimeStr string) {
 			globals.SugarLogger.Debugf("RefreshWeixinToken RunMode:%s", beego.BConfig.RunMode)
-			if globals.IsProductEnv() || beego.BConfig.RunMode == "alpha" {
-				if globals.IsMainProductEnv() {
-					if tokenInfo, err := api.WeixinAPI.CBRetrieveToken(); err == nil {
-						globals.SugarLogger.Debugf("RefreshWeixinToken tokenInfo:%s", utils.Format4Output(tokenInfo, true))
-						token = tokenInfo.AccessToken
-					} else {
-						globals.SugarLogger.Errorf("RefreshWeixinToken RefreshToken failed with error:%v", err)
-					}
+			if globals.IsMainProductEnv() {
+				if tokenInfo, err := api.WeixinAPI.CBRetrieveToken(); err == nil {
+					globals.SugarLogger.Debugf("RefreshWeixinToken tokenInfo:%s", utils.Format4Output(tokenInfo, true))
+					token = tokenInfo.AccessToken
 				} else {
-					if tokenInfo := getWXTokenFromRemote(api.WeixinAPI.CBGetToken()); tokenInfo != nil {
-						expireTimeStr = utils.Time2Str(time.Now().Add(-weixinTokenExpires))
-						token = tokenInfo.Token
-					}
+					globals.SugarLogger.Errorf("RefreshWeixinToken RefreshToken failed with error:%v", err)
+				}
+			} else {
+				if tokenInfo := getWXTokenFromRemote(api.WeixinAPI.CBGetToken()); tokenInfo != nil {
+					expireTimeStr = utils.Time2Str(time.Now().Add(-weixinTokenExpires))
+					token = tokenInfo.Token
 				}
 			}
 			return token, expireTimeStr
@@ -151,48 +138,30 @@ func RefreshWeixinToken() (err error) {
 	return err
 }

-func RefreshElmToken() (err error) {
-	if api.ElmAPI != nil {
-		err = RefreshConfig("eleme", elmTokenExpires, func() (string, string) {
-			if globals.IsProductEnv() {
-				if tokenInfo, err := api.ElmAPI.RefreshTokenIndividual(); err == nil {
-					tokenInfo2 := &ElmTokenForCompatible{
-						Error:            "",
-						ErrorDescription: "",
-						AccessToken:      tokenInfo.AccessToken,
-						TokenType:        tokenInfo.TokenType,
-						Expires:          tokenInfo.ExpiresIn,
-						RefreshToken:     "",
-						Success:          true,
-					}
-					return string(utils.MustMarshal(tokenInfo2)), ""
-				}
-			}
-			return "", ""
-		}, func(value string) {
-			var tokenInfo ElmTokenForCompatible
-			err := utils.UnmarshalUseNumber([]byte(value), &tokenInfo)
-			if err == nil {
-				api.ElmAPI.SetToken(tokenInfo.AccessToken)
-			}
-		})
-	}
-	return err
-}
-
 func RefreshWeimobToken() (err error) {
 	if api.WeimobAPI != nil {
-		err = RefreshConfig("weimob", weimobTokenExpires, func() (string, string) {
-			if globals.IsProductEnv() {
+		err = RefreshConfig("weimob", weimobTokenExpires, func() (token string, expireTimeStr string) {
+			globals.SugarLogger.Debugf("RefreshWeimobToken RunMode:%s", beego.BConfig.RunMode)
+			if globals.IsMainProductEnv() {
 				if tokenInfo, err := api.WeimobAPI.RefreshTokenByRefreshToken(); err == nil {
 					return string(utils.MustMarshal(tokenInfo)), utils.Time2Str(time.Now().Add((time.Duration(tokenInfo.ExpiresIn) - weimobTokenExpires/time.Second) * time.Second))
 				}
+			} else {
+				curToken := ""
+				if tokenInfo := api.WeimobAPI.GetToken(); tokenInfo != nil {
+					curToken = string(utils.MustMarshal(tokenInfo))
+				}
+				if tokenInfo := getWeimobTokenFromRemote(curToken); tokenInfo != nil {
+					expireTimeStr = utils.Time2Str(time.Now().Add(-weimobTokenExpires))
+					token = tokenInfo.Token
+				}
 			}
-			return "", ""
+			return token, expireTimeStr
 		}, func(value string) {
 			var tokenInfo *weimobapi.TokenInfo
 			err := utils.UnmarshalUseNumber([]byte(value), &tokenInfo)
 			if err == nil {
+				syseventhub.SysEventHub.OnNewWeimobToken(string(utils.MustMarshal(tokenInfo)))
 				api.WeimobAPI.SetToken(tokenInfo)
 			}
 		})
@@ -230,66 +199,98 @@ func SaveWeimobToken(token *weimobapi.TokenInfo) (err error) {
 }

 func RefreshYilianyunToken() (err error) {
-	return RefreshConfig("yilianyun", yilianyunTokenExpires, func() (string, string) {
+	return RefreshConfig("yilianyun", yilianyunTokenExpires, func() (token string, expireTimeStr string) {
 		globals.SugarLogger.Debugf("RefreshYilianyunToken RunMode:%s", beego.BConfig.RunMode)
-		if globals.IsProductEnv() {
-			if globals.IsMainProductEnv() { // 只有京西菜市刷新易联云key
-				if tokenInfo, err := api.YilianyunAPI.RetrieveToken(); err == nil {
-					return string(utils.MustMarshal(tokenInfo)), ""
-				} else {
-					globals.SugarLogger.Errorf("RefreshYilianyunToken RefreshToken failed with error:%v", err)
-				}
+		if globals.IsMainProductEnv() { // 只有京西菜市刷新易联云key
+			if tokenInfo, err := api.YilianyunAPI.RetrieveToken(); err == nil {
+				token = string(utils.MustMarshal(tokenInfo))
+			} else {
+				globals.SugarLogger.Errorf("RefreshYilianyunToken RefreshToken failed with error:%v", err)
+			}
+		} else {
+			if tokenInfo := getYLYTokenFromRemote(api.YilianyunAPI.GetToken()); tokenInfo != nil {
+				expireTimeStr = utils.Time2Str(time.Now().Add(-yilianyunTokenExpires))
+				token = tokenInfo.Token
 			}
 		}
-		return "", ""
+		return token, expireTimeStr
 	}, func(value string) {
+		token := value
 		var tokenInfo *yilianyunapi.TokenInfo
-		err := utils.UnmarshalUseNumber([]byte(value), &tokenInfo)
-		if err == nil {
-			api.YilianyunAPI.SetToken(tokenInfo.AccessToken)
+		if err := utils.TryUnmarshalUseNumber([]byte(value), &tokenInfo); err == nil {
+			token = tokenInfo.AccessToken
 		}
+		syseventhub.SysEventHub.OnNewYLYToken(token)
+		api.YilianyunAPI.SetToken(token)
 	})
 }

-func getWXTokenFromRemote(oldToken string) (tokenInfo *syseventhub.WXTokenInfo) {
-	if IsGetWXTokenFromRemote() {
-		for {
-			waitSecond := 5 * 60
-			globals.SugarLogger.Debugf("getWXTokenFromProd1")
-			response, err := http.Get(fmt.Sprintf("%s?accessKey=%s&oldToken=%s&waitSecond=%d", globals.GetWeixinTokenURL, globals.GetWeixinTokenKey, oldToken, waitSecond))
-			globals.SugarLogger.Debugf("getWXTokenFromProd2 error:%v", err)
-			if err == nil {
-				defer response.Body.Close()
-				if response.StatusCode == http.StatusOK {
-					data, err2 := ioutil.ReadAll(response.Body)
-					if err = err2; err == nil {
-						var result CallResult
-						if err = utils.UnmarshalUseNumber(data, &result); err == nil {
-							if result.Code == "0" {
-								if result.Data != "" {
-									if err = utils.UnmarshalUseNumber([]byte(result.Data), &tokenInfo); err == nil && tokenInfo != nil {
-										globals.SugarLogger.Debugf("getWXTokenFromProd:%s", utils.Format4Output(tokenInfo, false))
-										break
-									}
+func PollingRemotEvent(remoteURL string, waitSecond int, params map[string]interface{}) (tokenInfo *syseventhub.TokenInfo) {
+	if waitSecond == 0 {
+		waitSecond = 5 * 60
+	}
+	params2 := utils.MergeMaps(params, map[string]interface{}{
+		"accessKey":  globals.GetWeixinTokenKey,
+		"waitSecond": waitSecond,
+	})
+	for {
+		globals.SugarLogger.Debugf("PollingRemotEvent %s", remoteURL)
+		response, err := http.Get(utils.GenerateGetURL(remoteURL, "", params2))
+		globals.SugarLogger.Debugf("PollingRemotEvent2 %s error:%v", remoteURL, err)
+		if err == nil {
+			defer response.Body.Close()
+			if response.StatusCode == http.StatusOK {
+				data, err2 := ioutil.ReadAll(response.Body)
+				if err = err2; err == nil {
+					var result CallResult
+					if err = utils.UnmarshalUseNumber(data, &result); err == nil {
+						if result.Code == "0" {
+							if result.Data != "" {
+								if err = utils.UnmarshalUseNumber([]byte(result.Data), &tokenInfo); err == nil && tokenInfo != nil {
+									globals.SugarLogger.Debugf("PollingRemotEvent %s:%s", remoteURL, utils.Format4Output(tokenInfo, false))
+									break
 								}
-							} else {
-								err = fmt.Errorf("return code is:%s", result.Code)
 							}
+						} else {
+							err = fmt.Errorf("PollingRemotEvent %s return code is:%s", remoteURL, result.Code)
 						}
 					}
-				} else {
-					err = platformapi.ErrHTTPCodeIsNot200
 				}
+			} else {
+				err = platformapi.ErrHTTPCodeIsNot200
 			}
-			globals.SugarLogger.Infof("getWXTokenFromProd failed with error:%v", err)
-			if err != nil {
-				time.Sleep(errRefreshGap)
-			}
+		}
+		globals.SugarLogger.Infof("PollingRemotEvent %s failed with error:%v", remoteURL, err)
+		if err != nil {
+			time.Sleep(errRefreshGap)
 		}
 	}
 	return tokenInfo
 }

-func IsGetWXTokenFromRemote() bool {
-	return !globals.IsMainProductEnv() && globals.GetWeixinTokenKey != "" && globals.GetWeixinTokenURL != ""
+func getWXTokenFromRemote(oldToken string) (tokenInfo *syseventhub.TokenInfo) {
+	if !globals.IsMainProductEnv() && globals.GetWeixinTokenKey != "" && globals.GetWeixinTokenURL != "" {
+		tokenInfo = PollingRemotEvent(globals.GetWeixinTokenURL, 0, map[string]interface{}{
+			"oldToken": oldToken,
+		})
+	}
+	return tokenInfo
+}
+
+func getYLYTokenFromRemote(oldToken string) (tokenInfo *syseventhub.TokenInfo) {
+	if !globals.IsMainProductEnv() && globals.GetWeixinTokenKey != "" && globals.GetYLYTokenURL != "" {
+		tokenInfo = PollingRemotEvent(globals.GetYLYTokenURL, 0, map[string]interface{}{
+			"oldToken": oldToken,
+		})
+	}
+	return tokenInfo
+}
+
+func getWeimobTokenFromRemote(oldToken string) (tokenInfo *syseventhub.TokenInfo) {
+	if !globals.IsMainProductEnv() && globals.GetWeixinTokenKey != "" && globals.GetWeimobTokenURL != "" {
+		tokenInfo = PollingRemotEvent(globals.GetWeimobTokenURL, 0, map[string]interface{}{
+			"oldToken": oldToken,
+		})
+	}
+	return tokenInfo
 }
--- a/business/model/api.go
+++ b/business/model/api.go
@@ -36,6 +36,7 @@ type GoodsOrderExt struct {

 type OrderSkuExt struct {
 	OrderSku
+	NameID           int    `orm:"column(name_id)" json:"nameID"`
 	FullSkuName      string `json:"fullSkuName"`
 	Image            string `json:"image"`
 	RealEarningPrice int64  `json:"realEarningPrice"` // 实际单品结算给门店老板钱
--- a/business/model/dao/dao.go
+++ b/business/model/dao/dao.go
@@ -13,7 +13,7 @@ import (

 const (
 	useGetRowsWhenGetRow      = true
-	transactionWarningSeconds = 2 * 60 // 5分钟
+	transactionWarningSeconds = 10 * 60 // 5分钟
 )

 type DaoDB struct {
--- a/business/model/dao/report.go
+++ b/business/model/dao/report.go
@@ -0,0 +1,179 @@
+package dao
+
+import (
+	"time"
+
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/business/model"
+)
+
+type StatisticsForOrdersExists struct {
+	StoreID int `orm:"column(store_id)" json:"storeId"`
+}
+
+type StatisticsReportForOrdersList struct {
+	StatisticsForOrdersExists
+	StoreName              string  `json:"name"`                   //门店名
+	OrderCounts            int     `json:"orderCounts"`            //订单数
+	SalePrice              int     `json:"salePrice"`              //GMV（售卖价）
+	ActualPayPrice         int     `json:"actualPayPrice"`         //实付
+	ShopPrice              int     `json:"shopPrice"`              //京西
+	DiscountMoney          int     `json:"discountMoney"`          //优惠
+	DesiredFee             int     `json:"desiredFee"`             //配送费
+	DistanceFreightMoney   int     `json:"distanceFreightMoney"`   //远距离
+	WaybillTipMoney        int     `json:"waybillTipMoney"`        //小费
+	TotalShopMoney         int     `json:"totalShopMoney"`         //平台结算
+	PmSubsidyMoney         int     `json:"pmSubsidyMoney"`         //平台补贴
+	EarningPrice           int     `json:"earningPrice"`           //门店收益（预计收益）
+	TotalGrossProfit       int     `json:"totalGrossProfit"`       //总毛利
+	ComGrossProfit         float32 `json:"comGrossProfit"`         //公司毛利
+	CityManagerGrossProfit float32 `json:"cityManagerGrossProfit"` //城市经理毛利
+	MarketManName          string  `json:"marketManName"`          //市场负责人
+	OperatorName           string  `json:"operatorName"`           //运营负责人
+	OperatorName2          string  `json:"operatorName2"`
+}
+
+//查询统计订单信息
+func GetStatisticsReportForOrders(db *DaoDB, storeIDs []int, fromDate time.Time, toDate time.Time) (statisticsReportForOrdersList []*StatisticsReportForOrdersList, err error) {
+	sql := `
+	SELECT 	
+		c.id store_id,
+		c.name store_name,
+	  	s.order_counts,
+		s.sale_price,
+		s.actual_pay_price,
+		s.shop_price,
+		s.discount_money,
+		s.desired_fee,
+		s.distance_freight_money,
+		s.waybill_tip_money,
+		s.total_shop_money,
+		s.pm_subsidy_money,
+		s.earning_price,
+		s.total_gross_profit,
+		IF(c.jx_brand_fee_factor = 0 AND c.market_add_fee_factor = 0,total_gross_profit,(total_gross_profit*c.jx_brand_fee_factor)/(c.jx_brand_fee_factor+market_add_fee_factor)) com_gross_profit,
+		IF(c.jx_brand_fee_factor = 0 AND c.market_add_fee_factor = 0,0,(total_gross_profit*c.market_add_fee_factor)/(c.jx_brand_fee_factor+market_add_fee_factor)) city_manager_gross_profit,
+		IF(mm.name <> '', mm.name, mm.user_id2) market_man_name,
+		IF(om.name <> '', om.name, om.user_id2) operator_name,
+		IF(om2.name <> '', om2.name, om2.user_id2) operator_name2
+	FROM store c
+	LEFT JOIN user mm ON mm.mobile <> '' AND mm.mobile = c.market_man_phone 
+	LEFT JOIN user om ON om.mobile <> '' AND om.mobile = c.operator_phone 
+	LEFT JOIN user om2 ON om2.mobile <> '' AND om2.mobile = c.operator_phone2
+	LEFT JOIN
+		(
+		SELECT
+			a.store_id,
+			COUNT(*) order_counts,
+			SUM(sale_price) sale_price,
+			SUM(actual_pay_price) actual_pay_price,
+			SUM(shop_price) shop_price,
+			SUM(discount_money) discount_money,
+			SUM(desired_fee) desired_fee,
+			SUM(distance_freight_money) distance_freight_money,
+			SUM(IF(a.vendor_id = a.waybill_vendor_id,waybill_tip_money,0)) waybill_tip_money,
+			SUM(total_shop_money) total_shop_money,
+			SUM(pm_subsidy_money) pm_subsidy_money,
+			SUM(earning_price) earning_price,
+			SUM(total_shop_money-earning_price-desired_fee-distance_freight_money-waybill_tip_money-80) total_gross_profit
+		FROM goods_order a 
+		LEFT JOIN waybill b ON IF(a.waybill_vendor_id = -1,a.vendor_order_id,a.vendor_waybill_id) = b.vendor_waybill_id
+		WHERE a.status != ?
+	`
+	sqlParams := []interface{}{
+		model.OrderStatusCanceled, //排除已取消的订单
+	}
+	if !utils.IsTimeZero(fromDate) && !utils.IsTimeZero(toDate) {
+		sql += ` AND a.order_created_at BETWEEN ? AND ?`
+		sqlParams = append(sqlParams, fromDate, toDate)
+	}
+	if len(storeIDs) > 0 {
+		sql += ` AND a.store_id IN(` + GenQuestionMarks(len(storeIDs)) + `)`
+		sqlParams = append(sqlParams, storeIDs)
+	}
+	sql += `
+	GROUP BY a.store_id
+	)s
+	ON s.store_id = c.id
+	`
+	if len(storeIDs) > 0 {
+		sql += ` WHERE c.id IN (` + GenQuestionMarks(len(storeIDs)) + `)`
+		sqlParams = append(sqlParams, storeIDs)
+	}
+	if err = GetRows(db, &statisticsReportForOrdersList, sql, sqlParams...); err == nil {
+		return statisticsReportForOrdersList, nil
+	}
+	return nil, err
+}
+
+//查询统计售后单信息
+func GetGetStatisticsReportForAfsOrders(db *DaoDB, storeIDs []int, fromDate time.Time, toDate time.Time) (statisticsReportForOrdersList []*StatisticsReportForOrdersList, err error) {
+	sql := `
+	SELECT 	
+		c.id store_id,
+		c.name store_name,
+	  	s.order_counts,
+		s.sale_price,
+		s.actual_pay_price,
+		s.shop_price,
+		s.discount_money,
+		s.desired_fee,
+		s.distance_freight_money,
+		s.waybill_tip_money,
+		s.total_shop_money,
+		s.pm_subsidy_money,
+		s.earning_price,
+		s.total_gross_profit,
+		IF(c.jx_brand_fee_factor = 0 AND c.market_add_fee_factor = 0,total_gross_profit,(total_gross_profit*c.jx_brand_fee_factor)/(c.jx_brand_fee_factor+market_add_fee_factor)) com_gross_profit,
+		IF(c.jx_brand_fee_factor = 0 AND c.market_add_fee_factor = 0,0,(total_gross_profit*c.market_add_fee_factor)/(c.jx_brand_fee_factor+market_add_fee_factor)) city_manager_gross_profit,
+		IF(mm.name <> '', mm.name, mm.user_id2) market_man_name,
+		IF(om.name <> '', om.name, om.user_id2) operator_name,
+		IF(om2.name <> '', om2.name, om2.user_id2) operator_name2
+	FROM store c
+	LEFT JOIN user mm ON mm.mobile <> '' AND mm.mobile = c.market_man_phone 
+	LEFT JOIN user om ON om.mobile <> '' AND om.mobile = c.operator_phone 
+	LEFT JOIN user om2 ON om2.mobile <> '' AND om2.mobile = c.operator_phone2
+	LEFT JOIN
+		(
+		SELECT
+			a.store_id,
+			COUNT(*) order_counts,
+			SUM(sale_price) sale_price,
+			SUM(actual_pay_price) actual_pay_price,
+			SUM(shop_price) shop_price,
+			SUM(discount_money) discount_money,
+			SUM(afs_freight_money) desired_fee,
+			SUM(distance_freight_money) distance_freight_money,
+			SUM(IF(a.vendor_id = a.waybill_vendor_id,waybill_tip_money,0)) waybill_tip_money,
+			SUM(total_shop_money) total_shop_money,
+			SUM(b.pm_subsidy_money) pm_subsidy_money,
+			SUM(earning_price) earning_price,
+			SUM(total_shop_money-earning_price-afs_freight_money-distance_freight_money-waybill_tip_money-80) total_gross_profit
+		FROM goods_order a JOIN afs_order b ON a.vendor_order_id = b.vendor_order_id
+		WHERE a.status != ?
+	`
+	sqlParams := []interface{}{
+		model.OrderStatusCanceled, //排除已取消的订单
+	}
+	if !utils.IsTimeZero(fromDate) && !utils.IsTimeZero(toDate) {
+		sql += ` AND a.order_created_at BETWEEN ? AND ?`
+		sqlParams = append(sqlParams, fromDate, toDate)
+	}
+	if len(storeIDs) > 0 {
+		sql += ` AND a.store_id IN(` + GenQuestionMarks(len(storeIDs)) + `)`
+		sqlParams = append(sqlParams, storeIDs)
+	}
+	sql += `
+	GROUP BY a.store_id
+	)s
+	ON s.store_id = c.id
+	`
+	if len(storeIDs) > 0 {
+		sql += ` WHERE c.id IN (` + GenQuestionMarks(len(storeIDs)) + `)`
+		sqlParams = append(sqlParams, storeIDs)
+	}
+	if err = GetRows(db, &statisticsReportForOrdersList, sql, sqlParams...); err == nil {
+		return statisticsReportForOrdersList, nil
+	}
+	return nil, err
+}
--- a/business/model/dao/sku.go
+++ b/business/model/dao/sku.go
@@ -51,7 +51,7 @@ func DeleteSkuNamePlace(db *DaoDB, nameID int, placeCodes []int) (num int64, err

 func GetSkus(db *DaoDB, skuIDs, nameIDs, statuss, catIDs []int) (skuList []*model.SkuAndName, err error) {
 	sql := `
-	SELECT t1.*, t2.name, t2.unit
+	SELECT t1.*, t2.name, t2.unit, t2.prefix, t2.is_spu
 	FROM sku t1
 	JOIN sku_name t2 ON t2.id = t1.name_id AND t2.deleted_at = ?
 	`
--- a/business/model/dao/store.go
+++ b/business/model/dao/store.go
@@ -101,6 +101,10 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID string) (sto
 	if err = GetRow(db, storeDetail, sql, sqlParams...); err == nil {
 		storeDetail.PricePercentagePackObj = PricePercentagePack2Obj(storeDetail.PricePercentagePackStr)
 		storeDetail.FreightDeductionPackObj = FreightDeductionPack2Obj(storeDetail.FreightDeductionPackStr)
+		if vendorID == model.VendorIDJX {
+			storeDetail.VendorStatus = storeDetail.Status
+			storeDetail.PricePercentage = 100
+		}
 		return storeDetail, nil
 	}
 	return nil, err
@@ -114,16 +118,8 @@ func GetStoreDetailByVendorStoreID(db *DaoDB, vendorStoreID string, vendorID int
 	if vendorID != model.VendorIDJX {
 		return getStoreDetail(db, 0, vendorID, vendorStoreID)
 	}
-	store := &model.Store{}
-	store.ID = int(utils.Str2Int64WithDefault(vendorStoreID, 0))
-	if err = GetEntity(db, store); err == nil {
-		// todo 还要补全其它参数
-		storeDetail = &StoreDetail{
-			Store:           *store,
-			VendorStoreID:   vendorStoreID,
-			VendorStatus:    store.Status,
-			PricePercentage: 100,
-		}
+	if storeDetail, err = getStoreDetail(db, int(utils.Str2Int64WithDefault(vendorStoreID, 0)), vendorID, ""); err == nil {
+		storeDetail.VendorStoreID = vendorStoreID
 	}
 	return storeDetail, err
 }
--- a/business/model/dao/store_sku.go
+++ b/business/model/dao/store_sku.go
@@ -286,10 +286,11 @@ func GetStoreSkus2(db *DaoDB, vendorID, storeID int, skuIDs []int, mustDirty boo
 		sql += " AND t1.sku_id IN (" + GenQuestionMarks(len(skuIDs)) + ")"
 		sqlParams = append(sqlParams, skuIDs)
 	}
-	if !isSingleStorePF {
-		sql += " AND t2.%s_id <> 0"
-		fmtParams = append(fmtParams, fieldPrefix)
-	}
+	// 多门店平台没有成功创建的商品，不直接过滤，让上层同步时报错
+	// if !isSingleStorePF {
+	// 	sql += " AND t2.%s_id <> 0"
+	// 	fmtParams = append(fmtParams, fieldPrefix)
+	// }
 	sql = fmt.Sprintf(sql, fmtParams...)
 	sql += " ORDER BY t1.price"
 	// globals.SugarLogger.Debug(sql)
@@ -379,9 +380,9 @@ func SetStoreSkuSyncStatus(db *DaoDB, vendorID int, storeIDs []int, skuIDs []int
 		`
 		fmtParams = append(fmtParams, fieldPrefix)
 	}
-	sql += " WHERE (t1.deleted_at = ?)"
-	// fmtParams = append(fmtParams, fieldPrefix)
-	sqlParams = append(sqlParams, utils.DefaultTimeValue)
+	sql += " WHERE t1.deleted_at = ? AND t1.%s_sync_status & ? = 0"
+	fmtParams = append(fmtParams, fieldPrefix)
+	sqlParams = append(sqlParams, utils.DefaultTimeValue, model.SyncFlagDeletedMask)
 	if len(storeIDs) > 0 {
 		sql += " AND t1.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")"
 		sqlParams = append(sqlParams, storeIDs)
--- a/business/model/sku.go
+++ b/business/model/sku.go
@@ -236,8 +236,10 @@ type Sku struct {

 type SkuAndName struct {
 	Sku
-	Name string
-	Unit string
+	Name   string
+	Unit   string
+	Prefix string
+	IsSpu  int
 }

 // func (*Sku) TableUnique() [][]string {
--- a/business/model/store.go
+++ b/business/model/store.go
@@ -43,8 +43,9 @@ const (
 )

 const (
-	StoreChangePriceTypeDirect      = 0
-	StoreChangePriceTypeNeedApprove = 1
+	StoreChangePriceTypeDirect       = 0
+	StoreChangePriceTypeNeedApprove  = 1
+	StoreChangePriceTypeBossDisabled = 2
 )

 var (
--- a/business/partner/partner.go
+++ b/business/partner/partner.go
@@ -173,7 +173,6 @@ type IMultipleStoresHandler interface {
 	// RefreshAllSkusID(ctx *jxcontext.Context, parentTask tasksch.ITask, isAsync bool) (hint string, err error)

 	GetSkus(ctx *jxcontext.Context, skuID int, vendorSkuID, skuName string) (skuNameList []*SkuNameInfo, err error)
-	GetSkusForCheck(ctx *jxcontext.Context, skuID int, vendorSkuID, skuName string) (skuNameList []*SkuNameInfo, err error)
 }

 type ISingleStoreHandler interface {
@@ -266,6 +265,5 @@ func IsMultiStore(vendorID int) bool {
 	if _, ok := GetPurchasePlatformFromVendorID(vendorID).(IMultipleStoresHandler); ok {
 		return true
 	}
-
 	return false
 }
--- a/business/partner/purchase/ebai/store.go
+++ b/business/partner/purchase/ebai/store.go
@@ -80,7 +80,10 @@ func getCoordintate(data interface{}) float64 {
 }

 func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorStoreID string) (*dao.StoreDetail, error) {
-	baiduShopID := utils.Str2Int64(vendorStoreID)
+	baiduShopID := utils.Str2Int64WithDefault(vendorStoreID, 0)
+	if baiduShopID == 0 {
+		return nil, fmt.Errorf("饿百门店ID:%s非法，应该是一个整数", vendorStoreID)
+	}
 	result, err := api.EbaiAPI.ShopGet("", baiduShopID)
 	if err == nil {
 		// globals.SugarLogger.Debug(utils.Format4Output(result, false))
--- a/business/partner/purchase/jd/sku.go
+++ b/business/partner/purchase/jd/sku.go
@@ -604,35 +604,6 @@ func (p *PurchaseHandler) GetVendorCategories(ctx *jxcontext.Context) (vendorCat
 	return vendorCats, err
 }

-//为对比差异另创建了一个查询京东库的的方法，此方法不用查询图片路径，并且过滤掉了京东库上已下架的商品
-func (p *PurchaseHandler) GetSkusForCheck(ctx *jxcontext.Context, skuID int, vendorSkuID, skuName string) (skuNameList []*partner.SkuNameInfo, err error) {
-	param := &jdapi.QuerySkuParam{
-		SkuID:       utils.Str2Int64WithDefault(vendorSkuID, 0),
-		SkuName:     skuName,
-		IsFilterDel: jdapi.IsFilterDelTrue,
-		PageNo:      1,
-		PageSize:    jdapi.MaxSkuIDsCount4QueryListBySkuIds,
-	}
-	for {
-		skuList, _, err2 := getAPI("").QuerySkuInfos(param)
-		if err = err2; err != nil {
-			return nil, err
-		}
-		if len(skuList) > 0 {
-			for _, v := range skuList {
-				if v.FixedStatus != jdapi.SkuFixedStatusOffline {
-					skuNameList = append(skuNameList, vendorSku2Jx(v))
-				}
-			}
-		}
-		if len(skuList) < param.PageSize {
-			break
-		}
-		param.PageNo++
-	}
-	return skuNameList, err
-}
-
 func (p *PurchaseHandler) GetSkus(ctx *jxcontext.Context, skuID int, vendorSkuID, skuName string) (skuNameList []*partner.SkuNameInfo, err error) {
 	param := &jdapi.QuerySkuParam{
 		SkuID:       utils.Str2Int64WithDefault(vendorSkuID, 0),
--- a/business/partner/purchase/jd/store_sku2.go
+++ b/business/partner/purchase/jd/store_sku2.go
@@ -52,7 +52,9 @@ func (p *PurchaseHandler) getStoreSkusBareInfoLimitSize(ctx *jxcontext.Context,
 				sku := storeSkuMap[utils.Int64ToStr(v.SkuID)]
 				sku.Status = jdStoreSkuStatus2Jx(v.Vendibility)
 				sku.Stock = v.UsableQty
-				outStoreSkuList = append(outStoreSkuList, sku)
+				if sku.Stock > 0 {
+					outStoreSkuList = append(outStoreSkuList, sku)
+				}
 			}
 			for _, v := range priceInfo {
 				sku := storeSkuMap[utils.Int64ToStr(v.SkuID)]
--- a/business/partner/purchase/mtwm/act.go
+++ b/business/partner/purchase/mtwm/act.go
@@ -46,8 +46,8 @@ func storeSku2ActData(act *model.Act2, actStoreSku []*model.ActStoreSku2, handle
 				SettingType: mtwmapi.SettingTypeAsPrice,
 				ActPrice:    jxutils.IntPrice2Standard(v.ActualActPrice),
 				// DiscountCoefficient: 0,
-				Sequence: int(v.ActPrice),
-				ItemID:   utils.Str2Int64WithDefault(v.VendorActID, 0),
+				// Sequence: int(v.ActPrice), // 此字段不允许重复
+				ItemID: utils.Str2Int64WithDefault(v.VendorActID, 0),
 			})
 		}
 	}
--- a/business/partner/purchase/mtwm/order.go
+++ b/business/partner/purchase/mtwm/order.go
@@ -3,6 +3,7 @@ package mtwm
 import (
 	"errors"
 	"fmt"
+	"math"
 	"net/url"
 	"regexp"
 	"strings"
@@ -571,19 +572,29 @@ func (c *PurchaseHandler) ListOrders(ctx *jxcontext.Context, parentTask tasksch.
 			vendorStoreID := batchItemList[0].(string)
 			var orderIDs []string
 			seqStart := 1
+			i := 0
 			for {
-				seqEnd := seqStart + mtwmapi.MaxGap4GetOrderIdByDaySeq - 1
-				tmpOrderIDs, err2 := api.MtwmAPI.GetOrderIdByDaySeq(vendorStoreID, queryDate, seqStart, seqEnd)
+				batchSize := int(math.Min(math.Pow(2, float64(i*3)), float64(mtwmapi.MaxGap4GetOrderIdByDaySeq)))
+				seqEnd := seqStart + batchSize - 1
+				var tmpOrderIDs []int64
+				if seqStart == seqEnd {
+					if vendorOderID, err2 := api.MtwmAPI.GetOrderIdByDaySeqSingle(vendorStoreID, queryDate, seqStart); err2 == nil {
+						tmpOrderIDs = []int64{vendorOderID}
+					}
+				} else {
+					tmpOrderIDs, err = api.MtwmAPI.GetOrderIdByDaySeq(vendorStoreID, queryDate, seqStart, seqEnd)
+				}
 				if len(tmpOrderIDs) > 0 {
 					for _, v := range tmpOrderIDs {
 						orderIDs = append(orderIDs, utils.Int64ToStr(v))
 					}
 				}
-				if err = err2; err != nil || len(tmpOrderIDs) == 0 {
+				if err != nil || len(tmpOrderIDs) < batchSize {
 					err = nil
 					break
 				}
 				seqStart = seqEnd + 1
+				i++
 			}
 			retVal = orderIDs
 			return retVal, nil
@@ -609,7 +620,7 @@ func (c *PurchaseHandler) ListOrders(ctx *jxcontext.Context, parentTask tasksch.
 func (p *PurchaseHandler) GetOrderConsigneeNumber(ctx *jxcontext.Context, storeID int, vendorStoreID string) (numberList []*partner.OrderPhoneNumberInfo, err error) {
 	offset := 0
 	for {
-		result, err2 := api.MtwmAPI.OrderBatchPullPhoneNumber(vendorStoreID, 0, mtwmapi.MaxBatchPullPhoneNumberLimit)
+		result, err2 := api.MtwmAPI.OrderBatchPullPhoneNumber(vendorStoreID, offset, mtwmapi.MaxBatchPullPhoneNumberLimit)
 		if err = err2; err == nil {
 			for _, v := range result {
 				v2 := &partner.OrderPhoneNumberInfo{
@@ -635,7 +646,7 @@ func (p *PurchaseHandler) GetOrderConsigneeNumber(ctx *jxcontext.Context, storeI
 func (p *PurchaseHandler) GetOrderCourierNumber(ctx *jxcontext.Context, storeID int, vendorStoreID string) (numberList []*partner.OrderPhoneNumberInfo, err error) {
 	offset := 0
 	for {
-		result, err2 := api.MtwmAPI.OrderGetRiderInfoPhoneNumber(vendorStoreID, 0, mtwmapi.MaxBatchPullPhoneNumberLimit)
+		result, err2 := api.MtwmAPI.OrderGetRiderInfoPhoneNumber(vendorStoreID, offset, mtwmapi.MaxBatchPullPhoneNumberLimit)
 		if err = err2; err == nil {
 			for _, v := range result {
 				numberList = append(numberList, &partner.OrderPhoneNumberInfo{
--- a/business/partner/purchase/mtwm/store_sku2.go
+++ b/business/partner/purchase/mtwm/store_sku2.go
@@ -37,8 +37,10 @@ func (p *PurchaseHandler) GetStoreSkusBatchSize(funcID int) (batchSize int) {
 		batchSize = mtwmapi.MaxStoreSkuBatchSize
 	case partner.FuncDeleteStoreSkus:
 		batchSize = 1 // 可考虑用批量操作
-	case partner.FuncCreateStoreSkus, partner.FuncUpdateStoreSkus:
+	case partner.FuncCreateStoreSkus:
 		batchSize = 1 // 可考虑用批量操作
+	case partner.FuncUpdateStoreSkus:
+		batchSize = mtwmapi.MaxStoreSkuBatchSize
 	case partner.FuncGetStoreSkusFullInfo:
 		batchSize = 1
 	}
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -118,7 +118,8 @@ weixinToken = "17_roSCZgkCxhRnyFVtei0KdfHwdGP8PmLzJFhCieka4_X4_d-lgfaTxF6oIS6FE5

 dbConnectStr = "root:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true"

-getWeixinTokenURL = "http://beta.jxc4.com/v2/sys/GetWXToken"
+getWeixinTokenURL = "http://www.jxc4.com/v2/sys/GetWXToken"
+getYLYTokenURL = "http://www.jxc4.com/v2/sys/GetYLYToken"

 [prod]
 EnableDocs = false
@@ -155,6 +156,7 @@ enableEbaiStoreWrite = true
 enableMtwmStoreWrite = true
 enableWscStoreWrite = true

+disableWeimob = false
 weimobCallbackURL = "http://callback.jxc4.com/weimob"

 dingdingAgentID = 239461075
@@ -214,6 +216,8 @@ dingdingQRCodeSecret = "N9dyC9qB84sauQPs4_JYrILMsG5Krqm9-PSSVJ8t9hb87rrHiFUirISx
 dingdingCallbackURL = "http://callback-jxgy.jxc4.com/dingding/msg"

 getWeixinTokenURL = "http://www.jxc4.com/v2/sys/GetWXToken"
+getYLYTokenURL = "http://www.jxc4.com/v2/sys/GetYLYToken"
+
 storeName = "京西果园"

 [test]
@@ -306,6 +310,8 @@ weixinSecret = "6bbbed1443cc062c20a015a64c07a531"
 weixinMiniAppID2  = "wx4b5930c13f8b1170"
 weixinMiniSecret2 = "2a57228a716ce991a52739f0ff41111d"

+disableWeimob = false
 getWeixinTokenURL = "http://www.jxc4.com/v2/sys/GetWXToken"
+getWeimobTokenURL = "http://www.jxc4.com/v2/sys/GetWeimobToken"

 dbConnectStr = "root:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true"
--- a/controllers/cms.go
+++ b/controllers/cms.go
@@ -223,7 +223,7 @@ func (c *CmsController) FakeNewOrder() {
 // @Title 发送消息给相关人员
 // @Description 发送消息给相关人员
 // @Param	mobile			formData	string	true	"手机号"
-// @Param	verifyCode		formData	string	true	"验证码"
+// @Param	verifyCode		formData	string	false	"验证码"
 // @Param	msgType			formData	string	true	"消息类型"
 // @Param	msgContent		formData	string	true	"消息内容"
 // @Success 200 {object} controllers.CallResult
--- a/controllers/cms_sync.go
+++ b/controllers/cms_sync.go
@@ -115,7 +115,7 @@ func (c *SyncController) FullSyncStoresSkus() {
 		if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.VendorIDs, &vendorIDs); err != nil {
 			return retVal, "", err
 		}
-		retVal, err = cms.CurVendorSync.FullSyncStoresSkus(params.Ctx, db, vendorIDs, storeIDs, params.IsAsync, params.IsContinueWhenError)
+		retVal, err = cms.CurVendorSync.FullSyncStoresSkus(params.Ctx, db, vendorIDs, storeIDs, true, params.IsAsync, params.IsContinueWhenError)
 		return retVal, "", err
 	})
 }
--- a/controllers/jx_order.go
+++ b/controllers/jx_order.go
@@ -283,7 +283,7 @@ func (c *OrderController) ExportMTWaybills() {
 // @Param	pageSize		query	int		false	"结果页大小（缺省为50，-1表示全部）"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
-// @router /GetOrders [get]
+// @router /GetOrders [get,post]
 func (c *OrderController) GetOrders() {
 	c.callGetOrders(func(params *tOrderGetOrdersParams) (retVal interface{}, errCode string, err error) {
 		var skuIDs []int
@@ -335,7 +335,7 @@ func (c *OrderController) ExportOrders() {
 // @Param	pageSize		query	int		false	"结果页大小（缺省为50，-1表示全部）"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
-// @router /GetAfsOrders [get]
+// @router /GetAfsOrders [get,post]
 func (c *OrderController) GetAfsOrders() {
 	c.callGetAfsOrders(func(params *tOrderGetAfsOrdersParams) (retVal interface{}, errCode string, err error) {
 		timeList, err := jxutils.BatchStr2Time(params.FromTime, params.ToTime)
--- a/controllers/jx_report.go
+++ b/controllers/jx_report.go
@@ -0,0 +1,50 @@
+package controllers
+
+import (
+	"git.rosy.net.cn/jx-callback/business/jxstore/report"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
+	"github.com/astaxie/beego"
+)
+
+// 统计相关API
+type ReportController struct {
+	beego.Controller
+}
+
+// @Title 查询订单统计信息
+// @Description 根据门店idlist和时间范围查询
+// @Param	token			header		string	true	"认证token"
+// @Param	storeIDs		formData	string	true	"京西门店ID列表[1,2,3]"
+// @Param	fromDate		formData	string	true	"开始日期（包含），格式（2006-01-02 00:00:00)"
+// @Param	toDate			formData	string	true	"结束日期（包含），格式（2006-01-02 00:00:00)"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /StatisticsReportForOrders [post]
+func (c *ReportController) StatisticsReportForOrders() {
+	c.callStatisticsReportForOrders(func(params *tReportStatisticsReportForOrdersParams) (retVal interface{}, errCode string, err error) {
+		var storeIDList []int
+		if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDList); err == nil {
+			retVal, err = report.GetStatisticsReportForOrders(params.Ctx, storeIDList, params.FromDate, params.ToDate)
+		}
+		return retVal, "", err
+	})
+}
+
+// @Title 查询售后单统计信息
+// @Description 根据门店idlist和时间范围查询
+// @Param	token			header		string	true	"认证token"
+// @Param	storeIDs		formData	string	true	"京西门店ID列表[1,2,3]"
+// @Param	fromDate		formData	string	true	"开始日期（包含），格式（2006-01-02 00:00:00)"
+// @Param	toDate			formData	string	true	"结束日期（包含），格式（2006-01-02 00:00:00)"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /StatisticsReportForAfsOrders [post]
+func (c *ReportController) StatisticsReportForAfsOrders() {
+	c.callStatisticsReportForAfsOrders(func(params *tReportStatisticsReportForAfsOrdersParams) (retVal interface{}, errCode string, err error) {
+		var storeIDList []int
+		if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDList); err == nil {
+			retVal, err = report.GetStatisticsReportForAfsOrders(params.Ctx, storeIDList, params.FromDate, params.ToDate)
+		}
+		return retVal, "", err
+	})
+}
--- a/controllers/sys.go
+++ b/controllers/sys.go
@@ -20,8 +20,8 @@ type SysController struct {
 	beego.Controller
 }

-// @Title 得到京西门店信息
-// @Description 得到京西门店信息，如下条件之间是与的关系
+// @Title 得到微信token
+// @Description 得到微信token
 // @Param	accessKey			query		string	true	"假token"
 // @Param	oldToken			query		string	false	"之前的token"
 // @Param	waitSecond			query		int		false	"等待秒数"
@@ -37,6 +37,40 @@ func (c *SysController) GetWXToken() {
 	})
 }

+// @Title 得到易联云token
+// @Description 得到易联云token
+// @Param	accessKey			query		string	true	"假token"
+// @Param	oldToken			query		string	false	"之前的token"
+// @Param	waitSecond			query		int		false	"等待秒数"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetYLYToken [get]
+func (c *SysController) GetYLYToken() {
+	c.callGetYLYToken(func(params *tSysGetYLYTokenParams) (retVal interface{}, errCode string, err error) {
+		if params.AccessKey == globals.GetWeixinTokenKey {
+			retVal = syseventhub.SysEventHub.GetYLYToken(params.OldToken, time.Duration(params.WaitSecond)*time.Second)
+		}
+		return retVal, "", err
+	})
+}
+
+// @Title 得到微盟token
+// @Description 得到微盟token
+// @Param	accessKey			query		string	true	"假token"
+// @Param	oldToken			query		string	false	"之前的token"
+// @Param	waitSecond			query		int		false	"等待秒数"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /GetWeimobToken [get]
+func (c *SysController) GetWeimobToken() {
+	c.callGetWeimobToken(func(params *tSysGetWeimobTokenParams) (retVal interface{}, errCode string, err error) {
+		if params.AccessKey == globals.GetWeixinTokenKey {
+			retVal = syseventhub.SysEventHub.GetWeimobToken(params.OldToken, time.Duration(params.WaitSecond)*time.Second)
+		}
+		return retVal, "", err
+	})
+}
+
 // @Title 得到饿百RTF转换内容
 // @Description 得到饿百RTF转换内容
 // @Param	imgListStr		query	string	true	"逗号分隔的图片列表可以是转义后的"
--- a/controllers/weimob_callback.go
+++ b/controllers/weimob_callback.go
@@ -2,6 +2,7 @@ package controllers

 import (
 	"git.rosy.net.cn/baseapi/platformapi/weimobapi"
+	"git.rosy.net.cn/jx-callback/business/cs"
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasks"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
@@ -14,11 +15,14 @@ type WeimobController struct {

 func (c *WeimobController) onCallbackMsg() {
 	if true { //c.Ctx.Input.Method() == http.MethodPost {
-		callbackResponse := weimobapi.SuccessResponse
-		// msg, callbackResponse := api.WeimobAPI.GetCallbackMsg(c.Ctx.Input.RequestBody)
-		// if callbackResponse == nil {
-		// 	callbackResponse = wsc.OnCallbackMsg(msg)
-		// }
+		msg, callbackResponse := api.WeimobAPI.GetCallbackMsg(c.Ctx.Input.RequestBody)
+		if callbackResponse == nil {
+			// callbackResponse = wsc.OnCallbackMsg(msg)
+			callbackResponse = cs.OnCallbackMsg(msg)
+		}
+		if callbackResponse == nil {
+			callbackResponse = weimobapi.SuccessResponse
+		}
 		c.Data["json"] = callbackResponse
 		c.ServeJSON()
 	} else {
--- a/controllers/wxpay_callback.go
+++ b/controllers/wxpay_callback.go
@@ -0,0 +1,26 @@
+package controllers
+
+import (
+	"net/http"
+
+	"git.rosy.net.cn/baseapi/platformapi/wxpay"
+	"github.com/astaxie/beego"
+)
+
+type WXPayController struct {
+	beego.Controller
+}
+
+func (c *WXPayController) Msg() {
+	if c.Ctx.Input.Method() == http.MethodPost {
+		var callbackResponse *wxpay.CallbackResponse
+
+		if callbackResponse == nil {
+			callbackResponse = wxpay.SuccessResponse
+		}
+		c.Data["xml"] = callbackResponse
+		c.ServeXML()
+	} else {
+		c.Abort("404")
+	}
+}
--- a/globals/globals.go
+++ b/globals/globals.go
@@ -40,6 +40,8 @@ var (

 	GetWeixinTokenURL string
 	GetWeixinTokenKey string
+	GetYLYTokenURL    string
+	GetWeimobTokenURL string

 	StoreName string

@@ -82,6 +84,8 @@ func Init() {
 	WxBackstageHost = beego.AppConfig.DefaultString("wxBackstageHost", "")

 	GetWeixinTokenURL = beego.AppConfig.DefaultString("getWeixinTokenURL", "")
+	GetYLYTokenURL = beego.AppConfig.DefaultString("getYLYTokenURL", "")
+	GetWeimobTokenURL = beego.AppConfig.DefaultString("getWeimobTokenURL", "")
 	GetWeixinTokenKey = beego.AppConfig.DefaultString("getWeixinTokenKey", "")

 	StoreName = beego.AppConfig.DefaultString("storeName", "京西菜市")
--- a/main.go
+++ b/main.go
@@ -118,14 +118,10 @@ func main() {
 			globals.SugarLogger.Errorf("RefreshWeixinToken failed with error:%s", err)
 			return
 		}
-		// if err := tasks.RefreshElmToken(); err != nil {
-		// 	globals.SugarLogger.Errorf("RefreshElmToken failed with error:%s", err)
-		// 	return
-		// }
-		// if err := tasks.RefreshWeimobToken(); err != nil {
-		// 	globals.SugarLogger.Errorf("RefreshWeimobToken failed with error:%s", err)
-		// 	return
-		// }
+		if err := tasks.RefreshWeimobToken(); err != nil {
+			globals.SugarLogger.Errorf("RefreshWeimobToken failed with error:%s", err)
+			return
+		}
 		if err := tasks.RefreshYilianyunToken(); err != nil {
 			globals.SugarLogger.Errorf("RefreshYilianyunToken failed with error:%s", err)
 			return
--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
@@ -796,7 +796,7 @@ func init() {
        beego.ControllerComments{
            Method: "GetAfsOrders",
            Router: `/GetAfsOrders`,
-            AllowHTTPMethods: []string{"get"},
+            AllowHTTPMethods: []string{"get","post"},
            MethodParams: param.Make(),
            Filters: nil,
            Params: nil})
@@ -841,7 +841,7 @@ func init() {
        beego.ControllerComments{
            Method: "GetOrders",
            Router: `/GetOrders`,
-            AllowHTTPMethods: []string{"get"},
+            AllowHTTPMethods: []string{"get","post"},
            MethodParams: param.Make(),
            Filters: nil,
            Params: nil})
@@ -972,6 +972,24 @@ 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: "StatisticsReportForAfsOrders",
+            Router: `/StatisticsReportForAfsOrders`,
+            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: "StatisticsReportForOrders",
+            Router: `/StatisticsReportForOrders`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SkuController"],
        beego.ControllerComments{
            Method: "AddCategory",
@@ -1647,6 +1665,24 @@ func init() {
            Filters: nil,
            Params: nil})

+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SysController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SysController"],
+        beego.ControllerComments{
+            Method: "GetWeimobToken",
+            Router: `/GetWeimobToken`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SysController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:SysController"],
+        beego.ControllerComments{
+            Method: "GetYLYToken",
+            Router: `/GetYLYToken`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
    beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TaskController"] = append(beego.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:TaskController"],
        beego.ControllerComments{
            Method: "CancelTask",
--- a/routers/router.go
+++ b/routers/router.go
@@ -121,6 +121,11 @@ func init() {
 				&controllers.FoodRecipeController{},
 			),
 		),
+		beego.NSNamespace("/report",
+			beego.NSInclude(
+				&controllers.ReportController{},
+			),
+		),
 	)
 	beego.AddNamespace(ns)

@@ -133,6 +138,7 @@ func init() {
 	beego.AutoRouter(&controllers.WeimobController{})
 	beego.AutoRouter(&controllers.WeixinController{})
 	beego.AutoRouter(&controllers.DingDingController{})
+	beego.AutoRouter(&controllers.WXPayController{})

 	// 如下都是用于检测存活的空接口
 	beego.Any("/", func(ctx *beecontext.Context) {