Compare commits
No commits in common. "37e05c5e7026a42e510d58111c92bc8e38dea37e" and "a8ccc3ba74e12311d08700ff8d995a231237019f" have entirely different histories.
37e05c5e70
...
a8ccc3ba74
@ -22,8 +22,6 @@ import (
|
|||||||
"github.com/gin-gonic/gin/binding"
|
"github.com/gin-gonic/gin/binding"
|
||||||
)
|
)
|
||||||
|
|
||||||
const ContractUrl = "https://e-cdn.fontree.cn/fonchain-main/prod/file/contract/saas/template-25122501.pdf"
|
|
||||||
|
|
||||||
func DeleteBundleOrder(c *gin.Context) {
|
func DeleteBundleOrder(c *gin.Context) {
|
||||||
var req bundle.DeleteValueAddServiceRequest
|
var req bundle.DeleteValueAddServiceRequest
|
||||||
if err := c.ShouldBindBodyWith(&req, binding.JSON); err != nil {
|
if err := c.ShouldBindBodyWith(&req, binding.JSON); err != nil {
|
||||||
@ -261,8 +259,7 @@ func CreateBundleOrderSignature(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
func VerificationSignature(c *gin.Context) {
|
func VerificationSignature(c *gin.Context) {
|
||||||
type VerificationSignature struct {
|
type VerificationSignature struct {
|
||||||
Signature bool `json:"signature"`
|
Signature bool `json:"signature"`
|
||||||
SignatureUrl string `json:"signature_url"`
|
|
||||||
}
|
}
|
||||||
res := VerificationSignature{Signature: false}
|
res := VerificationSignature{Signature: false}
|
||||||
userInfo := login.GetUserInfoFromC(c)
|
userInfo := login.GetUserInfoFromC(c)
|
||||||
@ -315,14 +312,6 @@ func VerificationSignature(c *gin.Context) {
|
|||||||
|
|
||||||
if order.ReSignature == 1 {
|
if order.ReSignature == 1 {
|
||||||
res.Signature = true
|
res.Signature = true
|
||||||
contract := ContractUrl
|
|
||||||
expirationDate := expirationTime.Format("2006-01-02")
|
|
||||||
signContract, err := logic.SignContractV2(userInfo.SubNum, contract, 0, expirationDate, userInfo.Name, userInfo.IdNumber, userInfo.PlaceOfResidence)
|
|
||||||
if err != nil {
|
|
||||||
service.Error(c, err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
res.SignatureUrl = signContract
|
|
||||||
}
|
}
|
||||||
|
|
||||||
service.Success(c, res)
|
service.Success(c, res)
|
||||||
@ -367,7 +356,7 @@ func RestartSignature(c *gin.Context) {
|
|||||||
service.Error(c, err)
|
service.Error(c, err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
contract := ContractUrl
|
contract := "https://e-cdn.fontree.cn/fonchain-main/prod/file/contract/saas/template-25122501.pdf"
|
||||||
signContract, err := logic.SignContractV2(userInfo.SubNum, contract, 0, expirationDate, userInfo.Name, userInfo.IdNumber, userInfo.PlaceOfResidence)
|
signContract, err := logic.SignContractV2(userInfo.SubNum, contract, 0, expirationDate, userInfo.Name, userInfo.IdNumber, userInfo.PlaceOfResidence)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
service.Error(c, err)
|
service.Error(c, err)
|
||||||
|
|||||||
@ -358,7 +358,7 @@ func AutoCreateUserAndOrder(c *gin.Context) {
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
// 当前 未将 签名 写入合同中 todo 金额和有效时间待修改
|
// 当前 未将 签名 写入合同中 todo 金额和有效时间待修改
|
||||||
contract := ContractUrl
|
contract := "https://e-cdn.fontree.cn/fonchain-main/prod/file/contract/saas/template-25122501.pdf"
|
||||||
expirationDay = t.AddDate(1, 0, 0).Format("2006-01-02")
|
expirationDay = t.AddDate(1, 0, 0).Format("2006-01-02")
|
||||||
|
|
||||||
signContract, signContractErr := logic.SignContractV2(userReq.UserNum, contract, TotalPrice, expirationDay, unfinishInfo.UserName, unfinishInfo.CardNum, unfinishInfo.PlaceOfResidence)
|
signContract, signContractErr := logic.SignContractV2(userReq.UserNum, contract, TotalPrice, expirationDay, unfinishInfo.UserName, unfinishInfo.CardNum, unfinishInfo.PlaceOfResidence)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user