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

controllers/zh/zh_his_api_controller.go

@@ -1375,7 +1375,7 @@ func (c *ZHHisApiController) GetPreSettleInfo() {
 		return
 	} else {
 		//order, _ := service.GetHisOrderTwo(adminUser.CurrentOrgId, chrg_bchno, id)
-		order.OrderStatus = 2
+		order.OrderStatus = 1
 		order.MdtrtId = res.Output.Setlinfo.MdtrtID
 		order.SetlId = res.Output.Setlinfo.SetlID
 		order.PsnNo = res.Output.Setlinfo.PsnNo
@@ -1428,11 +1428,11 @@ func (c *ZHHisApiController) GetPreSettleInfo() {
 		setlDetail, _ := json.Marshal(res.Output.Setldetail)
 		detailStr := string(setlDetail)
 		order.SetlDetail = detailStr
-		err := service.UpdataOrderStatusTwo(chrg_bchno, c.GetAdminUserInfo().CurrentOrgId)
-		err = service.UpDateOrder(order)
+		//err := service.UpdataOrderStatusTwo(chrg_bchno, c.GetAdminUserInfo().CurrentOrgId)
+		err := service.UpDateOrder(order)
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
-				"msg": "结算成功",
+				"msg": "预结算成功",
 			})
 		} else {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAmountAccountException)