1

business/jxstore/act/act.go

@@ -2035,12 +2035,18 @@ func RrefreshMtwmVendorAct(ctx *jxcontext.Context) (err error) {
 				}
 				// 查询门店爆款商品,当门店存在爆款时,取消之前的力荐商品,将新的爆款设置为力荐商品
 				//if k == mtwmapi.RetailActTypeSecKill && len(actList) > 0 {
-				//	allActivityList := make([]string, 0, 0)        // 此门店全部的折扣(爆款)活动商品
+				//	allActivitySkuIdList := make([]string, 0, 0)        // 此门店全部的折扣(爆款)活动商品
-				//	activationActivityList := make([]string, 0, 0) // 此门店全部的折扣(爆款)活动商品
+				//	activationActivitySkuIdList := make([]string, 0, 0) // 此门店全部的折扣(爆款)活动商品
+				//	loseActivitySkuIdList := make([]string, 0, 0)       // 此门店全部的折扣(爆款)活动商品
 				//	for _, ac := range actList {
-				//		allActivityList = append(allActivityList, utils.Int64ToStr(ac.ItemID))
+				//		allActivitySkuIdList = append(allActivitySkuIdList, utils.Int64ToStr(ac.ItemID))
-				//		if ac.Status == 1 {
+				//		// 已经生效的爆款活动
-				//			activationActivityList = append(activationActivityList, utils.Int64ToStr(ac.ItemID))
+				//		if ac.Status == 1 && ac.SkuId != "" {
+				//			activationActivitySkuIdList = append(activationActivitySkuIdList, utils.Int64ToStr(ac.ItemID))
+				//		}
+				//		// 已经失效的爆款活动
+				//		if ac.Status == 0 && ac.SkuId != "" {
+				//			loseActivitySkuIdList = append(loseActivitySkuIdList, ac.SkuId)
 				//		}
 				//	}
 				//	// 取消当前力荐商品

business/jxstore/cms/sku.go

@@ -1262,12 +1262,20 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n
 			if payload["mtwmCategoryID"] != nil {
 				mtwmCategoryID = payload["mtwmCategoryID"].(string)
 			}
-			if payload["categoryID2"] != nil {
+			if payload["categoryID2"] != nil && !utils.IsNil(payload["categoryID2"]) {
 				jxCategoryIDNumber, err := payload["categoryID2"].(json.Number).Int64()
 				if err != nil {
 					return false
 				}
 				jxCategoryID = int(jxCategoryIDNumber)
+			} else if payload["categoryID"] != nil && !utils.IsNil(payload["categoryID"]) {
+				jxCategoryIDNumber, err := payload["categoryID"].(json.Number).Int64()
+				if err != nil {
+					return false
+				}
+				jxCategoryID = int(jxCategoryIDNumber)
+			} else {
+				jxCategoryID = 0
 			}
 
 			if jdCategoryId != "" {

business/jxstore/cms/store.go

@@ -1762,6 +1762,7 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
 					panic(r)
 				}
 			}()
+
 			if isStoreMapNeedSync(vendorID, valid) { // 对于store vendor map，只有Status改变才需要同步到厂商
 				num, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, storeMap, valid, userName, map[string]interface{}{
 					model.FieldStoreID:  storeID,

globals/api/api.go

@@ -268,6 +268,7 @@ func Init() {
 	if WeixinMiniAppID3 = beego.AppConfig.DefaultString("weixinMiniAppID3", ""); WeixinMiniAppID3 != "" {
 		WeixinApp = weixinapi.New(WeixinMiniAppID3, beego.AppConfig.DefaultString("weixinMiniSecret3", ""))
 	}
+
 	WeixinApp2 = weixinapi.New("wxf3657c94aa01a3f0", "ce2b9c4cf991d72a09f67bab4d359015") // 暂时写死的
 
 	if WeixinMiniAppIDsc = beego.AppConfig.DefaultString("weixinMiniAppIDsc", ""); WeixinMiniAppIDsc != "" {