aa

2021-09-13 09:09:17 +08:00
parent bbb3a27ca6
commit f07752806d
5 changed files with 86 additions and 12 deletions
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -555,7 +555,9 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.
 					}
 					v.SkuName = jxutils.ComposeSkuNameOriginal(skuBindInfo.Prefix, skuBindInfo.Name, skuBindInfo.Comment, skuBindInfo.Unit, skuBindInfo.SpecQuality, skuBindInfo.SpecUnit, 0)
 					v.Weight = skuBindInfo.Weight // 以本地信息中的WEIGHT为准
-					v.Upc = skuBindInfo.Upc
+					if v.Upc == "" {
+						v.Upc = skuBindInfo.Upc
+					}
 					//饿鲜达的订单做一下处理
 					if strings.Contains(order.StoreName, model.ExdStoreName) {
 						if v.SkuID == 0 && !strings.Contains(v.SkuName, "免费") {
@@ -2312,3 +2314,24 @@ func BuildFakeMatterOrder() {
 	tasksch.HandleTask(task, nil, true).Run()
 	task.GetResult(0)
 }
+
+func ExportOrderWithSku(ctx *jxcontext.Context, orders []*model.GoodsOrderExt) (url string, err error) {
+	var (
+		db         = dao.GetDB()
+		excelTitle = []string{
+			"门店名",
+			"平台名",
+			"下单时间",
+			"订单号",
+			"订单结算",
+			"商品名",
+			"一级分类名",
+			"二级分类名",
+			"商品报价",
+			"数量",
+			"商品结算",
+			"条形码",
+		}
+	)
+	return url, err
+}
--- a/business/jxstore/cms/store.go
+++ b/business/jxstore/cms/store.go
@@ -1486,19 +1486,19 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor

 	delete(payload, "bussinessStatus")

-	var vendorOrgCode = ""
-	if payload["vendorOrgCode"].(string) == "" {
-		return 0, fmt.Errorf("平台账号不能为空")
-	} else {
-		vendorOrgCode = payload["vendorOrgCode"].(string)
-	}
+	//var vendorOrgCode = ""
+	//if payload["vendorOrgCode"].(string) == "" {
+	//	return 0, fmt.Errorf("平台账号不能为空")
+	//} else {
+	//	vendorOrgCode = payload["vendorOrgCode"].(string)
+	//}
 	if db == nil {
 		db = dao.GetDB()
 	}
 	storeMap := &model.StoreMap{
-		StoreID:       storeID,
-		VendorID:      vendorID,
-		VendorOrgCode: vendorOrgCode,
+		StoreID:  storeID,
+		VendorID: vendorID,
+		//VendorOrgCode: vendorOrgCode,
 	}
 	storeMap.DeletedAt = utils.DefaultTimeValue
 	if err = dao.GetEntity(db, storeMap, model.FieldStoreID, model.FieldVendorID, "VendorOrgCode", model.FieldDeletedAt); err != nil {
@@ -1564,13 +1564,13 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
 				num, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, storeMap, valid, userName, map[string]interface{}{
 					model.FieldStoreID:  storeID,
 					model.FieldVendorID: vendorID,
-					"VendorOrgCode":     vendorOrgCode,
+					//"VendorOrgCode":     vendorOrgCode,
 				}, model.FieldSyncStatus, syncStatus)
 			} else {
 				num, err = dao.UpdateEntityLogically(db, storeMap, valid, userName, map[string]interface{}{
 					model.FieldStoreID:  storeID,
 					model.FieldVendorID: vendorID,
-					"VendorOrgCode":     vendorOrgCode,
+					//"VendorOrgCode":     vendorOrgCode,
 				})
 			}
 			if err != nil {
--- a/business/partner/purchase/jd/order.go
+++ b/business/partner/purchase/jd/order.go
@@ -340,6 +340,9 @@ func Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) {
 			VendorPrice:   utils.MustInterface2Int64(product["skuStorePrice"]),
 			SalePrice:     utils.MustInterface2Int64(product["skuJdPrice"]),
 		}
+		if product["upcCode"] != nil && product["upcCode"].(string) != "" {
+			sku.Upc = product["upcCode"].(string)
+		}
 		if jdPromotionType := int(utils.MustInterface2Int64(product["promotionType"])); jdPromotionType != 0 && jdPromotionType != jdapi.PromotionTypeNormal {
 			sku.StoreSubName = utils.Int2Str(jdPromotionType)
 		}
--- a/business/partner/purchase/mtwm/order.go
+++ b/business/partner/purchase/mtwm/order.go
@@ -249,6 +249,9 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 			VendorPrice:   jxutils.StandardPrice2Int(utils.MustInterface2Float64(product["price"])),
 			SalePrice:     jxutils.StandardPrice2Int(utils.MustInterface2Float64(product["price"])),
 		}
+		if product["upc"] != nil && product["upc"].(string) != "" {
+			sku.Upc = product["upc"].(string)
+		}
 		if sku.VendorSkuID == "" {
 			if !strings.Contains(product["app_food_code"].(string), "mtcode") {
 				sku.VendorSkuID = product["app_food_code"].(string)
--- a/controllers/jx_order.go
+++ b/controllers/jx_order.go
@@ -1246,3 +1246,48 @@ func (c *OrderController) DelOrderSkuInfo() {
 		return retVal, "", err
 	})
 }
+
+// @Title 导出订单
+// @Description 导出订单
+// @Param	token			header	string	true	"认证token"
+// @Param	orderID			query	string	false	"订单号，如果此项不为空，忽略其它所有查询条件（此项会废弃，用vendorOderID）"
+// @Param	vendorOrderID	query	string	false	"订单号，如果此项不为空，忽略其它所有查询条件"
+// @Param	keyword			query	string	false	"查询关键字"
+// @Param	fromDate		query	string	false	"开始日期（包含），格式（2006-01-02），如果订单号为空此项必须要求"
+// @Param	toDate			query	string	false	"结束日期（包含），格式（2006-01-02），如果订单号为空此项必须要求"
+// @Param	isDateFinish	query	bool	false	"是否fromDate与toDate指的是订单结束日期，缺省不是"
+// @Param	vendorIDs		query	string	false	"订单所属厂商列表[1,2,3]，缺省不限制"
+// @Param	waybillVendorIDs	query	string		false	"承运人所属厂商列表[1,2,3]，缺省不限制"
+// @Param	storeIDs		query	string	false	"京西门店ID列表[1,2,3]，缺省不限制"
+// @Param	statuss			query	string	false	"订单状态列表[1,2,3]，缺省不限制"
+// @Param	lockStatuss		query	string	false	"订单锁定状态列表[1,2,3]，缺省不限制"
+// @Param	cities			query	string	false	"城市code列表[1,2,3]，缺省不限制"
+// @Param	isIncludeFake	query	bool	false	"是否包括假订单"
+// @Param	skuIDs			query	string	false	"包含的skuID列表，或的关系"
+// @Param	isJxFirst		query	bool	false	"排序是否京西订单优先（缺省为否）"
+// @Param	adjustCount		query	int		false	"最小调整次数"
+// @Param	brandID			query	int		false	"品牌ID"
+// @Param	mustInvoice		query	bool	false	"是否必须要求开发票"
+// @Param	deliveryTypes	query	string	false	"配送方式"
+// @Param	jxIncomeBegin	query	string	false	"预计收入begin"
+// @Param	jxIncomeEnd		query	string	false	"预计收入end"
+// @Param	marketManPhone	query	string	false	"平台负责人"
+// @Param	jdPhone			query	string	false	"京东负责人电话"
+// @Param	mtPhone			query	string	false	"美团负责人电话"
+// @Param	ebaiPhone		query	string	false	"饿百负责人电话"
+// @Param	offset			query	int		false	"结果起始序号（以0开始，缺省为0）"
+// @Param	pageSize		query	int		false	"结果页大小（缺省为50，-1表示全部）"
+// @Success 200 {object} controllers.CallResult
+// @Failure 200 {object} controllers.CallResult
+// @router /ExportOrderWithSku [get]
+func (c *OrderController) ExportOrderWithSku() {
+	c.callExportOrderWithSku(func(params *tOrderExportOrderWithSkuParams) (retVal interface{}, errCode string, err error) {
+		var skuIDs []int
+		jxutils.Strings2Objs(params.SkuIDs, &skuIDs)
+		page, err := orderman.FixedOrderManager.GetOrders(params.Ctx, params.IsIncludeFake, params.FromDate, params.ToDate, params.IsDateFinish, skuIDs, params.IsJxFirst, params.MapData, params.Offset, params.PageSize)
+		if page != nil && page.Data != nil {
+			retVal, err = orderman.ExportOrderWithSku(params.Ctx, page.Data.([]*model.GoodsOrderExt))
+		}
+		return retVal, "", err
+	})
+}