Merge branch 'master' of https://app.yhyue.com/moapp/points_service

rpc/integral.go

@@ -4,30 +4,31 @@ import (
 	"flag"
 	"fmt"
 	"github.com/go-xorm/xorm"
-	"github.com/tal-tech/go-zero/core/conf"
-	"github.com/tal-tech/go-zero/zrpc"
-	"google.golang.org/grpc"
 	"log"
+
 	"points_service/rpc/integral"
 	"points_service/rpc/internal/config"
 	"points_service/rpc/internal/server"
 	"points_service/rpc/internal/svc"
-	"points_service/rpc/model"
+
+	"github.com/tal-tech/go-zero/core/conf"
+	"github.com/tal-tech/go-zero/zrpc"
+	"google.golang.org/grpc"
 )
 
 var configFile = flag.String("f", "etc/integral.yaml", "the config file")
 var c config.Config
-//定义orm引擎
-
 
 func main() {
+	conf.MustLoad(*configFile, &c)
 	ctx := svc.NewServiceContext(c)
 	srv := server.NewIntegralServer(ctx)
-	fmt.Println(c)
+
 	s := zrpc.MustNewServer(c.RpcServerConf, func(grpcServer *grpc.Server) {
 		integral.RegisterIntegralServer(grpcServer, srv)
 	})
 	defer s.Stop()
+
 	fmt.Printf("Starting rpc server at %s...\n", c.ListenOn)
 	s.Start()
 }
@@ -40,7 +41,5 @@ func init() {
 	if err != nil {
 		log.Fatal("数据库连接失败:", err)
 	}
-	numb,err:=config.Engine.Table("balance").Insert(&model.IntegralBalance{UserId:"12312"});
-	fmt.Println(numb,err)
 	fmt.Println(c.DataSource+"链接成功")
 }

rpc/integral.proto

@@ -20,18 +20,18 @@ message checkResp {
 }
 
 service Integral {
-   //新增积分
-  rpc  addFlow(addReq) returns(addResp);
-   //调整结存
-  rpc  updateBalance(addReq) returns(addResp);
-   //调整余额
-  rpc  updateTotal(addReq) returns(addResp);
-
+  //收获积分
+  rpc  integralHarvest(addReq) returns(addResp);
   //消耗积分
   rpc  integralConsume(addReq) returns(addResp);
+  //积分余额查询
+  rpc integralBalanceCheck(addReq) returns(addResp);
+  //积分明细查询
+  rpc integralDetailedCheck(addReq) returns(addResp);
+
   //积分守护
   rpc  integralGuard(addReq) returns(addResp);
   //到期积分查询
-  rpc  integralCheck(addReq) returns(addResp);
+  rpc  integralExpireCheck(addReq) returns(addResp);
 }
 

rpc/integral/integral.pb.go

@@ -241,28 +241,30 @@ var file_integral_proto_rawDesc = []byte{
 	0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2d, 0x0a, 0x09, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65,
 	0x73, 0x70, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x50, 0x6f, 0x69, 0x6e, 0x74,
 	0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x50, 0x6f,
-	0x69, 0x6e, 0x74, 0x73, 0x32, 0xc8, 0x02, 0x0a, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
-	0x6c, 0x12, 0x2e, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x46, 0x6c, 0x6f, 0x77, 0x12, 0x10, 0x2e, 0x69,
+	0x69, 0x6e, 0x74, 0x73, 0x32, 0xe7, 0x02, 0x0a, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
+	0x6c, 0x12, 0x36, 0x0a, 0x0f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x48, 0x61, 0x72,
+	0x76, 0x65, 0x73, 0x74, 0x12, 0x10, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e,
+	0x61, 0x64, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
+	0x6c, 0x2e, 0x61, 0x64, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x36, 0x0a, 0x0f, 0x69, 0x6e, 0x74,
+	0x65, 0x67, 0x72, 0x61, 0x6c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x12, 0x10, 0x2e, 0x69,
 	0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x61, 0x64, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x11,
 	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x61, 0x64, 0x64, 0x52, 0x65, 0x73,
-	0x70, 0x12, 0x34, 0x0a, 0x0d, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x61, 0x6c, 0x61, 0x6e,
-	0x63, 0x65, 0x12, 0x10, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x61, 0x64,
-	0x64, 0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e,
-	0x61, 0x64, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x32, 0x0a, 0x0b, 0x75, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x10, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
-	0x6c, 0x2e, 0x61, 0x64, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67,
-	0x72, 0x61, 0x6c, 0x2e, 0x61, 0x64, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x36, 0x0a, 0x0f, 0x69,
-	0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x12, 0x10,
-	0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x61, 0x64, 0x64, 0x52, 0x65, 0x71,
-	0x1a, 0x11, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x61, 0x64, 0x64, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x34, 0x0a, 0x0d, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x47,
-	0x75, 0x61, 0x72, 0x64, 0x12, 0x10, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e,
-	0x61, 0x64, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
-	0x6c, 0x2e, 0x61, 0x64, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x34, 0x0a, 0x0d, 0x69, 0x6e, 0x74,
-	0x65, 0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x10, 0x2e, 0x69, 0x6e, 0x74,
-	0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x61, 0x64, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e, 0x69,
-	0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x61, 0x64, 0x64, 0x52, 0x65, 0x73, 0x70, 0x62,
-	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x70, 0x12, 0x3b, 0x0a, 0x14, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x61, 0x6c,
+	0x61, 0x6e, 0x63, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x10, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x67, 0x72, 0x61, 0x6c, 0x2e, 0x61, 0x64, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e, 0x69, 0x6e,
+	0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x61, 0x64, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3c,
+	0x0a, 0x15, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c,
+	0x65, 0x64, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x10, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72,
+	0x61, 0x6c, 0x2e, 0x61, 0x64, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x67, 0x72, 0x61, 0x6c, 0x2e, 0x61, 0x64, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x34, 0x0a, 0x0d,
+	0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x47, 0x75, 0x61, 0x72, 0x64, 0x12, 0x10, 0x2e,
+	0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x61, 0x64, 0x64, 0x52, 0x65, 0x71, 0x1a,
+	0x11, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x61, 0x64, 0x64, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x3a, 0x0a, 0x13, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x45, 0x78,
+	0x70, 0x69, 0x72, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x10, 0x2e, 0x69, 0x6e, 0x74, 0x65,
+	0x67, 0x72, 0x61, 0x6c, 0x2e, 0x61, 0x64, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e, 0x69, 0x6e,
+	0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x2e, 0x61, 0x64, 0x64, 0x52, 0x65, 0x73, 0x70, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -285,18 +287,18 @@ var file_integral_proto_goTypes = []interface{}{
 	(*CheckResp)(nil), // 3: integral.checkResp
 }
 var file_integral_proto_depIdxs = []int32{
-	0, // 0: integral.Integral.addFlow:input_type -> integral.addReq
-	0, // 1: integral.Integral.updateBalance:input_type -> integral.addReq
-	0, // 2: integral.Integral.updateTotal:input_type -> integral.addReq
-	0, // 3: integral.Integral.integralConsume:input_type -> integral.addReq
+	0, // 0: integral.Integral.integralHarvest:input_type -> integral.addReq
+	0, // 1: integral.Integral.integralConsume:input_type -> integral.addReq
+	0, // 2: integral.Integral.integralBalanceCheck:input_type -> integral.addReq
+	0, // 3: integral.Integral.integralDetailedCheck:input_type -> integral.addReq
 	0, // 4: integral.Integral.integralGuard:input_type -> integral.addReq
-	0, // 5: integral.Integral.integralCheck:input_type -> integral.addReq
-	1, // 6: integral.Integral.addFlow:output_type -> integral.addResp
-	1, // 7: integral.Integral.updateBalance:output_type -> integral.addResp
-	1, // 8: integral.Integral.updateTotal:output_type -> integral.addResp
-	1, // 9: integral.Integral.integralConsume:output_type -> integral.addResp
+	0, // 5: integral.Integral.integralExpireCheck:input_type -> integral.addReq
+	1, // 6: integral.Integral.integralHarvest:output_type -> integral.addResp
+	1, // 7: integral.Integral.integralConsume:output_type -> integral.addResp
+	1, // 8: integral.Integral.integralBalanceCheck:output_type -> integral.addResp
+	1, // 9: integral.Integral.integralDetailedCheck:output_type -> integral.addResp
 	1, // 10: integral.Integral.integralGuard:output_type -> integral.addResp
-	1, // 11: integral.Integral.integralCheck:output_type -> integral.addResp
+	1, // 11: integral.Integral.integralExpireCheck:output_type -> integral.addResp
 	6, // [6:12] is the sub-list for method output_type
 	0, // [0:6] is the sub-list for method input_type
 	0, // [0:0] is the sub-list for extension type_name
@@ -391,18 +393,18 @@ const _ = grpc.SupportPackageIsVersion6
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type IntegralClient interface {
-	//新增积分
-	AddFlow(ctx context.Context, in *AddReq, opts ...grpc.CallOption) (*AddResp, error)
-	//调整结存
-	UpdateBalance(ctx context.Context, in *AddReq, opts ...grpc.CallOption) (*AddResp, error)
-	//调整余额
-	UpdateTotal(ctx context.Context, in *AddReq, opts ...grpc.CallOption) (*AddResp, error)
+	//收获积分
+	IntegralHarvest(ctx context.Context, in *AddReq, opts ...grpc.CallOption) (*AddResp, error)
 	//消耗积分
 	IntegralConsume(ctx context.Context, in *AddReq, opts ...grpc.CallOption) (*AddResp, error)
+	//积分余额查询
+	IntegralBalanceCheck(ctx context.Context, in *AddReq, opts ...grpc.CallOption) (*AddResp, error)
+	//积分明细查询
+	IntegralDetailedCheck(ctx context.Context, in *AddReq, opts ...grpc.CallOption) (*AddResp, error)
 	//积分守护
 	IntegralGuard(ctx context.Context, in *AddReq, opts ...grpc.CallOption) (*AddResp, error)
 	//到期积分查询
-	IntegralCheck(ctx context.Context, in *AddReq, opts ...grpc.CallOption) (*AddResp, error)
+	IntegralExpireCheck(ctx context.Context, in *AddReq, opts ...grpc.CallOption) (*AddResp, error)
 }
 
 type integralClient struct {
@@ -413,36 +415,36 @@ func NewIntegralClient(cc grpc.ClientConnInterface) IntegralClient {
 	return &integralClient{cc}
 }
 
-func (c *integralClient) AddFlow(ctx context.Context, in *AddReq, opts ...grpc.CallOption) (*AddResp, error) {
+func (c *integralClient) IntegralHarvest(ctx context.Context, in *AddReq, opts ...grpc.CallOption) (*AddResp, error) {
 	out := new(AddResp)
-	err := c.cc.Invoke(ctx, "/integral.Integral/addFlow", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/integral.Integral/integralHarvest", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *integralClient) UpdateBalance(ctx context.Context, in *AddReq, opts ...grpc.CallOption) (*AddResp, error) {
+func (c *integralClient) IntegralConsume(ctx context.Context, in *AddReq, opts ...grpc.CallOption) (*AddResp, error) {
 	out := new(AddResp)
-	err := c.cc.Invoke(ctx, "/integral.Integral/updateBalance", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/integral.Integral/integralConsume", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *integralClient) UpdateTotal(ctx context.Context, in *AddReq, opts ...grpc.CallOption) (*AddResp, error) {
+func (c *integralClient) IntegralBalanceCheck(ctx context.Context, in *AddReq, opts ...grpc.CallOption) (*AddResp, error) {
 	out := new(AddResp)
-	err := c.cc.Invoke(ctx, "/integral.Integral/updateTotal", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/integral.Integral/integralBalanceCheck", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-func (c *integralClient) IntegralConsume(ctx context.Context, in *AddReq, opts ...grpc.CallOption) (*AddResp, error) {
+func (c *integralClient) IntegralDetailedCheck(ctx context.Context, in *AddReq, opts ...grpc.CallOption) (*AddResp, error) {
 	out := new(AddResp)
-	err := c.cc.Invoke(ctx, "/integral.Integral/integralConsume", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/integral.Integral/integralDetailedCheck", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -458,9 +460,9 @@ func (c *integralClient) IntegralGuard(ctx context.Context, in *AddReq, opts ...
 	return out, nil
 }
 
-func (c *integralClient) IntegralCheck(ctx context.Context, in *AddReq, opts ...grpc.CallOption) (*AddResp, error) {
+func (c *integralClient) IntegralExpireCheck(ctx context.Context, in *AddReq, opts ...grpc.CallOption) (*AddResp, error) {
 	out := new(AddResp)
-	err := c.cc.Invoke(ctx, "/integral.Integral/integralCheck", in, out, opts...)
+	err := c.cc.Invoke(ctx, "/integral.Integral/integralExpireCheck", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -469,115 +471,115 @@ func (c *integralClient) IntegralCheck(ctx context.Context, in *AddReq, opts ...
 
 // IntegralServer is the server API for Integral service.
 type IntegralServer interface {
-	//新增积分
-	AddFlow(context.Context, *AddReq) (*AddResp, error)
-	//调整结存
-	UpdateBalance(context.Context, *AddReq) (*AddResp, error)
-	//调整余额
-	UpdateTotal(context.Context, *AddReq) (*AddResp, error)
+	//收获积分
+	IntegralHarvest(context.Context, *AddReq) (*AddResp, error)
 	//消耗积分
 	IntegralConsume(context.Context, *AddReq) (*AddResp, error)
+	//积分余额查询
+	IntegralBalanceCheck(context.Context, *AddReq) (*AddResp, error)
+	//积分明细查询
+	IntegralDetailedCheck(context.Context, *AddReq) (*AddResp, error)
 	//积分守护
 	IntegralGuard(context.Context, *AddReq) (*AddResp, error)
 	//到期积分查询
-	IntegralCheck(context.Context, *AddReq) (*AddResp, error)
+	IntegralExpireCheck(context.Context, *AddReq) (*AddResp, error)
 }
 
 // UnimplementedIntegralServer can be embedded to have forward compatible implementations.
 type UnimplementedIntegralServer struct {
 }
 
-func (*UnimplementedIntegralServer) AddFlow(context.Context, *AddReq) (*AddResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method AddFlow not implemented")
-}
-func (*UnimplementedIntegralServer) UpdateBalance(context.Context, *AddReq) (*AddResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method UpdateBalance not implemented")
-}
-func (*UnimplementedIntegralServer) UpdateTotal(context.Context, *AddReq) (*AddResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method UpdateTotal not implemented")
+func (*UnimplementedIntegralServer) IntegralHarvest(context.Context, *AddReq) (*AddResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method IntegralHarvest not implemented")
 }
 func (*UnimplementedIntegralServer) IntegralConsume(context.Context, *AddReq) (*AddResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method IntegralConsume not implemented")
 }
+func (*UnimplementedIntegralServer) IntegralBalanceCheck(context.Context, *AddReq) (*AddResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method IntegralBalanceCheck not implemented")
+}
+func (*UnimplementedIntegralServer) IntegralDetailedCheck(context.Context, *AddReq) (*AddResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method IntegralDetailedCheck not implemented")
+}
 func (*UnimplementedIntegralServer) IntegralGuard(context.Context, *AddReq) (*AddResp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method IntegralGuard not implemented")
 }
-func (*UnimplementedIntegralServer) IntegralCheck(context.Context, *AddReq) (*AddResp, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method IntegralCheck not implemented")
+func (*UnimplementedIntegralServer) IntegralExpireCheck(context.Context, *AddReq) (*AddResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method IntegralExpireCheck not implemented")
 }
 
 func RegisterIntegralServer(s *grpc.Server, srv IntegralServer) {
 	s.RegisterService(&_Integral_serviceDesc, srv)
 }
 
-func _Integral_AddFlow_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _Integral_IntegralHarvest_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(AddReq)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(IntegralServer).AddFlow(ctx, in)
+		return srv.(IntegralServer).IntegralHarvest(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/integral.Integral/AddFlow",
+		FullMethod: "/integral.Integral/IntegralHarvest",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(IntegralServer).AddFlow(ctx, req.(*AddReq))
+		return srv.(IntegralServer).IntegralHarvest(ctx, req.(*AddReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Integral_UpdateBalance_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _Integral_IntegralConsume_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(AddReq)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(IntegralServer).UpdateBalance(ctx, in)
+		return srv.(IntegralServer).IntegralConsume(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/integral.Integral/UpdateBalance",
+		FullMethod: "/integral.Integral/IntegralConsume",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(IntegralServer).UpdateBalance(ctx, req.(*AddReq))
+		return srv.(IntegralServer).IntegralConsume(ctx, req.(*AddReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Integral_UpdateTotal_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _Integral_IntegralBalanceCheck_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(AddReq)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(IntegralServer).UpdateTotal(ctx, in)
+		return srv.(IntegralServer).IntegralBalanceCheck(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/integral.Integral/UpdateTotal",
+		FullMethod: "/integral.Integral/IntegralBalanceCheck",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(IntegralServer).UpdateTotal(ctx, req.(*AddReq))
+		return srv.(IntegralServer).IntegralBalanceCheck(ctx, req.(*AddReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Integral_IntegralConsume_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _Integral_IntegralDetailedCheck_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(AddReq)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(IntegralServer).IntegralConsume(ctx, in)
+		return srv.(IntegralServer).IntegralDetailedCheck(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/integral.Integral/IntegralConsume",
+		FullMethod: "/integral.Integral/IntegralDetailedCheck",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(IntegralServer).IntegralConsume(ctx, req.(*AddReq))
+		return srv.(IntegralServer).IntegralDetailedCheck(ctx, req.(*AddReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -600,20 +602,20 @@ func _Integral_IntegralGuard_Handler(srv interface{}, ctx context.Context, dec f
 	return interceptor(ctx, in, info, handler)
 }
 
-func _Integral_IntegralCheck_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _Integral_IntegralExpireCheck_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(AddReq)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(IntegralServer).IntegralCheck(ctx, in)
+		return srv.(IntegralServer).IntegralExpireCheck(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/integral.Integral/IntegralCheck",
+		FullMethod: "/integral.Integral/IntegralExpireCheck",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(IntegralServer).IntegralCheck(ctx, req.(*AddReq))
+		return srv.(IntegralServer).IntegralExpireCheck(ctx, req.(*AddReq))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@@ -623,28 +625,28 @@ var _Integral_serviceDesc = grpc.ServiceDesc{
 	HandlerType: (*IntegralServer)(nil),
 	Methods: []grpc.MethodDesc{
 		{
-			MethodName: "addFlow",
-			Handler:    _Integral_AddFlow_Handler,
+			MethodName: "integralHarvest",
+			Handler:    _Integral_IntegralHarvest_Handler,
 		},
 		{
-			MethodName: "updateBalance",
-			Handler:    _Integral_UpdateBalance_Handler,
+			MethodName: "integralConsume",
+			Handler:    _Integral_IntegralConsume_Handler,
 		},
 		{
-			MethodName: "updateTotal",
-			Handler:    _Integral_UpdateTotal_Handler,
+			MethodName: "integralBalanceCheck",
+			Handler:    _Integral_IntegralBalanceCheck_Handler,
 		},
 		{
-			MethodName: "integralConsume",
-			Handler:    _Integral_IntegralConsume_Handler,
+			MethodName: "integralDetailedCheck",
+			Handler:    _Integral_IntegralDetailedCheck_Handler,
 		},
 		{
 			MethodName: "integralGuard",
 			Handler:    _Integral_IntegralGuard_Handler,
 		},
 		{
-			MethodName: "integralCheck",
-			Handler:    _Integral_IntegralCheck_Handler,
+			MethodName: "integralExpireCheck",
+			Handler:    _Integral_IntegralExpireCheck_Handler,
 		},
 	},
 	Streams:  []grpc.StreamDesc{},

rpc/integralclient/integral.go

@@ -14,24 +14,24 @@ import (
 )
 
 type (
-	CheckReq  = integral.CheckReq
-	CheckResp = integral.CheckResp
 	AddReq    = integral.AddReq
 	AddResp   = integral.AddResp
+	CheckReq  = integral.CheckReq
+	CheckResp = integral.CheckResp
 
 	Integral interface {
-		// 新增积分
-		AddFlow(ctx context.Context, in *AddReq) (*AddResp, error)
-		// 调整结存
-		UpdateBalance(ctx context.Context, in *AddReq) (*AddResp, error)
-		// 调整余额
-		UpdateTotal(ctx context.Context, in *AddReq) (*AddResp, error)
+		// 收获积分
+		IntegralHarvest(ctx context.Context, in *AddReq) (*AddResp, error)
 		// 消耗积分
 		IntegralConsume(ctx context.Context, in *AddReq) (*AddResp, error)
+		// 积分余额查询
+		IntegralBalanceCheck(ctx context.Context, in *AddReq) (*AddResp, error)
+		// 积分明细查询
+		IntegralDetailedCheck(ctx context.Context, in *AddReq) (*AddResp, error)
 		// 积分守护
 		IntegralGuard(ctx context.Context, in *AddReq) (*AddResp, error)
 		// 到期积分查询
-		IntegralCheck(ctx context.Context, in *AddReq) (*AddResp, error)
+		IntegralExpireCheck(ctx context.Context, in *AddReq) (*AddResp, error)
 	}
 
 	defaultIntegral struct {
@@ -45,28 +45,28 @@ func NewIntegral(cli zrpc.Client) Integral {
 	}
 }
 
-// 新增积分
-func (m *defaultIntegral) AddFlow(ctx context.Context, in *AddReq) (*AddResp, error) {
+// 收获积分
+func (m *defaultIntegral) IntegralHarvest(ctx context.Context, in *AddReq) (*AddResp, error) {
 	client := integral.NewIntegralClient(m.cli.Conn())
-	return client.AddFlow(ctx, in)
+	return client.IntegralHarvest(ctx, in)
 }
 
-// 调整结存
-func (m *defaultIntegral) UpdateBalance(ctx context.Context, in *AddReq) (*AddResp, error) {
+// 消耗积分
+func (m *defaultIntegral) IntegralConsume(ctx context.Context, in *AddReq) (*AddResp, error) {
 	client := integral.NewIntegralClient(m.cli.Conn())
-	return client.UpdateBalance(ctx, in)
+	return client.IntegralConsume(ctx, in)
 }
 
-// 调整余额
-func (m *defaultIntegral) UpdateTotal(ctx context.Context, in *AddReq) (*AddResp, error) {
+// 积分余额查询
+func (m *defaultIntegral) IntegralBalanceCheck(ctx context.Context, in *AddReq) (*AddResp, error) {
 	client := integral.NewIntegralClient(m.cli.Conn())
-	return client.UpdateTotal(ctx, in)
+	return client.IntegralBalanceCheck(ctx, in)
 }
 
-// 消耗积分
-func (m *defaultIntegral) IntegralConsume(ctx context.Context, in *AddReq) (*AddResp, error) {
+// 积分明细查询
+func (m *defaultIntegral) IntegralDetailedCheck(ctx context.Context, in *AddReq) (*AddResp, error) {
 	client := integral.NewIntegralClient(m.cli.Conn())
-	return client.IntegralConsume(ctx, in)
+	return client.IntegralDetailedCheck(ctx, in)
 }
 
 // 积分守护
@@ -76,7 +76,7 @@ func (m *defaultIntegral) IntegralGuard(ctx context.Context, in *AddReq) (*AddRe
 }
 
 // 到期积分查询
-func (m *defaultIntegral) IntegralCheck(ctx context.Context, in *AddReq) (*AddResp, error) {
+func (m *defaultIntegral) IntegralExpireCheck(ctx context.Context, in *AddReq) (*AddResp, error) {
 	client := integral.NewIntegralClient(m.cli.Conn())
-	return client.IntegralCheck(ctx, in)
+	return client.IntegralExpireCheck(ctx, in)
 }

rpc/internal/logic/addlogic.go

@@ -1,37 +0,0 @@
-package logic
-
-import (
-	"context"
-	"points_service/rpc/model"
-
-	"points_service/rpc/integral"
-	"points_service/rpc/internal/svc"
-
-	"github.com/tal-tech/go-zero/core/logx"
-)
-
-type AddLogic struct {
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-	logx.Logger
-}
-
-func NewAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AddLogic {
-	return &AddLogic{
-		ctx:    ctx,
-		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
-	}
-}
-
-func (l *AddLogic) Add(in *integral.AddReq) (*integral.AddResp, error) {
-	// todo: add your logic here and delete this line
-	_, err := l.svcCtx.Model.Insert(model.IntegralBalance{
-		UserId:  in.UserId,
-		CountPoints: in.CountPoints,
-	})
-	if err != nil {
-		return nil, err
-	}
-	return &integral.AddResp{Status: true}, nil
-}

rpc/internal/logic/updatebalancelogic.go → rpc/internal/logic/integralbalancechecklogic.go

@@ -9,22 +9,22 @@ import (
 	"github.com/tal-tech/go-zero/core/logx"
 )
 
-type UpdateBalanceLogic struct {
+type IntegralBalanceCheckLogic struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
 	logx.Logger
 }
 
-func NewUpdateBalanceLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UpdateBalanceLogic {
-	return &UpdateBalanceLogic{
+func NewIntegralBalanceCheckLogic(ctx context.Context, svcCtx *svc.ServiceContext) *IntegralBalanceCheckLogic {
+	return &IntegralBalanceCheckLogic{
 		ctx:    ctx,
 		svcCtx: svcCtx,
 		Logger: logx.WithContext(ctx),
 	}
 }
 
-// 调整结存
-func (l *UpdateBalanceLogic) UpdateBalance(in *integral.AddReq) (*integral.AddResp, error) {
+// 积分余额查询
+func (l *IntegralBalanceCheckLogic) IntegralBalanceCheck(in *integral.AddReq) (*integral.AddResp, error) {
 	// todo: add your logic here and delete this line
 
 	return &integral.AddResp{}, nil

rpc/internal/logic/updatelogic.go → rpc/internal/logic/integraldetailedchecklogic.go

@@ -9,21 +9,22 @@ import (
 	"github.com/tal-tech/go-zero/core/logx"
 )
 
-type UpdateLogic struct {
+type IntegralDetailedCheckLogic struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
 	logx.Logger
 }
 
-func NewUpdateLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UpdateLogic {
-	return &UpdateLogic{
+func NewIntegralDetailedCheckLogic(ctx context.Context, svcCtx *svc.ServiceContext) *IntegralDetailedCheckLogic {
+	return &IntegralDetailedCheckLogic{
 		ctx:    ctx,
 		svcCtx: svcCtx,
 		Logger: logx.WithContext(ctx),
 	}
 }
 
-func (l *UpdateLogic) Update(in *integral.AddReq) (*integral.AddResp, error) {
+// 积分明细查询
+func (l *IntegralDetailedCheckLogic) IntegralDetailedCheck(in *integral.AddReq) (*integral.AddResp, error) {
 	// todo: add your logic here and delete this line
 
 	return &integral.AddResp{}, nil

rpc/internal/logic/integralchecklogic.go → rpc/internal/logic/integralexpirechecklogic.go

@@ -9,14 +9,14 @@ import (
 	"github.com/tal-tech/go-zero/core/logx"
 )
 
-type IntegralCheckLogic struct {
+type IntegralExpireCheckLogic struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
 	logx.Logger
 }
 
-func NewIntegralCheckLogic(ctx context.Context, svcCtx *svc.ServiceContext) *IntegralCheckLogic {
-	return &IntegralCheckLogic{
+func NewIntegralExpireCheckLogic(ctx context.Context, svcCtx *svc.ServiceContext) *IntegralExpireCheckLogic {
+	return &IntegralExpireCheckLogic{
 		ctx:    ctx,
 		svcCtx: svcCtx,
 		Logger: logx.WithContext(ctx),
@@ -24,7 +24,7 @@ func NewIntegralCheckLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Int
 }
 
 // 到期积分查询
-func (l *IntegralCheckLogic) IntegralCheck(in *integral.AddReq) (*integral.AddResp, error) {
+func (l *IntegralExpireCheckLogic) IntegralExpireCheck(in *integral.AddReq) (*integral.AddResp, error) {
 	// todo: add your logic here and delete this line
 
 	return &integral.AddResp{}, nil

rpc/internal/logic/addflowlogic.go → rpc/internal/logic/integralharvestlogic.go

@@ -9,22 +9,22 @@ import (
 	"github.com/tal-tech/go-zero/core/logx"
 )
 
-type AddFlowLogic struct {
+type IntegralHarvestLogic struct {
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
 	logx.Logger
 }
 
-func NewAddFlowLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AddFlowLogic {
-	return &AddFlowLogic{
+func NewIntegralHarvestLogic(ctx context.Context, svcCtx *svc.ServiceContext) *IntegralHarvestLogic {
+	return &IntegralHarvestLogic{
 		ctx:    ctx,
 		svcCtx: svcCtx,
 		Logger: logx.WithContext(ctx),
 	}
 }
 
-// 新增积分
-func (l *AddFlowLogic) AddFlow(in *integral.AddReq) (*integral.AddResp, error) {
+// 收获积分
+func (l *IntegralHarvestLogic) IntegralHarvest(in *integral.AddReq) (*integral.AddResp, error) {
 	// todo: add your logic here and delete this line
 
 	return &integral.AddResp{}, nil

rpc/internal/logic/selectlogic.go

@@ -1,30 +0,0 @@
-package logic
-
-import (
-	"context"
-
-	"points_service/rpc/integral"
-	"points_service/rpc/internal/svc"
-
-	"github.com/tal-tech/go-zero/core/logx"
-)
-
-type SelectLogic struct {
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-	logx.Logger
-}
-
-func NewSelectLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SelectLogic {
-	return &SelectLogic{
-		ctx:    ctx,
-		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
-	}
-}
-
-func (l *SelectLogic) Select(in *integral.CheckReq) (*integral.CheckResp, error) {
-	// todo: add your logic here and delete this line
-
-	return &integral.CheckResp{}, nil
-}

rpc/internal/logic/updatetotallogic.go

@@ -1,31 +0,0 @@
-package logic
-
-import (
-	"context"
-
-	"points_service/rpc/integral"
-	"points_service/rpc/internal/svc"
-
-	"github.com/tal-tech/go-zero/core/logx"
-)
-
-type UpdateTotalLogic struct {
-	ctx    context.Context
-	svcCtx *svc.ServiceContext
-	logx.Logger
-}
-
-func NewUpdateTotalLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UpdateTotalLogic {
-	return &UpdateTotalLogic{
-		ctx:    ctx,
-		svcCtx: svcCtx,
-		Logger: logx.WithContext(ctx),
-	}
-}
-
-// 调整余额
-func (l *UpdateTotalLogic) UpdateTotal(in *integral.AddReq) (*integral.AddResp, error) {
-	// todo: add your logic here and delete this line
-
-	return &integral.AddResp{}, nil
-}

rpc/internal/server/integralserver.go

@@ -21,22 +21,10 @@ func NewIntegralServer(svcCtx *svc.ServiceContext) *IntegralServer {
 	}
 }
 
-// 新增积分
-func (s *IntegralServer) AddFlow(ctx context.Context, in *integral.AddReq) (*integral.AddResp, error) {
-	l := logic.NewAddFlowLogic(ctx, s.svcCtx)
-	return l.AddFlow(in)
-}
-
-// 调整结存
-func (s *IntegralServer) UpdateBalance(ctx context.Context, in *integral.AddReq) (*integral.AddResp, error) {
-	l := logic.NewUpdateBalanceLogic(ctx, s.svcCtx)
-	return l.UpdateBalance(in)
-}
-
-// 调整余额
-func (s *IntegralServer) UpdateTotal(ctx context.Context, in *integral.AddReq) (*integral.AddResp, error) {
-	l := logic.NewUpdateTotalLogic(ctx, s.svcCtx)
-	return l.UpdateTotal(in)
+// 收获积分
+func (s *IntegralServer) IntegralHarvest(ctx context.Context, in *integral.AddReq) (*integral.AddResp, error) {
+	l := logic.NewIntegralHarvestLogic(ctx, s.svcCtx)
+	return l.IntegralHarvest(in)
 }
 
 // 消耗积分
@@ -45,6 +33,18 @@ func (s *IntegralServer) IntegralConsume(ctx context.Context, in *integral.AddRe
 	return l.IntegralConsume(in)
 }
 
+// 积分余额查询
+func (s *IntegralServer) IntegralBalanceCheck(ctx context.Context, in *integral.AddReq) (*integral.AddResp, error) {
+	l := logic.NewIntegralBalanceCheckLogic(ctx, s.svcCtx)
+	return l.IntegralBalanceCheck(in)
+}
+
+// 积分明细查询
+func (s *IntegralServer) IntegralDetailedCheck(ctx context.Context, in *integral.AddReq) (*integral.AddResp, error) {
+	l := logic.NewIntegralDetailedCheckLogic(ctx, s.svcCtx)
+	return l.IntegralDetailedCheck(in)
+}
+
 // 积分守护
 func (s *IntegralServer) IntegralGuard(ctx context.Context, in *integral.AddReq) (*integral.AddResp, error) {
 	l := logic.NewIntegralGuardLogic(ctx, s.svcCtx)
@@ -52,7 +52,7 @@ func (s *IntegralServer) IntegralGuard(ctx context.Context, in *integral.AddReq)
 }
 
 // 到期积分查询
-func (s *IntegralServer) IntegralCheck(ctx context.Context, in *integral.AddReq) (*integral.AddResp, error) {
-	l := logic.NewIntegralCheckLogic(ctx, s.svcCtx)
-	return l.IntegralCheck(in)
+func (s *IntegralServer) IntegralExpireCheck(ctx context.Context, in *integral.AddReq) (*integral.AddResp, error) {
+	l := logic.NewIntegralExpireCheckLogic(ctx, s.svcCtx)
+	return l.IntegralExpireCheck(in)
 }

rpc/internal/svc/servicecontext.go

@@ -1,19 +1,13 @@
 package svc
 
-import (
-	"github.com/tal-tech/go-zero/core/stores/sqlx"
-	"points_service/rpc/internal/config"
-	"points_service/rpc/model"
-)
+import "points_service/rpc/internal/config"
 
 type ServiceContext struct {
 	Config config.Config
-	Model model.IntegralBalanceModel
 }
 
 func NewServiceContext(c config.Config) *ServiceContext {
 	return &ServiceContext{
 		Config: c,
-		Model: model.NewIntegralBalanceModel(sqlx.NewMysql(c.DataSource),c.Cache),
 	}
 }

rpc/internal/test/balance_test.go

@@ -1,22 +0,0 @@
-package test
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"github.com/tal-tech/go-zero/core/conf"
-	"points_service/rpc/integral"
-	"points_service/rpc/internal/config"
-	"points_service/rpc/internal/server"
-	"points_service/rpc/internal/svc"
-	"testing"
-)
-var configFile = flag.String("f", "../../etc/integral.yaml", "the config file")
-
-func Test_add(t *testing.T) {
-	var c config.Config
-	conf.MustLoad(*configFile, &c)
-	ctx := svc.NewServiceContext(c)
-	srv := server.NewIntegralServer(ctx)
-	fmt.Println(srv.Add(context.Background(), &integral.AddReq{UserId: "lz",CountPoints:110}))
-}

rpc/model/balance.sql

@@ -1,8 +0,0 @@
-CREATE TABLE `integral_balance`
-(
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `userId` varchar(255) NOT NULL COMMENT '用户标识',
-  `countPoints` int COMMENT '合计',
-  `appId` int(11) NOT NULL DEFAULT 10000 COMMENT '剑鱼标识',
-  PRIMARY KEY(`userId`)
-) ENGINE=InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '积分余额表' ROW_FORMAT = DYNAMIC;

rpc/model/integralFlow.sql

@@ -1,13 +0,0 @@
-
-CREATE TABLE `integral_flow`  (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `userId` varchar(255) NOT NULL  COMMENT '用户标识',
-  `pointType` int(2)  COMMENT '积分类型',
-  `businessTypeId` int(2) COMMENT '业务单据标识',
-  `businessType` varchar(10) COMMENT '业务类型',
-  `point` int(11)  COMMENT '积分',
-  `timeStamp` datetime(0) COMMENT '创建时间',
-  `endDate` date COMMENT '截止时间',
-  `appId` int(11) NOT NULL DEFAULT 10000 COMMENT '剑鱼标识',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '积分流水表' ROW_FORMAT = DYNAMIC;

rpc/model/integralbalancemodel.go

@@ -1,103 +0,0 @@
-package model
-
-import (
-	"database/sql"
-	"fmt"
-	"strings"
-
-	"github.com/tal-tech/go-zero/core/stores/cache"
-	"github.com/tal-tech/go-zero/core/stores/sqlc"
-	"github.com/tal-tech/go-zero/core/stores/sqlx"
-	"github.com/tal-tech/go-zero/core/stringx"
-	"github.com/tal-tech/go-zero/tools/goctl/model/sql/builderx"
-)
-
-var (
-	integralBalanceFieldNames          = builderx.RawFieldNames(&IntegralBalance{})
-	integralBalanceRows                = strings.Join(integralBalanceFieldNames, ",")
-	integralBalanceRowsExpectAutoSet   = strings.Join(stringx.Remove(integralBalanceFieldNames, "`create_time`", "`update_time`"), ",")
-	integralBalanceRowsWithPlaceHolder = strings.Join(stringx.Remove(integralBalanceFieldNames, "`userId`", "`create_time`", "`update_time`"), "=?,") + "=?"
-
-	cacheIntegralBalanceUserIdPrefix = "cache#integralBalance#userId#"
-)
-
-type (
-	IntegralBalanceModel interface {
-		Insert(data IntegralBalance) (sql.Result, error)
-		FindOne(userId string) (*IntegralBalance, error)
-		Update(data IntegralBalance) error
-		Delete(userId string) error
-	}
-
-	defaultIntegralBalanceModel struct {
-		sqlc.CachedConn
-		table string
-	}
-
-	IntegralBalance struct {
-		CountPoints int64 `xorm:"countPoints" json:"countPoints" form:"countPoints"`
-		UserId      string `xorm:"userId" json:"userId" form:"userId"`
-		Id          int64  `db:"id"`
-		AppId          int64  `db:"AppId"`
-
-	}
-)
-
-func NewIntegralBalanceModel(conn sqlx.SqlConn, c cache.CacheConf) IntegralBalanceModel {
-	return &defaultIntegralBalanceModel{
-		CachedConn: sqlc.NewConn(conn, c),
-		table:      "`integral_balance`",
-	}
-}
-
-func (m *defaultIntegralBalanceModel) Insert(data IntegralBalance) (sql.Result, error) {
-	query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?)", m.table, integralBalanceRowsExpectAutoSet)
-	ret, err := m.ExecNoCache(query, data.AppId, data.Id, data.UserId, data.CountPoints)
-
-	return ret, err
-}
-
-func (m *defaultIntegralBalanceModel) FindOne(userId string) (*IntegralBalance, error) {
-	integralBalanceUserIdKey := fmt.Sprintf("%s%v", cacheIntegralBalanceUserIdPrefix, userId)
-	var resp IntegralBalance
-	err := m.QueryRow(&resp, integralBalanceUserIdKey, func(conn sqlx.SqlConn, v interface{}) error {
-		query := fmt.Sprintf("select %s from %s where `userId` = ? limit 1", integralBalanceRows, m.table)
-		return conn.QueryRow(v, query, userId)
-	})
-	switch err {
-	case nil:
-		return &resp, nil
-	case sqlc.ErrNotFound:
-		return nil, ErrNotFound
-	default:
-		return nil, err
-	}
-}
-
-func (m *defaultIntegralBalanceModel) Update(data IntegralBalance) error {
-	integralBalanceUserIdKey := fmt.Sprintf("%s%v", cacheIntegralBalanceUserIdPrefix, data.UserId)
-	_, err := m.Exec(func(conn sqlx.SqlConn) (result sql.Result, err error) {
-		query := fmt.Sprintf("update %s set %s where `userId` = ?", m.table, integralBalanceRowsWithPlaceHolder)
-		return conn.Exec(query, data.AppId, data.Id, data.CountPoints, data.UserId)
-	}, integralBalanceUserIdKey)
-	return err
-}
-
-func (m *defaultIntegralBalanceModel) Delete(userId string) error {
-
-	integralBalanceUserIdKey := fmt.Sprintf("%s%v", cacheIntegralBalanceUserIdPrefix, userId)
-	_, err := m.Exec(func(conn sqlx.SqlConn) (result sql.Result, err error) {
-		query := fmt.Sprintf("delete from %s where `userId` = ?", m.table)
-		return conn.Exec(query, userId)
-	}, integralBalanceUserIdKey)
-	return err
-}
-
-func (m *defaultIntegralBalanceModel) formatPrimary(primary interface{}) string {
-	return fmt.Sprintf("%s%v", cacheIntegralBalanceUserIdPrefix, primary)
-}
-
-func (m *defaultIntegralBalanceModel) queryPrimary(conn sqlx.SqlConn, v, primary interface{}) error {
-	query := fmt.Sprintf("select %s from %s where `userId` = ? limit 1", integralBalanceRows, m.table)
-	return conn.QueryRow(v, query, primary)
-}

rpc/model/integralflowmodel.go

@@ -1,108 +0,0 @@
-package model
-
-import (
-	"database/sql"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/tal-tech/go-zero/core/stores/cache"
-	"github.com/tal-tech/go-zero/core/stores/sqlc"
-	"github.com/tal-tech/go-zero/core/stores/sqlx"
-	"github.com/tal-tech/go-zero/core/stringx"
-	"github.com/tal-tech/go-zero/tools/goctl/model/sql/builderx"
-)
-
-var (
-	integralFlowFieldNames          = builderx.RawFieldNames(&IntegralFlow{})
-	integralFlowRows                = strings.Join(integralFlowFieldNames, ",")
-	integralFlowRowsExpectAutoSet   = strings.Join(stringx.Remove(integralFlowFieldNames, "`id`", "`create_time`", "`update_time`"), ",")
-	integralFlowRowsWithPlaceHolder = strings.Join(stringx.Remove(integralFlowFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?"
-
-	cacheIntegralFlowIdPrefix = "cache#integralFlow#id#"
-)
-
-type (
-	IntegralFlowModel interface {
-		Insert(data IntegralFlow) (sql.Result, error)
-		FindOne(id int64) (*IntegralFlow, error)
-		Update(data IntegralFlow) error
-		Delete(id int64) error
-	}
-
-	defaultIntegralFlowModel struct {
-		sqlc.CachedConn
-		table string
-	}
-
-	IntegralFlow struct {
-		AppId          int64     `db:"appId"` // 剑鱼标识
-		Id             int64     `db:"id"`
-		BusinessTypeId int64     `db:"businessTypeId"` // 业务单据标识
-		Point          int64     `db:"point"`          // 积分
-		TimeStamp      time.Time `db:"timeStamp"`      // 创建时间
-		EndDate        time.Time `db:"endDate"`        // 截止时间
-		UserId         string    `db:"userId"`         // 用户标识
-		PointType      int64     `db:"pointType"`      // 积分类型
-		BusinessType   string    `db:"businessType"`   // 业务类型
-	}
-)
-
-func NewIntegralFlowModel(conn sqlx.SqlConn, c cache.CacheConf) IntegralFlowModel {
-	return &defaultIntegralFlowModel{
-		CachedConn: sqlc.NewConn(conn, c),
-		table:      "`integral_flow`",
-	}
-}
-
-func (m *defaultIntegralFlowModel) Insert(data IntegralFlow) (sql.Result, error) {
-	query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?)", m.table, integralFlowRowsExpectAutoSet)
-	ret, err := m.ExecNoCache(query, data.AppId, data.BusinessTypeId, data.Point, data.TimeStamp, data.EndDate, data.UserId, data.PointType, data.BusinessType)
-
-	return ret, err
-}
-
-func (m *defaultIntegralFlowModel) FindOne(id int64) (*IntegralFlow, error) {
-	integralFlowIdKey := fmt.Sprintf("%s%v", cacheIntegralFlowIdPrefix, id)
-	var resp IntegralFlow
-	err := m.QueryRow(&resp, integralFlowIdKey, func(conn sqlx.SqlConn, v interface{}) error {
-		query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", integralFlowRows, m.table)
-		return conn.QueryRow(v, query, id)
-	})
-	switch err {
-	case nil:
-		return &resp, nil
-	case sqlc.ErrNotFound:
-		return nil, ErrNotFound
-	default:
-		return nil, err
-	}
-}
-
-func (m *defaultIntegralFlowModel) Update(data IntegralFlow) error {
-	integralFlowIdKey := fmt.Sprintf("%s%v", cacheIntegralFlowIdPrefix, data.Id)
-	_, err := m.Exec(func(conn sqlx.SqlConn) (result sql.Result, err error) {
-		query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, integralFlowRowsWithPlaceHolder)
-		return conn.Exec(query, data.AppId, data.BusinessTypeId, data.Point, data.TimeStamp, data.EndDate, data.UserId, data.PointType, data.BusinessType, data.Id)
-	}, integralFlowIdKey)
-	return err
-}
-
-func (m *defaultIntegralFlowModel) Delete(id int64) error {
-
-	integralFlowIdKey := fmt.Sprintf("%s%v", cacheIntegralFlowIdPrefix, id)
-	_, err := m.Exec(func(conn sqlx.SqlConn) (result sql.Result, err error) {
-		query := fmt.Sprintf("delete from %s where `id` = ?", m.table)
-		return conn.Exec(query, id)
-	}, integralFlowIdKey)
-	return err
-}
-
-func (m *defaultIntegralFlowModel) formatPrimary(primary interface{}) string {
-	return fmt.Sprintf("%s%v", cacheIntegralFlowIdPrefix, primary)
-}
-
-func (m *defaultIntegralFlowModel) queryPrimary(conn sqlx.SqlConn, v, primary interface{}) error {
-	query := fmt.Sprintf("select %s from %s where `id` = ? limit 1", integralFlowRows, m.table)
-	return conn.QueryRow(v, query, primary)
-}

rpc/model/integralsoldemodel.go

@@ -1,105 +0,0 @@
-package model
-
-import (
-	"database/sql"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/tal-tech/go-zero/core/stores/cache"
-	"github.com/tal-tech/go-zero/core/stores/sqlc"
-	"github.com/tal-tech/go-zero/core/stores/sqlx"
-	"github.com/tal-tech/go-zero/core/stringx"
-	"github.com/tal-tech/go-zero/tools/goctl/model/sql/builderx"
-)
-
-var (
-	integralSoldeFieldNames          = builderx.RawFieldNames(&IntegralSolde{})
-	integralSoldeRows                = strings.Join(integralSoldeFieldNames, ",")
-	integralSoldeRowsExpectAutoSet   = strings.Join(stringx.Remove(integralSoldeFieldNames, "`create_time`", "`update_time`"), ",")
-	integralSoldeRowsWithPlaceHolder = strings.Join(stringx.Remove(integralSoldeFieldNames, "`endDate`", "`create_time`", "`update_time`"), "=?,") + "=?"
-
-	cacheIntegralSoldeEndDatePrefix = "cache#integralSolde#endDate#"
-)
-
-type (
-	IntegralSoldeModel interface {
-		Insert(data IntegralSolde) (sql.Result, error)
-		FindOne(endDate time.Time) (*IntegralSolde, error)
-		Update(data IntegralSolde) error
-		Delete(endDate time.Time) error
-	}
-
-	defaultIntegralSoldeModel struct {
-		sqlc.CachedConn
-		table string
-	}
-
-	IntegralSolde struct {
-		Id              int64     `db:"id"`
-		PerManEntPoints int64     `db:"perManEntPoints"` // 永久积分
-		TimePoints      int64     `db:"timePoints"`      // 时效积分
-		EndDate         time.Time `db:"endDate"`         // 有效期止
-		CountPoints     int64     `db:"countPoints"`     // 合计
-		AppId           int64     `db:"appId"`           // 剑鱼标识
-	}
-)
-
-func NewIntegralSoldeModel(conn sqlx.SqlConn, c cache.CacheConf) IntegralSoldeModel {
-	return &defaultIntegralSoldeModel{
-		CachedConn: sqlc.NewConn(conn, c),
-		table:      "`integral_solde`",
-	}
-}
-
-func (m *defaultIntegralSoldeModel) Insert(data IntegralSolde) (sql.Result, error) {
-	query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?)", m.table, integralSoldeRowsExpectAutoSet)
-	ret, err := m.ExecNoCache(query, data.Id, data.PerManEntPoints, data.TimePoints, data.EndDate, data.CountPoints, data.AppId)
-
-	return ret, err
-}
-
-func (m *defaultIntegralSoldeModel) FindOne(endDate time.Time) (*IntegralSolde, error) {
-	integralSoldeEndDateKey := fmt.Sprintf("%s%v", cacheIntegralSoldeEndDatePrefix, endDate)
-	var resp IntegralSolde
-	err := m.QueryRow(&resp, integralSoldeEndDateKey, func(conn sqlx.SqlConn, v interface{}) error {
-		query := fmt.Sprintf("select %s from %s where `endDate` = ? limit 1", integralSoldeRows, m.table)
-		return conn.QueryRow(v, query, endDate)
-	})
-	switch err {
-	case nil:
-		return &resp, nil
-	case sqlc.ErrNotFound:
-		return nil, ErrNotFound
-	default:
-		return nil, err
-	}
-}
-
-func (m *defaultIntegralSoldeModel) Update(data IntegralSolde) error {
-	integralSoldeEndDateKey := fmt.Sprintf("%s%v", cacheIntegralSoldeEndDatePrefix, data.EndDate)
-	_, err := m.Exec(func(conn sqlx.SqlConn) (result sql.Result, err error) {
-		query := fmt.Sprintf("update %s set %s where `endDate` = ?", m.table, integralSoldeRowsWithPlaceHolder)
-		return conn.Exec(query, data.Id, data.PerManEntPoints, data.TimePoints, data.CountPoints, data.AppId, data.EndDate)
-	}, integralSoldeEndDateKey)
-	return err
-}
-
-func (m *defaultIntegralSoldeModel) Delete(endDate time.Time) error {
-
-	integralSoldeEndDateKey := fmt.Sprintf("%s%v", cacheIntegralSoldeEndDatePrefix, endDate)
-	_, err := m.Exec(func(conn sqlx.SqlConn) (result sql.Result, err error) {
-		query := fmt.Sprintf("delete from %s where `endDate` = ?", m.table)
-		return conn.Exec(query, endDate)
-	}, integralSoldeEndDateKey)
-	return err
-}
-
-func (m *defaultIntegralSoldeModel) formatPrimary(primary interface{}) string {
-	return fmt.Sprintf("%s%v", cacheIntegralSoldeEndDatePrefix, primary)
-}
-
-func (m *defaultIntegralSoldeModel) queryPrimary(conn sqlx.SqlConn, v, primary interface{}) error {
-	query := fmt.Sprintf("select %s from %s where `endDate` = ? limit 1", integralSoldeRows, m.table)
-	return conn.QueryRow(v, query, primary)
-}

rpc/model/solde.sql

@@ -1,10 +0,0 @@
-CREATE TABLE `integral_solde`
-(
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `perManEntPoints` int COMMENT '永久积分',
-  `timePoints` int COMMENT '时效积分',
-  `endDate` datetime COMMENT '有效期止',
-  `countPoints` int COMMENT '合计',
-  `appId` int(11) NOT NULL DEFAULT 10000 COMMENT '剑鱼标识',
-  PRIMARY KEY(`endDate`)
-) ENGINE=InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '积分结存表' ROW_FORMAT = DYNAMIC;

rpc/model/vars.go

@@ -1,5 +0,0 @@
-package model
-
-import "github.com/tal-tech/go-zero/core/stores/sqlx"
-
-var ErrNotFound = sqlx.ErrNotFound