This commit is contained in:
桀尼龟 2025-06-13 22:38:03 +08:00
parent a439342ba2
commit 8449969682
3 changed files with 870 additions and 847 deletions

File diff suppressed because it is too large Load Diff

View File

@ -138,6 +138,7 @@ func CreateBundleOrderAddSignature(c *gin.Context) {
req.SignedTime = common.GetBeijingTime()
req.ExpirationDate = expirationDate
req.AddPriceOptionsList = addPriceList
req.OrderUUID = orderRecordResp.OrderRecord.Uuid
// 当前 未将 签名 写入合同中
signContract, signContractErr := logic.SignContractV2(req.CustomerNum, bundleDetail.Bundle.Contract, totalAmount, expirationDate)
if signContractErr != nil {
@ -285,6 +286,8 @@ func CreateBundleOrderSignature(c *gin.Context) {
//服务类型为时长 计算
if addService.ServiceType == 5 {
expirationDay = calculateExpirationDate(time.Now(), i.Num, addService.Unit)
} else {
expirationDay = time.Now().AddDate(0, 0, 7).Format("2006-01-02")
}
}
// 当前 未将 签名 写入合同中 todo 金额和有效时间待修改
@ -307,6 +310,7 @@ func CreateBundleOrderSignature(c *gin.Context) {
req.Status = bundleModel.OrderSigned
req.AddRecords = addRecords
req.ExpirationTime = expirationDay
req.PayType = 1
res, err := service.BundleProvider.CreateOrderRecord(context.Background(), &req)
if err != nil {

View File

@ -23,9 +23,9 @@ var PaymentProvider = new(payment.PaymentCentClientImpl)
func init() {
config.SetConsumerService(BundleProvider)
config.SetConsumerService(OrderProvider)
config.SetConsumerService(AccountProvider)
config.SetConsumerService(PaymentProvider)
//config.SetConsumerService(OrderProvider)
//config.SetConsumerService(AccountProvider)
//config.SetConsumerService(PaymentProvider)
config.SetConsumerService(AccountFieeProvider)
if err := config.Load(); err != nil {