linmadan / mmm-worth · 提交

转到一个项目

作者 陈志颖
提交 3ee77f42954e54818de5cc2f07b7f59b4bbc4be4 1 个父辈 e5957254

test:测试导入

内嵌 并排对比
正在显示 3 个修改的文件 包含 11 行增加 和 5 行删除
@@ -29,6 +29,7 @@ require ( @@ -29,6 +29,7 @@ require (
29 github.com/yudai/gojsondiff v1.0.0 // indirect 29 github.com/yudai/gojsondiff v1.0.0 // indirect
30 github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect 30 github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
31 github.com/yudai/pp v2.0.1+incompatible // indirect 31 github.com/yudai/pp v2.0.1+incompatible // indirect
  32 + golang.org/x/tools v0.0.0-20200117065230-39095c1d176c
32 ) 33 )
33 34
34 replace gitlab.fjmaimaimai.com/linmadan/mmm-worth => ../mmm-worth 35 replace gitlab.fjmaimaimai.com/linmadan/mmm-worth => ../mmm-worth
@@ -204,6 +204,7 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -204,6 +204,7 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
204 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= 204 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
205 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= 205 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
206 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= 206 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
  207 +golang.org/x/tools v0.0.0-20200117065230-39095c1d176c h1:FodBYPZKH5tAN2O60HlglMwXGAeV/4k+NKbli79M/2c=
207 golang.org/x/tools v0.0.0-20200117065230-39095c1d176c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= 208 golang.org/x/tools v0.0.0-20200117065230-39095c1d176c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
208 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 209 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
209 google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= 210 google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
@@ -394,9 +394,12 @@ func (controller *SuMoneyController) ExchangeCashListRanking() { @@ -394,9 +394,12 @@ func (controller *SuMoneyController) ExchangeCashListRanking() {
394 // 导入兑换素币清单 394 // 导入兑换素币清单
395 func (controller *SuMoneyController) ImportExchangeList () { 395 func (controller *SuMoneyController) ImportExchangeList () {
396 cashPoolService := service.NewCashPoolService(nil) 396 cashPoolService := service.NewCashPoolService(nil)
397 - importExchangeCashListCommand := &command.ImportExchangeCashListCommand{}  
398 - json.Unmarshal(controller.Ctx.Input.GetData("requestBody").([]byte), importExchangeCashListCommand)  
399 - //fmt.Printf("命令：%+v\n", importExchangeCashListCommand) 397 + //importExchangeCashListCommand := &command.ImportExchangeCashListCommand{}
  398 + //json.Unmarshal(controller.Ctx.Input.GetData("requestBody").([]byte), importExchangeCashListCommand)
  399 + //fmt.Printf("命令：%+v\n", importExchangeCashListCommand.Where)
  400 + fmt.Print(controller.GetString("where"), "\n")
  401 + where := controller.GetString("where")
  402 + //fmt.Print(reflect.TypeOf(importExchangeCashListCommand.Where), "\n")
400 file, h, _ := controller.GetFile("file") 403 file, h, _ := controller.GetFile("file")
401 404
402 // 错误信息返回 405 // 错误信息返回
@@ -478,8 +481,9 @@ func (controller *SuMoneyController) ImportExchangeList () { @@ -478,8 +481,9 @@ func (controller *SuMoneyController) ImportExchangeList () {
478 if i > 2 && len(row) > 1 { 481 if i > 2 && len(row) > 1 {
479 // 创建兑换清单命令 482 // 创建兑换清单命令
480 createExchangeCashPersonCommand := &command.CreateExchangeCashPersonCommand{} 483 createExchangeCashPersonCommand := &command.CreateExchangeCashPersonCommand{}
481 - createExchangeCashPersonCommand.ExchangeCashActivityId ,err = strconv.ParseInt(importExchangeCashListCommand.Where["activityId"].(string), 10, 64)  
482 - createExchangeCashPersonCommand.Operator = importExchangeCashListCommand.Where["uid"].(int64) 484 + //createExchangeCashPersonCommand.ExchangeCashActivityId = importExchangeCashListCommand.Where["activityId"].(int64)
  485 + createExchangeCashPersonCommand.ExchangeCashActivityId = int64(where[0])
  486 + createExchangeCashPersonCommand.Operator = int64(where[1])
483 createExchangeCashPersonCommand.PersonName = row[0] 487 createExchangeCashPersonCommand.PersonName = row[0]
484 createExchangeCashPersonCommand.PersonAccount = row[1] 488 createExchangeCashPersonCommand.PersonAccount = row[1]
485 r2, _ := strconv.ParseFloat(row[2], 64) 489 r2, _ := strconv.ParseFloat(row[2], 64)