Updata：解决冲突

pkg/service/bundle/reconciliation.go

@@ -494,14 +494,14 @@ func AutoCreateUserAndOrder(c *gin.Context) {
 
 		//生成发票
 		orderRecord, err := service.BundleProvider.GetOrderInfoByOrderNo(context.Background(), &bundle.GetOrderInfoByOrderNoReq{
-			Uuid: unfinishInfo.OrderNo, //因为需求更新，实际传入的是订单的uuid
+			OrderNo: unfinishInfo.OrderNo, //因为需求更新，实际传入的是订单的uuid
 		})
 		if err != nil {
 			service.Error(c, err)
 			return
 		}
 		amountType := strconv.FormatInt(orderRecord.AmountType, 10)
-		applyTime := common.GetBeijingTime()
+		applyTime := unfinishInfo.PayTime
 		payTime, _ := time.Parse("2006-01-02 15:04:05", applyTime)
 		payTimeString := payTime.Format("20060102")
 		fmt.Println("发票payTimeString :", payTimeString, "发票applyTime :", applyTime, "发票payTime :", payTime)