This commit is contained in:
suyl
2021-09-13 14:18:55 +08:00
parent 7ec5b4c56e
commit a2126b9762
2 changed files with 52 additions and 3 deletions

View File

@@ -5,6 +5,7 @@ import (
"errors"
"fmt"
"git.rosy.net.cn/jx-callback/business/authz/autils"
"git.rosy.net.cn/jx-callback/business/jxutils/excel"
"git.rosy.net.cn/jx-callback/business/jxutils/weixinmsg"
"git.rosy.net.cn/jx-callback/globals/api2"
beego "github.com/astaxie/beego/server/web"
@@ -2315,7 +2316,22 @@ func BuildFakeMatterOrder() {
task.GetResult(0)
}
func ExportOrderWithSku(ctx *jxcontext.Context, orders []*model.GoodsOrderExt) (url string, err error) {
func ExportOrderWithSku(ctx *jxcontext.Context, orders []*model.GoodsOrderExt) (downloadURL string, err error) {
//type ExportOrderWithSkuExt struct {
// StoreName string `json:"门店名"`
// VendorName string `json:"平台名"`
// OrderCreatedAt string `json:"下单时间"`
// VendorOrderID string `orm:"column(vendor_order_id)" json:"订单号"`
// EarningPrice int `json:"订单结算"`
// SkuName string `json:"商品名"`
// CategoryNameFst string `json:"一级分类名"`
// CategoryNameSnd string `json:"二级分类名"`
// ShopPrice int `json:"商品报价"`
// Count int `json:"数量"`
// EarningPriceSku int `json:"商品结算"`
// Upc string `json:"条形码"`
// IsAfs int `json:"是否已售后"`
//}
//var (
// db = dao.GetDB()
// excelTitle = []string{
@@ -2331,7 +2347,39 @@ func ExportOrderWithSku(ctx *jxcontext.Context, orders []*model.GoodsOrderExt) (
// "数量",
// "商品结算",
// "条形码",
// "是否已售后",
// }
// vendorOrderIDs []string
// results []*ExportOrderWithSkuExt
//)
return url, err
//for _, v := range orders {
// vendorOrderIDs = append(vendorOrderIDs, v.VendorOrderID)
//}
//sqlParams := []interface{}{}
//sql := `
// SELECT IF(a.vendor_id = 0, '京东',IF(a.vendor_id = 1, '美团',IF(a.vendor_id = 3, '饿百','不明'))) vendor_name, a.order_created_at, a.vendor_order_id,
// IF(b.earning_type = 1, b.earning_price, b.total_shop_money * (100-b.order_pay_percentage/2)/100) /100 earning_price,
// a.shop_price /100 shop_price, a.count, IF(b.earning_type = 1, a.earning_price, 0) /100 earning_price_sku, a.sku_name, d.upc,
// e.name store_name, f.name category_name_fst, g.name category_name_snd,
// FROM order_sku a
//LEFT JOIN goods_order b ON a.vendor_order_id = b.vendor_order_id
//LEFT JOIN sku c ON c.id = a.sku_id
//LEFT JOIN sku_name d ON d.id = c.name_id
//LEFT JOIN store e ON IF(b.jx_store_id = 0, b.store_id, b.jx_store_id) = e.id
//LEFT JOIN sku_category f ON f.id = d.category_id
//LEFT JOIN sku_category g ON g.id = f.parent_id
//LEFT JOIN order_sku_financial h ON h.vendor_order_id = a.vendor_order_id AND h.sku_id = a.sku_id AND
// WHERE a.vendor_order_id IN
// ORDER BY '平台名', '订单号'
//`
//var sheetList []*excel.Obj2ExcelSheetConfig
//excelConf := &excel.Obj2ExcelSheetConfig{
// Title: "sheet1",
// Data: results,
// CaptionList: excelTitle,
//}
//sheetList = append(sheetList, excelConf)
//downloadURL, _, err = jxutils.UploadExeclAndPushMsg(sheetList, "订单导出")
//baseapi.SugarLogger.Debug("WriteToExcel: dataSuccess downloadURL: [%v]", downloadURL)
return downloadURL, err
}

View File

@@ -1043,7 +1043,8 @@ func NotifyKnowledge(storeID int, title string) (err error) {
"value": "",
},
}
return SendMsgToStore(storeID, templateID, globals.WxBackstageHost+fmt.Sprintf("%s%d", WX_TO_ORDER_PAGE_URL, storeID), "/pages/pagesStore/msg-list/main", data)
//globals.WxBackstageHost+fmt.Sprintf("%s%d", WX_TO_ORDER_PAGE_URL, storeID)
return SendMsgToStore(storeID, templateID, "http://wx.jxc4.com/#/?jxStoreId=668229&test=1", "/pages/pagesStore/msg-list/main", data)
}
func SendUserMessage(ctx *jxcontext.Context, title, content string, userIDs []string, isAsync, isContinueWhenError bool) (hint string, err error) {