解决冲突

pkg/service/bundle/bundleOrder.go

@@ -139,6 +139,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 {
@@ -286,6 +287,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 金额和有效时间待修改
@@ -308,6 +311,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 {