Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/sg/his_api_controller.go

@@ -572,12 +572,13 @@ func (c *HisApiController) GetSettleList() {
 		return
 	} else {
 		hisFundSettleListResult := &models.HisFundSettleListResult{
-			Number:    res.Output.Data.SetlListId,
+			Number:    res.Output.SetlListId,
 			Status:    1,
 			Ctime:     time.Now().Unix(),
 			Mtime:     time.Now().Unix(),
 			UserOrgId: c.GetAdminUserInfo().CurrentOrgId,
 			IsUpload:  1,
+			OrderId:   order_id,
 		}
 		service.CreateUploadRecord(hisFundSettleListResult)
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -1557,9 +1558,7 @@ type ResultSeventeen struct {
 	InfRefmsgid string `json:"inf_refmsgid"`
 	Infcode     int64  `json:"infcode"`
 	Output      struct {
-		Data struct {
-			SetlListId string `json:"setl_list_id"`
-		} `json:"data"`
+		SetlListId string `json:"setl_list_id"`
 	} `json:"output"`
 	RefmsgTime  string `json:"refmsg_time"`
 	RespondTime string `json:"respond_time"`