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

business/jxstore/act/act.go

@@ -144,6 +144,7 @@ func ActStoreSkuParam2Model(ctx *jxcontext.Context, db *dao.DaoDB, act *model.Ac
 						}
 						if act.Type == model.ActSkuFake {
 							actSkuMap.ActualActPrice = 0
+							actSkuMap.SyncStatus = 0
 						} else {
 							if v.ActPrice != 0 {
 								actSkuMap.ActualActPrice = v.ActPrice
@@ -410,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)
 	}

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 {
+	if needConfirmRequestMap[msgType] == 1 {
-		return err
+		if _, err = mobile.AutherObj.VerifySecret(mobileNum, verifyCode); err != nil {
+			return err
+		}
 	}
 	db := dao.GetDB()
 	for _, v := range receiveMsgUsersMap[msgType] {
@@ -337,13 +348,20 @@ func UpdateConfig(ctx *jxcontext.Context, key, configType, value string) (hint s
 			return "", err
 		}
 		dao.Commit(db)
+		vendorStoreMap := make(map[int][]int)
 		for _, v := range storeMapList {
-			if _, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, &model.StoreSkuBind{}, nil, ctx.GetUserName(), map[string]interface{}{
+			vendorStoreMap[v.VendorID] = append(vendorStoreMap[v.VendorID], v.StoreID)
-				model.FieldStoreID: v.StoreID,
-			}, dao.GetSyncStatusStructField(model.VendorNames[v.VendorID]), model.SyncFlagPriceMask); err != nil {
-				return "", err
-			}
 		}
+		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, "")

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 payload["name"] != nil {
-	if hasSensitiveWord, err := CheckHasSensitiveWord(newSkuName); hasSensitiveWord {
+		newSkuName := utils.TrimBlankChar(utils.Interface2String(payload["name"]))
-		return 0, err
+		if hasSensitiveWord, err := CheckHasSensitiveWord(newSkuName); hasSensitiveWord {
+			return 0, err
+		}
+		payload["name"] = newSkuName
 	}
 
 	delete(payload, "isSpu")

business/model/dao/store_sku.go

@@ -380,9 +380,9 @@ func SetStoreSkuSyncStatus(db *DaoDB, vendorID int, storeIDs []int, skuIDs []int
 		`
 		fmtParams = append(fmtParams, fieldPrefix)
 	}
-	sql += " WHERE (t1.deleted_at = ?)"
+	sql += " WHERE t1.deleted_at = ? AND t1.%s_sync_status & ? = 0"
-	// fmtParams = append(fmtParams, fieldPrefix)
+	fmtParams = append(fmtParams, fieldPrefix)
-	sqlParams = append(sqlParams, utils.DefaultTimeValue)
+	sqlParams = append(sqlParams, utils.DefaultTimeValue, model.SyncFlagDeletedMask)
 	if len(storeIDs) > 0 {
 		sql += " AND t1.store_id IN (" + GenQuestionMarks(len(storeIDs)) + ")"
 		sqlParams = append(sqlParams, storeIDs)

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