Merge branch 'crm1.0' of hongze/hongze_mobile_admin into master

services/company_approval_message.go

@@ -51,7 +51,14 @@ func AddCompanyApprovalMessage(createUserId, receiveUserId, companyId, companyAp
 			wxAppPath = "pages-todomessages/list/list?type=" + fmt.Sprint(sourceType)
 		}
 		//审批类型
-		wxMsgMap[1] = content
+		switch sourceType {
+		case 2:
+			wxMsgMap[1] = "合同审批"
+		case 3:
+			wxMsgMap[1] = "用印审批"
+		default:
+			wxMsgMap[1] = "客户审批"
+		}
 		//产生时间
 		wxMsgMap[2] = time.Now().Format(utils.FormatDateTime)
 		//任务描述

services/contract/contract_approval.go

@@ -719,6 +719,10 @@ func AfterApproved(contractId int) (err error) {
 
 		//randStr := utils.GetRandStringNoSpecialChar(28)
 		fileName := contractDetail.ContractCode + ".pdf"
+		//非正式环境下，文件名上面还是加上随机数
+		if utils.RunMode != "release" {
+			fileName = contractDetail.ContractCode + "_" + utils.GetRandStringNoSpecialChar(10) + ".pdf"
+		}
 		//上传到阿里云
 		resourceUrl, tmpErr := services.UploadAliyun(fileName, pdfPath)
 		if tmpErr != nil {

services/word.go

@@ -594,7 +594,7 @@ func GetHtmlByContractDetail(contractDetail *contract.ContractDetail, htmlType s
 		//优惠前金额（小写）
 		newDecimal := decimal.NewFromFloat(contractDetail.OriginalPrice)
 		originalPrice := newDecimal.String()
-		priceStr += "小写：" + originalPrice + "，"
+		priceStr += "小写：" + originalPrice + "元，"
 
 		//优惠前金额（大写）
 		originalCnyPrice, cnyErr := utils.ConvertNumToCny(contractDetail.OriginalPrice)