客户建议发送内容修改

business/jxstore/cms/cms.go

@@ -57,9 +57,9 @@ var (
 			// "周扬",
 		},
 		SendMsgTypeSuggestRequest: []string{
-			"石锋",
+			// "石锋",
 			// "x",
-			// "周扬",
+			"周扬",
 		},
 	}
 	needConfirmRequestMap = map[string]int{
@@ -237,9 +237,9 @@ func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, ms
 		vendorOrderID string
 	)
 	sql := `
-		SELECT * FROM store WHERE tel1 = ? OR tel2 = ? 
+		SELECT * FROM store WHERE (tel1 = ? OR tel2 = ?) AND deleted_at = ?
 	`
-	sqlParams := []interface{}{mobileNum}
+	sqlParams := []interface{}{mobileNum, utils.DefaultTimeValue}
 	err = dao.GetRows(db, &stores, sql, sqlParams)
 	if len(stores) > 0 {
 		storeName = stores[0].Name
@@ -256,7 +256,7 @@ func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, ms
 			if len(authBinds) > 0 {
 				user, _ := dao.GetUserByID(db, "user_id", authBinds[0].UserID)
 				mobileNum = *user.Mobile
-				sqlParams4 := []interface{}{mobileNum}
+				sqlParams4 := []interface{}{mobileNum, utils.DefaultTimeValue}
 				err = dao.GetRows(db, &stores, sql, sqlParams4)
 				if len(stores) > 0 {
 					storeName = stores[0].Name
@@ -277,6 +277,9 @@ func SendMsg2Somebody(ctx *jxcontext.Context, mobileNum, verifyCode, msgType, ms
 	if order != nil {
 		vendorOrderID = order.VendorOrderID
 	}
+	if storeID == 0 {
+		vendorOrderID = ""
+	}
 	msgContent = msgContent + " 门店名称：" + storeName + " 门店ID：" + utils.Int2Str(storeID) + " 最新订单号：" + vendorOrderID
 	for _, v := range receiveMsgUsersMap[msgType] {
 		user, err2 := dao.GetUserByID(db, "name", v)