订单导出字段修改

business/jxcallback/orderman/orderman_ext.go

@@ -362,8 +362,6 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
 								order.SkuInfo2 += ";" + skuStr + ";" + skuStr2
 							}
 						}
-					} else {
-						order.SkuInfo2 = ""
 					}
 				}
 				orders = orders2
@@ -404,8 +402,8 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
 						"waybillFinishedAt",
 						"status2",
 						"skuInfo",
-						"skuInfo2",
 						"waybillTipMoney",
+						"skuInfo2",
 					},
 				}
 				excelBin = excel.Obj2Excel([]*excel.Obj2ExcelSheetConfig{excelConf})

business/jxstore/cms/store_sku.go

@@ -4068,10 +4068,19 @@ func RefreshMatterStock(ctx *jxcontext.Context, skuID int) (err error) {
 }
 
 func buildStoreSkuBindInfosAndFocus(ctx *jxcontext.Context, db *dao.DaoDB, store *dao.StoreDetail, v *partner.SkuNameInfo, nameID int) (err error) {
-	var pricePercentagePack []*model.PricePercentageItem
+	var (
+		pricePercentagePack  []*model.PricePercentageItem
+		pricePercentagePack2 []*model.PricePercentageItem
+		jxPrice              = 0
+	)
 	skus, _ := dao.GetSkus(db, nil, []int{nameID}, nil, nil, nil)
 	err = jxutils.Strings2Objs(store.PricePercentagePackStr, &pricePercentagePack)
 	price := jxutils.CaculateJxPriceByPricePack(pricePercentagePack, 0, int(v.SkuList[0].VendorPrice))
+	store2, _ := dao.GetStoreDetail(db, store.ID, model.VendorIDJX)
+	if store2 != nil {
+		err = jxutils.Strings2Objs(store2.PricePercentagePackStr, &pricePercentagePack2)
+		jxPrice = jxutils.CaculatePriceByPricePack(pricePercentagePack2, 0, price)
+	}
 	skuBind := &model.StoreSkuBind{
 		StoreID:      store.ID,
 		UnitPrice:    price,
@@ -4079,6 +4088,7 @@ func buildStoreSkuBindInfosAndFocus(ctx *jxcontext.Context, db *dao.DaoDB, store
 		Status:       model.StoreSkuBindStatusNormal,
 		YbID:         utils.Str2Int64(v.SkuList[0].VendorSkuID),
 		YbPrice:      int(v.SkuList[0].VendorPrice),
+		JxPrice:      jxPrice,
 		YbSyncStatus: 0,
 	}
 	if len(skus) > 0 {