科创券优化

example/app/wechath5.go

@@ -39,6 +39,44 @@ var Wechath5 = Ctr{
 		}
 
 		userId := 0
+
+		//这个defer放到上面，防止出现用户第一次登陆的时候出现不返回company和salesman的情况
+		//如果有则直接返回用户信息到微信小程序里
+		defer func() {
+			if userId != 0 {
+				user := that.Db.Get("user", "*", Map{"id": userId})
+				if user == nil {
+					that.Display(4, "获取个人信息失败")
+					return
+				}
+				delete(user, "password")
+				company := that.Db.Get("company", "id,name", Map{"id": user.GetCeilInt("company_id")})
+
+				//消除company没有创建的影响
+				if company == nil {
+					companyId := that.Db.Insert("company", Map{
+						"user_id":        user["id"],
+						"provider_id":    user["provider_id"],
+						"salesman_id":    user["salesman_id"],
+						"create_time[#]": "now()",
+						"modify_time[#]": "now()",
+						"del_flag":       0,
+					})
+					user["company_id"] = companyId
+					that.Db.Update("user", Map{"company_id": companyId}, Map{"id": user.GetCeilInt("id")})
+					company = that.Db.Get("company", "*", Map{"id": user.GetCeilInt("company_id")})
+				}
+				salesman := that.Db.Get("salesman", "id,name", Map{"id": user.GetCeilInt("salesman_id")})
+				provider := that.Db.Get("provider", "id,name", Map{"id": user.GetCeilInt("provider_id")})
+
+				user["company"] = company
+				user["salesman"] = salesman
+				user["provider"] = provider
+
+				that.Display(0, user)
+			}
+		}()
+
 		defer func() {
 
 			//有sn就关联业务员
@@ -72,7 +110,7 @@ var Wechath5 = Ctr{
 				"coupon_id":               1,
 				"code_no":                 "SN" + time.Now().Format("20060102150405") + getSn(),
 				"effective_start_time[#]": "NOW()",
-				"effective_end_time":      "2022-10-01 23:59:59",
+				"effective_end_time":      time.Now().AddDate(0, 6, 0).Format("2006-01-02 15:04:05"),
 				"source_type":             3,
 				"status":                  0,
 				"admin_id":                user.GetCeilInt("admin_id"),
@@ -122,42 +160,6 @@ var Wechath5 = Ctr{
 
 		}()
 
-		//如果有则直接返回用户信息到微信小程序里
-		defer func() {
-			if userId != 0 {
-				user := that.Db.Get("user", "*", Map{"id": userId})
-				if user == nil {
-					that.Display(4, "获取个人信息失败")
-					return
-				}
-				delete(user, "password")
-				company := that.Db.Get("company", "id,name", Map{"id": user.GetCeilInt("company_id")})
-
-				//消除company没有创建的影响
-				if company == nil {
-					companyId := that.Db.Insert("company", Map{
-						"user_id":        user["id"],
-						"provider_id":    user["provider_id"],
-						"salesman_id":    user["salesman_id"],
-						"create_time[#]": "now()",
-						"modify_time[#]": "now()",
-						"del_flag":       0,
-					})
-					user["company_id"] = companyId
-					that.Db.Update("user", Map{"company_id": companyId}, Map{"id": user.GetCeilInt("id")})
-					company = that.Db.Get("company", "*", Map{"id": user.GetCeilInt("company_id")})
-				}
-				salesman := that.Db.Get("salesman", "id,name", Map{"id": user.GetCeilInt("salesman_id")})
-				provider := that.Db.Get("provider", "id,name", Map{"id": user.GetCeilInt("provider_id")})
-
-				user["company"] = company
-				user["salesman"] = salesman
-				user["provider"] = provider
-
-				that.Display(0, user)
-			}
-		}()
-
 		wechat := that.Db.Get("wechat", "*", Map{"AND": Map{"openid": userInfo.OpenID, "del_flag": 0}})
 
 		if wechat != nil {