Merge branch 'jng' into dev

pkg/router/bundle.go

@@ -10,8 +10,6 @@ import (
 func BundleRouter(r *gin.RouterGroup) {
 	bundleRoute := r.Group("bundle")
 	bundleRoute.Use(middleware.CheckWebLogin(service.AccountProvider))
-	bundleAppRoute := r.Group("bundle")
-	bundleAppRoute.Use(middleware.CheckLogin(service.AccountFieeProvider))
 	// 套餐
 	{
 		bundleClientRoute := bundleRoute.Group("system")
@@ -19,10 +17,9 @@ func BundleRouter(r *gin.RouterGroup) {
 			bundleClientRoute.POST("create", bundle.CreateBundle)
 			bundleClientRoute.POST("update", bundle.UpdateBundle)
 			bundleClientRoute.POST("remove", bundle.DeleteBundle)
-			bundleClientRoute.POST("bundle-list", bundle.BundleList)
 		}
 
-		bundleAppRoute = bundleAppRoute.Group("common")
+		bundleAppRoute := bundleRoute.Group("common")
 		{
 			bundleAppRoute.POST("bundle-list", bundle.BundleList)
 		}

pkg/router/bundleOrder.go

@@ -15,12 +15,12 @@ func BundleOrderRouter(r *gin.RouterGroup) {
 
 	bundleOrderRoute := r.Group("bundle-order")
 	bundleOrderRoute.Use(middleware.CheckLogin(service.AccountFieeProvider))
-	//bundleOrderWebRoute := r.Group("bundle-order")
+	bundleOrderWebRoute := r.Group("bundle-order")
-	//bundleOrderWebRoute.Use(middleware.CheckWebLogin(service.AccountProvider))
+	bundleOrderWebRoute.Use(middleware.CheckWebLogin(service.AccountProvider))
 
 	// 套餐
 	{
-		bundleOrderClientWebRoute := bundleOrderRoute.Group("common/web")
+		bundleOrderClientWebRoute := bundleOrderWebRoute.Group("common/web")
 		{
 			bundleOrderClientWebRoute.POST("bundle-order-list", bundle.OrderRecordsList)
 		}
@@ -31,8 +31,8 @@ func BundleOrderRouter(r *gin.RouterGroup) {
 
 		//bundleOrderWebRoute := bundleOrderRoute.Group("web")
 		{
-			bundleOrderRoute.POST("financial-confirm", bundle.UpdateFinancialConfirmationStatus)
+			bundleOrderWebRoute.POST("financial-confirm", bundle.UpdateFinancialConfirmationStatus)
-			bundleOrderRoute.POST("order-export", bundle.ExportOrderInfo)
+			bundleOrderWebRoute.POST("order-export", bundle.ExportOrderInfoOss)
 		}
 
 		bundleOrderAppRoute := bundleOrderRoute.Group("app")

pkg/router/router.go

@@ -62,8 +62,7 @@ func NewRouter() *gin.Engine {
 			acRoute.POST("update", account.UserUpdate)  //用户更新
 		}
 		webAcRouter := privateGroup.Group("/user")
-		//webAcRouter.Use(middleware.CheckWebLogin(service.AccountProvider))
+		webAcRouter.Use(middleware.CheckWebLogin(service.AccountProvider))
-		webAcRouter.Use(middleware.CheckLogin(service.AccountFieeProvider))
 		{
 			webAcRouter.POST("list", account.UserList)         //用户列表
 			webAcRouter.POST("approval", account.UserApproval) //实名审核

pkg/router/valueAddBundle.go

@@ -12,9 +12,6 @@ func ValueAddBundleRouter(r *gin.RouterGroup) {
 	valueAddBundleRoute := r.Group("valueAdd-bundle")
 	valueAddBundleRoute.Use(middleware.CheckWebLogin(service.AccountProvider))
 
-	valueAddBundleAppRoute := r.Group("valueAdd-bundle/app")
-	valueAddBundleAppRoute.Use(middleware.CheckLogin(service.AccountFieeProvider))
-
 	// 增值套餐
 	{
 		bundleClientRoute := valueAddBundleRoute.Group("system")
@@ -24,11 +21,6 @@ func ValueAddBundleRouter(r *gin.RouterGroup) {
 			bundleClientRoute.POST("detail", bundle.ValueAddBundleDetail)
 		}
 
-		valueAddBundleAppRoute = valueAddBundleAppRoute.Group("system")
-		{
-			valueAddBundleAppRoute.POST("list", bundle.ValueAddBundleList)
-		}
-
 	}
 
 }

pkg/service/bundle/bundleOrder.go

@@ -12,6 +12,7 @@ import (
 	"fonchain-fiee/pkg/service/bundle/common"
 	"fonchain-fiee/pkg/service/bundle/logic"
 	bundleModel "fonchain-fiee/pkg/service/bundle/model"
+	"fonchain-fiee/pkg/service/upload"
 	"math/big"
 	"strconv"
 	"strings"
@@ -426,8 +427,93 @@ func ExportOrderInfo(c *gin.Context) {
 		}
 	}
 
-	var exportUrl = strings.Replace(strings.Replace(filePath, ".", fmt.Sprintf("%s://%s", httpType, c.Request.Host), 1), "runtime", "api/static", 1)
+	var exportUrl = strings.Replace(strings.Replace(filePath, ".", fmt.Sprintf("%s://%s", httpType, c.Request.Host), 1), "runtime", "api/fiee/static", 1)
 	//var exportUrl = fmt.Sprintf("%s%s/%s", httpType, c.Request.Host, dirPath + path)
 	fmt.Println("exportUrl : ", exportUrl)
 	service.Success(c, &bundleModel.ExportResponse{ExportUrl: exportUrl})
 }
+
+func ExportOrderInfoOss(c *gin.Context) {
+	var req bundle.OrderRecordsRequest
+
+	if err := c.ShouldBindBodyWith(&req, binding.JSON); err != nil {
+		service.Error(c, err)
+		return
+	}
+
+	res, err := service.BundleProvider.OrderRecordsList(context.Background(), &req)
+	if err != nil {
+		service.Error(c, err)
+		return
+	}
+
+	rows := make([][]interface{}, 0)
+
+	for _, orderRecord := range res.OrderRecords {
+		if orderRecord.CustomerID != "" {
+			var userID uint64
+			userID, err = strconv.ParseUint(orderRecord.CustomerID, 10, 64)
+			if err != nil {
+				err = nil
+				continue
+			}
+
+			userInfo, _ := service.AccountFieeProvider.Info(context.Background(), &accountFiee.InfoRequest{
+				Domain: "app",
+				ID:     userID,
+			})
+			if userInfo != nil {
+				orderRecord.Sex = userInfo.Sex
+				orderRecord.Nationality = userInfo.Nationality
+				orderRecord.TelNum = userInfo.TelNum
+			}
+		}
+
+		status := ""
+		if orderRecord.Status == bundleModel.OrderSigned {
+			status = "未支付"
+		} else if orderRecord.Status == bundleModel.OrderPaid {
+			status = "已支付"
+		}
+		financialConfirmation := ""
+		if orderRecord.FinancialConfirmation == bundleModel.UnConfirm {
+			financialConfirmation = "未确认"
+		} else if orderRecord.FinancialConfirmation == bundleModel.Confirmed {
+			financialConfirmation = "已确认"
+		}
+
+		rows = append(rows, []interface{}{
+			orderRecord.OrderNo,
+			orderRecord.CustomerNum,
+			orderRecord.CustomerName,
+			orderRecord.Sex,
+			orderRecord.TelNum,
+			orderRecord.Nationality,
+			orderRecord.BundleName,
+			orderRecord.SignedTime,
+			orderRecord.Amount,
+			orderRecord.Num,
+			orderRecord.ValueAddBundleAmount,
+			orderRecord.TotalAmount,
+			status,
+			orderRecord.PayTime,
+			financialConfirmation,
+		})
+	}
+
+	dirPath := "./runtime"
+
+	filePath, err := logic.WriteToExcel(dirPath, rows)
+	if err != nil {
+		service.Error(c, err)
+		return
+	}
+
+	exportUrl, err := upload.PutBos(filePath, "excel", true)
+	if err != nil {
+		service.Error(c, err)
+		return
+	}
+
+	service.Success(c, &bundleModel.ExportResponse{ExportUrl: exportUrl})
+}