tijiao

rpc/activity.go

@@ -50,7 +50,6 @@ func init() {
 		log.Fatal("数据库连接失败:", err)
 	}
 	fmt.Println(config.ConfigJson.DataSource+"链接成功")
-
 	redisCfg := config.ConfigJson.Redis
 	if redisCfg.Addr != "" {
 		e := util.InitRedisPool(redisCfg.Modules, redisCfg.Addr, redisCfg.PoolMaxSize, redisCfg.PoolMaxIdle, redisCfg.IdleTimeout)

rpc/activity.proto

@@ -6,18 +6,24 @@ message Request {
   int64 activityId= 1;//活动标识
   string userId=2;//用户标识
   string appId=3;//身份标识
-  int64  Page=4;
-  int64  PageSize=5;
+  int64  page=4;
+  int64  pageSize=5;
   int64  model=6;//1查看名下所有奖券 0查看可以使用的奖券(没有过期的)
   string userName=7;//用户名称
 }
 message LotteryOperation{
    repeated int64 lotteryIdArr=1;//奖券标识集合
    string userId=2;//用户标识
-   string AppId=3;//身份标识
-   string UserName=4;//用户名称
+   string appId=3;//身份标识
+   string userName=4;//用户名称
+   string orderCode=5;//订单编号
+}
+message UpdateStateReq{
+   string userId=1;//用户标识
+   string appId=;//身份标识
+   string orderCode=3;//订单编号
+   int    model=4;0待用1取消
 }
-
 
 message Response {
    int64 code =1;    //响应代码
@@ -51,6 +57,8 @@ service Activity {
   rpc activityLottery(Request) returns(activityLotteryResp);
   //奖券领取
   rpc lotteryReceive(LotteryOperation) returns(Response);
+  //修改奖券状态
+  rpc lotteryStatus(UpdateStateReq) returns(Response);
   //奖券使用
   rpc activityUse(LotteryOperation) returns(Response);
   //用户可用的奖券

rpc/test/test1_test.go

@@ -60,5 +60,5 @@ func Test_ActivityUse(t *testing.T)  {
 }
 func Test_timme(t *testing.T)  {
 	tn:= time.Now().Format("2006-01-02 15:04:05")
-	fmt.Println(time.)
+	fmt.Println(tn)
 }

service/ActivityService.go

@@ -6,7 +6,6 @@ import (
 	"app.yhyue.com/moapp/jyMarketing/util"
 	"fmt"
 	_ "github.com/garyburd/redigo/redis"
-	"golang.org/x/text/date"
 	"log"
 	"time"
 )
@@ -66,15 +65,14 @@ func (service *ActivityService) LotteryReceive(data *activity.LotteryOperation,
 		userLettry.AppId = data.AppId
 		userLettry.UserId = data.UserId
 		userLettry.PrizeType = 0
-		tn, _ := time.Parse("2006-01-02 15:04:05", t)
-		userLettry.CreateTime =tn.
+	/*	userLettry.CreateTime =tn.*/
 		userLettry.LotteryId = lotteryId
 		userLettry.PrizeId = prizeData.PrizeId
 		userLettry.ValidityDates = prizeData.ValidityDates
 		userLettry.Name = prizeData.Name
 		userLettry.Full = int64(prizeData.Full)
 		userLettry.Reduce = int64(prizeData.Reduce)
-		//userLettry.UserName=data.
+		userLettry.UserName=data.UserName
 		//0、有起止时间1、当天起几天可用2、次日起几天可用
 		switch prizeData.ValidityTimeType {
 		case 0:
@@ -141,7 +139,9 @@ func (service *ActivityService) ActivityUse(data *activity.LotteryOperation) (in
 			orm.Rollback()
 			return entity.ErrorCode, "该用户没有此此奖券"
 		}
-		//2、奖券状态改为已使用
+		//2、奖券是否过期
+
+		//3、奖券状态改为已使用
 		userLotteryList[0].UseDate = time.Now()
 		userLotteryList[0].PrizeType = 1
 		numb, err := orm.Table("user_prize").ID(userLotteryList[0].Id).Cols("prizeType", "useDate").Update(userLotteryList[0])
@@ -150,7 +150,7 @@ func (service *ActivityService) ActivityUse(data *activity.LotteryOperation) (in
 			orm.Rollback()
 			return entity.ErrorCode, "修改用户奖券失败"
 		}
-		//3、修改卷的使用量
+		//4、修改卷的使用量
 		lottery := entity.Lottery{}
 		lottery.Id = lotteryId
 		_, err = orm.Exec("UPDATE lottery SET `useNumber` = useNumber+1 WHERE `id` = ?", lotteryId)