소스 검색

修改pg方法

jyq 4 년 전
부모
커밋
f23d596696

+ 12 - 0
api/grpc/base.go

@@ -897,3 +897,15 @@ func (a Api) UnBindHrSensor(ctx context.Context, r *pb.StandardRequest) (*pb.Sta
 }
 }
 
 
 // ----------------------- 评分管理 ---------------------------------------------
 // ----------------------- 评分管理 ---------------------------------------------
+
+// ----------------------- 微信管理 ---------------------------------------------
+
+// VipUserWeiXinLogin 解绑心率带
+func (a Api) VipUserWeiXinLogin(ctx context.Context, r *pb.StandardRequest) (*pb.StandardReply, error) {
+	// 获取token,并验证签名函数
+	token, q, sign := a.webToGoVerify(ctx, r)
+
+	rs := service.Wx{}.VipUserWeiXinLogin(token, q.ShopID, q.JsonStr, sign)
+	rst := a.toWebFunc(rs)
+	return rst, nil
+}

+ 27 - 27
assembly/base/repository/postgre/class.go

@@ -11,189 +11,189 @@ type PGClass struct {
 }
 }
 
 
 func (PGClass) ClassQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) ClassQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_class_List_query(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_class_List_query(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) ClassAdd(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) ClassAdd(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_class_Add(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_class_Add(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) ClassEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) ClassEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_class_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_class_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) ClassStatusEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) ClassStatusEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_class_status_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_class_status_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) ClassColorEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) ClassColorEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_class_color_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_class_color_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) ClassVisibleStatusEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) ClassVisibleStatusEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_class_visible_status_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_class_visible_status_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) ClassVipUserEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) ClassVipUserEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_class_vip_user_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_class_vip_user_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) SttPlanBasicListQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) SttPlanBasicListQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_stt_plan_basic_list_query(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_stt_plan_basic_list_query(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) SttPlanBasicAdd(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) SttPlanBasicAdd(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_stt_plan_basic_add(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_stt_plan_basic_add(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) SttPlanBasicEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) SttPlanBasicEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_stt_plan_basic_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_stt_plan_basic_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) SttPlanBasicShopEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) SttPlanBasicShopEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_stt_plan_basic_shop_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_stt_plan_basic_shop_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) SttPlanBasicStatusEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) SttPlanBasicStatusEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_stt_plan_basic_status_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_stt_plan_basic_status_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) SttPlanPublish(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) SttPlanPublish(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_stt_plan_publish(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_stt_plan_publish(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) SttPlanPreview(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) SttPlanPreview(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_stt_plan_preview(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_stt_plan_preview(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) SttPlanCopy(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) SttPlanCopy(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_stt_plan_copy(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_stt_plan_copy(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) SttPlanDetailListQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) SttPlanDetailListQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_stt_plan_detail_list_query(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_stt_plan_detail_list_query(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) SttPlanDetailBatchSave(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) SttPlanDetailBatchSave(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_stt_plan_detail_batch_save(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_stt_plan_detail_batch_save(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) STTBasicListQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) STTBasicListQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_stt_basic_lost_query(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_stt_basic_lost_query(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) STTBasicAdd(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) STTBasicAdd(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_stt_basic_add(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_stt_basic_add(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) STTBasicEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) STTBasicEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_stt_basic_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_stt_basic_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) STTBasicStatusEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) STTBasicStatusEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_stt_basic_status_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_stt_basic_status_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) SchoolTimetablePreview(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) SchoolTimetablePreview(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_school_time_table_preview(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_school_time_table_preview(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) SchoolTimeTableCopy(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) SchoolTimeTableCopy(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_school_time_table_copy(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_school_time_table_copy(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) STTBasicOfflineEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) STTBasicOfflineEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_stt_basic_offline_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_stt_basic_offline_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) STTDetailListQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) STTDetailListQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_stt_detail_list_query(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_stt_detail_list_query(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) STTDetailBatchSave(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) STTDetailBatchSave(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_stt_detail_batch_save(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_stt_detail_batch_save(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGClass) STTDetailAllowDelCheck(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGClass) STTDetailAllowDelCheck(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_stt_detail_allow_del_check(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_stt_detail_allow_del_check(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return

+ 1 - 1
assembly/base/repository/postgre/order.go

@@ -11,7 +11,7 @@ type PGOrder struct {
 }
 }
 
 
 func (PGOrder) OrderListQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGOrder) OrderListQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_order_List_query(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_order_List_query(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return

+ 37 - 37
assembly/base/repository/postgre/shop.go

@@ -11,259 +11,259 @@ type PGShop struct {
 }
 }
 
 
 func (PGShop) ShopGroupQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) ShopGroupQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_shop_group_query(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_shop_group_query(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) ShopGroupAdd(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) ShopGroupAdd(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_shop_group_add(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_shop_group_add(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) ShopGroupEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) ShopGroupEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_shop_group_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_shop_group_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) ShopGroupStatusEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) ShopGroupStatusEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_shop_group_status_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_shop_group_status_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) ShopGroupDetailsQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) ShopGroupDetailsQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_shop_ingroup_query(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_shop_ingroup_query(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) ShopVenueQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) ShopVenueQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_shop_venue_list_query(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_shop_venue_list_query(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) ShopVenueAdd(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) ShopVenueAdd(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_shop_venue_add(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_shop_venue_add(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) ShopVenueEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) ShopVenueEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_shop_venue_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_shop_venue_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) ShopVenueStatusEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) ShopVenueStatusEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_shop_venue_status_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_shop_venue_status_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) ShopVenueEquipQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) ShopVenueEquipQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_eq_list_query(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_eq_list_query(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) ShopVenueEquipAdd(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) ShopVenueEquipAdd(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_eq_add(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_eq_add(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) ShopVenueEquipEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) ShopVenueEquipEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_eq_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_eq_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) ShopVenueEquipStatusEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) ShopVenueEquipStatusEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_eq_status_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_eq_status_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) ShopVenueEquipStatusDel(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) ShopVenueEquipStatusDel(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_eq_del(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_eq_del(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) ShopConfigQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) ShopConfigQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_shop_config_query(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_shop_config_query(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) ShopConfigEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) ShopConfigEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_shop_config_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_shop_config_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) VipUserListQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) VipUserListQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_vip_user_list_query(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_vip_user_list_query(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) VipUserAdd(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) VipUserAdd(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_vip_user_add(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_vip_user_add(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) VipUserEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) VipUserEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_vip_user_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_vip_user_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) VipUserStatusEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) VipUserStatusEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_vip_user_status_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_vip_user_status_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) AcrossVipUserListQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) AcrossVipUserListQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_across_vip_user_list_query(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_across_vip_user_list_query(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) AcrossVipUserAdd(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) AcrossVipUserAdd(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_across_vip_user_add(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_across_vip_user_add(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) AcrossVipUserDel(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) AcrossVipUserDel(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_across_vip_user_del(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_across_vip_user_del(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) VipUserPhoneQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) VipUserPhoneQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_across_vip_user_del(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_across_vip_user_del(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) VipUserQueryByPhone(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) VipUserQueryByPhone(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_vip_user_query_by_phone(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_vip_user_query_by_phone(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) VipUserOtherPhoneAdd(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) VipUserOtherPhoneAdd(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_vip_user_other_phone_add(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_vip_user_other_phone_add(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) VipUserOtherPhoneEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) VipUserOtherPhoneEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_vip_user_other_phone_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_vip_user_other_phone_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) VipUserOtherPhoneStatusEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) VipUserOtherPhoneStatusEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_vip_user_other_phone_status_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_vip_user_other_phone_status_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) TmpVipUserQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) TmpVipUserQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_tmp_user_list_query(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_tmp_user_list_query(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) TmpUserAdd(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) TmpUserAdd(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_tmp_user_add(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_tmp_user_add(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) TmpVipUserEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) TmpVipUserEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_tmp_user_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_tmp_user_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) TmpVipUserStatusEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) TmpVipUserStatusEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_tmp_user_status_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_tmp_user_status_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) VipUserHourEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) VipUserHourEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_vip_user_hour_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_vip_user_hour_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) VipUserConsumeListQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) VipUserConsumeListQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_vip_user_consume_list_query(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_vip_user_consume_list_query(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) VipUserConsumeDetailQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) VipUserConsumeDetailQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_vip_user_consume_detail_query(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_vip_user_consume_detail_query(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) VipUserClassEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) VipUserClassEdit(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_vip_user_class_edit(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_vip_user_class_edit(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return
 }
 }
 
 
 func (PGShop) ClassHourChgQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
 func (PGShop) ClassHourChgQuery(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
-	err = getClient().Raw("select fn_class_hour_chg_query(? ,? ,? )", optUserId, objectShopId, jsonStr, verfStr).
+	err = getClient().Raw("select fn_class_hour_chg_query(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
 		Scan(&result).Error
 		Scan(&result).Error
 
 
 	return
 	return

+ 18 - 0
assembly/base/repository/postgre/wx.go

@@ -0,0 +1,18 @@
+// Package postgre
+/**
+ * @ File:
+ * @ Date: 2021/5/11 10:35
+ * @ Author: JYQ
+ * @ Description:
+ */
+package postgre
+
+type PGWx struct {
+}
+
+func (PGWx) VipUserWeiXinLogin(optUserId int64, objectShopId int64, jsonStr string, verfStr string) (result string, err error) {
+	err = getClient().Raw("select fn_shop_group_query(? ,? ,?, ? )", optUserId, objectShopId, jsonStr, verfStr).
+		Scan(&result).Error
+
+	return
+}

+ 27 - 0
assembly/base/service/wx.go

@@ -0,0 +1,27 @@
+// Package service
+/**
+ * @ File:
+ * @ Date: 2021/5/11 10:34
+ * @ Author: JYQ
+ * @ Description:
+ */
+package service
+
+import (
+	"sportfitness/base/assembly/base/repository/postgre"
+	"sportfitness/base/errors"
+)
+
+type Wx struct {
+	base
+}
+
+func (w Wx) VipUserWeiXinLogin(token string, objectShopId int64, jsonStr string, sign string) string {
+	optId := w.checkPermission(token, objectShopId)
+
+	rst, err := postgre.PGWx{}.VipUserWeiXinLogin(optId, objectShopId, jsonStr, sign)
+	if err != nil {
+		panic(errors.PGError)
+	}
+	return rst
+}