Browse Source

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

csx 3 years ago
parent
commit
7cbe3869c5
3 changed files with 547 additions and 372 deletions
  1. 1 1
      conf/app.conf
  2. 541 371
      controllers/sz/sz_his_api_controller.go
  3. 5 0
      service/his_service.go

+ 1 - 1
conf/app.conf View File

44
 
44
 
45
 
45
 
46
 [prod]
46
 [prod]
47
-org_id = 9504
47
+org_id = 10138
48
 mobile_token_expiration_second = 86400
48
 mobile_token_expiration_second = 86400
49
 httpdomain = https://api.xt.kuyicloud.com
49
 httpdomain = https://api.xt.kuyicloud.com
50
 sso_domain = https://sso.kuyicloud.com
50
 sso_domain = https://sso.kuyicloud.com

File diff suppressed because it is too large
+ 541 - 371
controllers/sz/sz_his_api_controller.go


+ 5 - 0
service/his_service.go View File

1247
 		Find(&order).Error
1247
 		Find(&order).Error
1248
 	return
1248
 	return
1249
 }
1249
 }
1250
+
1251
+func GetNewHisOrderThree(mdtrt_id string) (order HisOrder, err error) {
1252
+	err = readDb.Model(&HisOrder{}).Where("status = 1 AND mdtrt_id=?  ", mdtrt_id).First(&order).Error
1253
+	return
1254
+}