合并分支 'dev' 到 'test'

fix:修改默认栏目设置



查看合并请求 !25

@@ -157,7 +157,7 @@ func (columnSettingService *ColumnSettingService) ListColumnSetting(listColumnSe
 
 
 /**
 /**
  * @Author SteveChan
  * @Author SteveChan
- * @Description //TODO 删除用户时移除栏目设置
+ * @Description // 删除用户时移除栏目设置
  * @Date 23:14 2021/1/26
  * @Date 23:14 2021/1/26
  * @Param
  * @Param
  * @return
  * @return

@@ -963,7 +963,6 @@ func (service OrderInfoService) ListOrderForExcel(listOrderQuery query.ListOrder
 	var resultMaps []map[string]string
 	var resultMaps []map[string]string
 	for i := range ordersData {
 	for i := range ordersData {
 		t, _ := time.ParseInLocation("2006-01-02 15:04:05", ordersData[i].SaleDate, time.Local)
 		t, _ := time.ParseInLocation("2006-01-02 15:04:05", ordersData[i].SaleDate, time.Local)
-		fmt.Print(t, "\n")
 		m := map[string]string{
 		m := map[string]string{
 			//"num":               fmt.Sprint(i + 1),
 			//"num":               fmt.Sprint(i + 1),
 			//"order_code":        ordersData[i].OrderCode,
 			//"order_code":        ordersData[i].OrderCode,

@@ -159,6 +159,13 @@ func (controller *ColumnSettingController) ResetColumn() {
 	controller.ServeJSON()
 	controller.ServeJSON()
 }
 }
 
 
+/**
+ * @Author SteveChan
+ * @Description // 获取栏目列表
+ * @Date 14:03 2021/2/1
+ * @Param
+ * @return
+ **/
 func (controller *ColumnSettingController) ListColumnSetting() {
 func (controller *ColumnSettingController) ListColumnSetting() {
 	columnSettingService := service.NewColumnSettingService(nil)
 	columnSettingService := service.NewColumnSettingService(nil)
 	listColumnSettingQuery := &query.ListColumnSettingQuery{}
 	listColumnSettingQuery := &query.ListColumnSettingQuery{}
@@ -176,3 +183,23 @@ func (controller *ColumnSettingController) ListColumnSetting() {
 	controller.Data["json"] = response
 	controller.Data["json"] = response
 	controller.ServeJSON()
 	controller.ServeJSON()
 }
 }
+
+/**
+ * @Author SteveChan
+ * @Description //返回默认栏目设置
+ * @Date 14:06 2021/2/1
+ * @Param
+ * @return
+ **/
+func (controller *ColumnSettingController) ListDefaultColumnSetting() {
+	data := map[string]interface{}{
+		"orderBaseColumns": map[string]interface{}{
+			"selected":   domain.DefaultColumns,
+			"unselected": domain.DefaultInvalidColumns,
+		},
+	}
+	var response utils.JsonResponse
+	response = utils.ResponseData(controller.Ctx, data)
+	controller.Data["json"] = response
+	controller.ServeJSON()
+}

@@ -41,12 +41,13 @@ func init() {
 			beego.NSRouter("/actual/del", &controllers.OrderInfoController{}, "POST:RemoveOrderReal"),          // 删除实际订单
 			beego.NSRouter("/actual/del", &controllers.OrderInfoController{}, "POST:RemoveOrderReal"),          // 删除实际订单
 			beego.NSRouter("/actual/update", &controllers.OrderInfoController{}, "POST:UpdateOrderReal"),       // 新增实际订单
 			beego.NSRouter("/actual/update", &controllers.OrderInfoController{}, "POST:UpdateOrderReal"),       // 新增实际订单
 			beego.NSRouter("/actual/close", &controllers.OrderInfoController{}, "POST:OrderDisable"),
 			beego.NSRouter("/actual/close", &controllers.OrderInfoController{}, "POST:OrderDisable"),
-			beego.NSRouter("/fileImportTemplate", &controllers.OrderInfoController{}, "POST:DownloadTemplate"),         // 下载导入模板
-			beego.NSRouter("/fileImport", &controllers.OrderInfoController{}, "POST:ImportOrderFromExcel"),             // 导入订单数据
-			beego.NSRouter("/actual/listColumn", &controllers.ColumnSettingController{}, "POST:GetColumnSetting"),      // 返回栏目设置列表
-			beego.NSRouter("/actual/updateColumn", &controllers.ColumnSettingController{}, "POST:UpdateColumnSetting"), // 更新栏目设置
-			beego.NSRouter("/actual/resetColumn", &controllers.ColumnSettingController{}, "POST:ResetColumn"),          // 重置栏目设置
-			beego.NSRouter("/actual/createColumn", &controllers.ColumnSettingController{}, "POST:CreateColumnSetting"), // 创建栏目设置，测试用
+			beego.NSRouter("/fileImportTemplate", &controllers.OrderInfoController{}, "POST:DownloadTemplate"),                   // 下载导入模板
+			beego.NSRouter("/fileImport", &controllers.OrderInfoController{}, "POST:ImportOrderFromExcel"),                       // 导入订单数据
+			beego.NSRouter("/actual/listColumn", &controllers.ColumnSettingController{}, "POST:GetColumnSetting"),                // 返回栏目设置列表
+			beego.NSRouter("/actual/updateColumn", &controllers.ColumnSettingController{}, "POST:UpdateColumnSetting"),           // 更新栏目设置
+			beego.NSRouter("/actual/resetColumn", &controllers.ColumnSettingController{}, "POST:ResetColumn"),                    // 重置栏目设置
+			beego.NSRouter("/actual/createColumn", &controllers.ColumnSettingController{}, "POST:CreateColumnSetting"),           // 创建栏目设置，测试用
+			beego.NSRouter("/actual/listDefaultColumn", &controllers.ColumnSettingController{}, "POST:ListDefaultColumnSetting"), // 返回默认栏目设置
 		),
 		),
 		beego.NSNamespace("/common",
 		beego.NSNamespace("/common",
 			beego.NSRouter("/partner", &controllers.CommonController{}, "POST:GetPartnerList"),
 			beego.NSRouter("/partner", &controllers.CommonController{}, "POST:GetPartnerList"),