历史排班

controllers/his_api_controller.go

@@ -2982,6 +2982,9 @@ func (c *HisApiController) CreateHisPrescription() {
 								if s.Price != lastWarehouse.RetailPrice {
 									s.Price = lastWarehouse.RetailPrice
 								}
+								if s.Price == 0 {
+									s.Price = lastWarehouse.RetailPrice
+								}
 							}
 
 							service.CreateHisDoctorAdvice(&s)
@@ -3678,6 +3681,15 @@ func (c *HisApiController) EditHisPrescription() {
 								c.ServeFailJSONWithSGJErrorCode(errcode)
 								return
 							}
+
+							if adminInfo.CurrentOrgId == 10215 || adminInfo.CurrentOrgId == 3877 {
+								storeConfig, _ := service.GetAllStoreHouseConfig(adminInfo.CurrentOrgId)
+								lastWarehouse, _ := service.FindLastDrugWarehousingInfoByID(s.DrugId, storeConfig.DrugStorehouseOut)
+								if s.Price == 0 {
+									s.Price = lastWarehouse.RetailPrice
+								}
+							}
+
 							service.CreateHisDoctorAdvice(&s)
 							//记录日志
 							byterequest, _ := json.Marshal(s)

controllers/sign_api_controller.go

@@ -73,6 +73,12 @@ func SignApiRegistRouters() {
 
 	beego.Router("/api/device/uploadprintorder", &SignApiController{}, "Post:UploadPrintOrder")
 
+	//sdk 版本
+	beego.Router("/api/device/createqianshuusername", &SignApiController{}, "Post:CreateQianshuUserName")
+
+	//发送消息
+	beego.Router("/api/device/createskdsendinformation", &SignApiController{}, "Post:CreateSdkSendInformation")
+
 }
 
 // 短信服务接口
@@ -499,8 +505,9 @@ func (this *SignApiController) CreateNewPersionSeal() {
 
 	lastPerson, _ := service.GetLastPersonEnterPrise(admin_user_id, orgId)
 
-	personSeal, personSealId := service.CreateNewPersionSeal(lastPerson.UserId)
+	//personSeal, personSealId := service.CreateNewPersionSeal(lastPerson.UserId)
 
+	personSeal, personSealId := service.CreateSKDPersionSeal(lastPerson.UserId)
 	service.UpdatePerseEnterPriseById(lastPerson.ID, personSealId)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"personSeal": personSeal,
@@ -511,17 +518,70 @@ func (this *SignApiController) CreateNewPersionSeal() {
 
 func (this *SignApiController) CreateNewEnterPrise() {
 
-	orgId := this.GetAdminUserInfo().CurrentOrgId
-
-	admin_user_id, _ := this.GetInt64("admin_user_id")
-
-	enterPrise, _ := service.GetEnterPriseByUserOrgId(orgId)
-	fmt.Println("地址日活", enterPrise.Enterpriseid)
-	lastPerson, _ := service.GetLastPersonEnterPrise(admin_user_id, orgId)
+	//orgId := this.GetAdminUserInfo().CurrentOrgId
+	//
+	//admin_user_id, _ := this.GetInt64("admin_user_id")
+	//
+	//enterPrise, _ := service.GetEnterPriseByUserOrgId(orgId)
+	//fmt.Println("地址日活", enterPrise.Enterpriseid)
+	//lastPerson, _ := service.GetLastPersonEnterPrise(admin_user_id, orgId)
+	//
+	//newEnterPrise, sealId := service.CreateNewEnterPrise(enterPrise.Enterpriseid, lastPerson.UserId)
+	//
+	//fmt.Println("newEnterPrise",newEnterPrise)
+	//service.UpdatePersonEnterPrise(lastPerson.ID, sealId)
 
-	newEnterPrise, sealId := service.CreateNewEnterPrise(enterPrise.Enterpriseid, lastPerson.UserId)
+	newEnterPrise, _ := service.CreateSDKEnterPrise()
 
-	service.UpdatePersonEnterPrise(lastPerson.ID, sealId)
+	//var url string
+	//url = "http://localhost:8890/sdk/seal/createEnterpriseSeal"
+	//appId := beego.AppConfig.String("sign_appid")
+	//
+	//serviceKye := beego.AppConfig.String("serviceKye")
+	//
+	//serviceCode := beego.AppConfig.String("serviceCode")
+	//
+	//maprequest := make(map[string]interface{})
+	//
+	//maprequest["sealType"] = 1
+	//maprequest["enterpriseName"] = "深圳伊森时光科技有限公司"
+	//maprequest["horizontalText"] = "财务专用章"
+	//
+	//byterequest, _ := json.Marshal(maprequest)
+	//reader := bytes.NewReader(byterequest)
+	//
+	//signatureStr, _ := service.GenerateHMACSHA1SignatureTwo(maprequest, serviceKye, serviceCode)
+	//fmt.Println("signatureStr", signatureStr)
+	//request, err := http.NewRequest("POST", url, reader)
+	//
+	//fmt.Println("request23222222222222222", request)
+	//if err != nil {
+	//	fmt.Println(err.Error())
+	//}
+	//
+	//request.Header.Set("appId", appId)
+	//request.Header.Set("serviceCode", serviceCode)
+	//request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	//request.Header.Set("Content-Signature", signatureStr)
+	//client := http.Client{}
+	//
+	//resp, err := client.Do(request)
+	//if err != nil {
+	//	fmt.Println(err.Error())
+	//
+	//}
+	//respBytes, err := ioutil.ReadAll(resp.Body)
+	//if err != nil {
+	//	fmt.Println(err.Error())
+	//
+	//}
+	//str := string(respBytes)
+	//fmt.Println("strwowowowowo", str)
+	//
+	//var respJSON map[string]interface{}
+	//if err := json.Unmarshal([]byte(string(respBytes)), &respJSON); err != nil {
+	//	utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+	//}
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"newEnterPrise": newEnterPrise,
@@ -572,3 +632,23 @@ func (this *SignApiController) UploadPrintOrder() {
 	})
 
 }
+
+func (this *SignApiController) CreateQianshuUserName() {
+
+	sign, userId := service.CreateQianshuUserName()
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"sign":   sign,
+		"userId": userId,
+	})
+}
+
+func (this *SignApiController) CreateSdkSendInformation() {
+
+	information, orderId := service.CreateSdkSendInformation()
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"information": information,
+		"orderId":     orderId,
+	})
+}

service/sign_service.go

@@ -103,6 +103,31 @@ func generateHMACSHA1SignatureOne(data interface{}, key, serviceCode string) (st
 	return "HMAC-SHA1 " + signature, nil
 }
 
+func GenerateHMACSHA1SignatureTwo(data interface{}, key, serviceCode string) (string, error) {
+	// 将数据转换为 JSON 格式的字节数组
+	jsonData, err := json.Marshal(data)
+	if err != nil {
+		return "", err
+	}
+
+	// 将密钥和 serviceCode 进行拼接
+	signingKey := key + serviceCode
+
+	// 将签名密钥转换为字节数组
+	keyBytes := []byte(signingKey)
+
+	// 创建一个新的 HMAC-SHA1 实例
+	h := hmac.New(sha1.New, keyBytes)
+
+	// 将 JSON 数据添加到 HMAC 实例中
+	h.Write(jsonData)
+
+	signature := base64.StdEncoding.EncodeToString(h.Sum(nil))
+
+	// 返回带有前缀的签名字符串
+	return "HMAC-SHA1 " + signature, nil
+}
+
 func CreateUserName(phone string, disPlayName string) (string, string) {
 
 	var url string
@@ -1077,6 +1102,67 @@ func CreateNewPersionSeal(userId string) (string, string) {
 	return str, personSealId
 }
 
+func CreateSKDPersionSeal(userId string) (string, string) {
+
+	maprequest := make(map[string]interface{})
+
+	//maprequest["userId"] = userId
+
+	//印章字体 1宋体（默认）2 黑体
+	maprequest["fontType"] = 1
+	//个人姓名（1-42位字符）
+	maprequest["personName"] = "王志文"
+	var url string
+	url = "http://localhost:8890/sdk/seal/createPersonSeal"
+	appId := beego.AppConfig.String("sign_appid")
+
+	fmt.Println("appId", appId)
+	serviceKye := beego.AppConfig.String("serviceKye")
+	fmt.Println("serviceKye", serviceKye)
+	serviceCode := beego.AppConfig.String("serviceCode")
+
+	fmt.Println("serviceCode", serviceCode)
+	byterequest, _ := json.Marshal(maprequest)
+	reader := bytes.NewReader(byterequest)
+
+	signatureStr, ERR := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	fmt.Println(ERR)
+
+	request, err := http.NewRequest("POST", url, reader)
+	fmt.Println("errwowowoowowowow", err)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+
+	request.Header.Set("appId", appId)
+	request.Header.Set("serviceCode", serviceCode)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("Content-Signature", signatureStr)
+	client := http.Client{}
+
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+	fmt.Println("strwoooooooooooooooooooo", str)
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(respBytes)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+	}
+	var personSealId string
+	//personSealId = respJSON["data"].(map[string]interface{})["personSealId"].(string)
+	//fmt.Println("str", personSealId)
+	return str, personSealId
+}
+
 func UpdatePerseEnterPriseById(id int64, personSealId string) error {
 
 	err := XTWriteDB().Model(models.XtDevicePersonEnterprise{}).Where("id= ? and status =1", id).Updates(map[string]interface{}{"person_seal_id": personSealId}).Error
@@ -1111,7 +1197,7 @@ func CreateNewEnterPrise(enterpriseId string, userId string) (string, string) {
 
 	request, err := http.NewRequest("POST", url, reader)
 
-	fmt.Println("request23222222222222222", request)
+	fmt.Println("中国人民欢迎您", request)
 	if err != nil {
 		fmt.Println(err.Error())
 	}
@@ -1145,6 +1231,61 @@ func CreateNewEnterPrise(enterpriseId string, userId string) (string, string) {
 	return str, sealId
 }
 
+func CreateSDKEnterPrise() (string, string) {
+
+	var url string
+	url = "http://localhost:8890/sdk/seal/createEnterpriseSeal"
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	serviceCode := beego.AppConfig.String("serviceCode")
+
+	maprequest := make(map[string]interface{})
+
+	maprequest["sealType"] = 1
+	maprequest["enterpriseName"] = "深圳伊森时光科技有限公司"
+	maprequest["horizontalText"] = "财务专用章"
+
+	byterequest, _ := json.Marshal(maprequest)
+	reader := bytes.NewReader(byterequest)
+
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	request, err := http.NewRequest("POST", url, reader)
+
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+
+	request.Header.Set("appId", appId)
+	request.Header.Set("serviceCode", serviceCode)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("Content-Signature", signatureStr)
+	client := http.Client{}
+
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(respBytes)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+	}
+	var sealId string
+	//sealId = respJSON["data"].(map[string]interface{})["sealId"].(string)
+	//fmt.Println("sealId", sealId)
+	return str, sealId
+}
+
 func UpdatePersonEnterPrise(id int64, sealId string) error {
 
 	err := XTWriteDB().Model(models.XtDevicePersonEnterprise{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"seal_id": sealId}).Error
@@ -1381,3 +1522,145 @@ func GetDataConfigDisinfectionFluid(org_id int64) (models.Dataconfig, error) {
 
 	return dataconfig, err
 }
+
+func CreateQianshuUserName() (string, string) {
+
+	var url string
+
+	url = "http://localhost:8090/sdk/user/create"
+	var account string
+
+	account = "13318464642"
+
+	var realName string
+
+	realName = "马文强"
+
+	maprequest := make(map[string]interface{})
+
+	maprequest["account"] = account
+
+	//账号类型：1手机号，2邮箱
+	maprequest["accountType"] = 1
+
+	maprequest["realName"] = realName
+
+	//签署人类型 1个人 2.企业
+	maprequest["signerType"] = 1
+
+	// 0表示 身份证
+	maprequest["cardType"] = 0
+
+	maprequest["cardNumber"] = "430526199408156511"
+
+	byterequest, _ := json.Marshal(maprequest)
+
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	serviceCode := beego.AppConfig.String("serviceCode")
+
+	reader := bytes.NewReader(byterequest)
+
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	fmt.Println(signatureStr)
+
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+	fmt.Println("请求参数", request)
+	fmt.Println("Content-Signature", signatureStr)
+	fmt.Println("appID", appId)
+	fmt.Println("serviceCode", serviceCode)
+	request.Header.Set("appId", appId)
+	request.Header.Set("serviceCode", serviceCode)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("Content-Signature", signatureStr)
+	client := http.Client{}
+
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(respBytes)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+	}
+	var UserId string
+	UserId = respJSON["data"].(map[string]interface{})["userId"].(string)
+	fmt.Println("str", UserId)
+	return str, UserId
+}
+
+func CreateSdkSendInformation() (string, string) {
+
+	var url string
+
+	url = "http://localhost:8090/sdk/msg/sendMsg"
+
+	maprequest := make(map[string]interface{})
+
+	maprequest["phone"] = "13318464642"
+
+	maprequest["signType"] = "pdf"
+
+	byterequest, _ := json.Marshal(maprequest)
+
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
+
+	serviceCode := beego.AppConfig.String("serviceCode")
+
+	reader := bytes.NewReader(byterequest)
+
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
+
+	fmt.Println(signatureStr)
+
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
+	fmt.Println("请求参数", request)
+	fmt.Println("Content-Signature", signatureStr)
+	fmt.Println("appID", appId)
+	fmt.Println("serviceCode", serviceCode)
+	request.Header.Set("appId", appId)
+	request.Header.Set("serviceCode", serviceCode)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("Content-Signature", signatureStr)
+	client := http.Client{}
+
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(respBytes)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+	}
+	var orderId string
+	orderId = respJSON["data"].(map[string]interface{})["orderId"].(string)
+	fmt.Println("str", orderId)
+	return str, orderId
+}