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

controllers/sg/his_api_controller.go

@@ -1140,19 +1140,16 @@ func (c *HisApiController) GetSettleList() {
 		return
 	}
 	if res.Infcode != 0 {
-		order.FaPiaoNumber = zero
-		order.FaPiaoCode = last_order.FaPiaoCode
-		err := service.UpdateOrder(order)
-		if err != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		}
+
 		c.ServeSuccessJSON(map[string]interface{}{
 			"failed_code": -10,
 			"msg":         res.ErrMsg,
 		})
 		return
 	} else {
+		order.FaPiaoNumber = zero
+		order.FaPiaoCode = last_order.FaPiaoCode
+		service.UpdateOrder(order)
 		hisFundSettleListResult := &models.HisFundSettleListResult{
 			Number:    res.Output.SetlListId,
 			Status:    1,