订单结算价根据活动结算价修改

business/jxcallback/orderman/order.go

@@ -364,8 +364,17 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.
 				salePrice = 0
 			}
 			v.EarningPrice = jxutils.CaculateSkuEarningPrice(v.ShopPrice, salePrice, storePayPercentage)
-			//重复购买有结算价的商品需要拆分，第一个商品按结算价，后面的商品按shopprice 或者 saleprice，然后把原来的商品信息删了
+			//TODO 重复购买有结算价的商品需要拆分，第一个商品按结算价，后面的商品按shopprice 或者 saleprice, 2020-05-06
-			if v.Count > 1 && v.EarningPrice != 0 {
+			if v.Count > 1 {
+				storeID := 0
+				if order.StoreID == 0 {
+					storeID = order.JxStoreID
+				} else {
+					storeID = order.StoreID
+				}
+				result, _ := dao.GetEffectiveActStoreSkuInfo(db, 0, nil, 0, []int{storeID}, []int{v.SkuID}, order.OrderCreatedAt, order.OrderCreatedAt)
+				if len(result) > 0 {
+					if result[0].EarningPrice != 0 {
 						sku := v
 						sku.Count = v.Count - 1
 						v.Count = 1
@@ -377,6 +386,8 @@ func (c *OrderManager) updateOrderSkuOtherInfo(order *model.GoodsOrder, db *dao.
 						orderSkus = append(orderSkus, sku)
 					}
 				}
+			}
+		}
 		// 直营店始终按比例结算，不考虑活动与结算表
 		if changePriceType != model.StoreChangePriceTypeManagedStore {
 			updateSingleOrderEarningPrice(order, db)

business/jxcallback/orderman/orderman_ext.go

@@ -332,7 +332,15 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
 							order.SkuInfo2 += ";" + skuStr1
 						}
 					} else if v.SkuCount2 > 1 {
-						if v.SkuEarningPrice != 0 {
+						storeID := 0
+						if v.StoreID == 0 {
+							storeID = v.JxStoreID
+						} else {
+							storeID = v.StoreID
+						}
+						result, _ := dao.GetEffectiveActStoreSkuInfo(dao.GetDB(), 0, nil, 0, []int{storeID}, []int{v.SkuID}, v.OrderCreatedAt, v.OrderCreatedAt)
+						if len(result) > 0 {
+							if result[0].EarningPrice != 0 {
 								skuStr1 := strings.Join([]string{
 									utils.Int2Str(v.SkuID),
 									utils.Int2Str(v.SkuCount2),
@@ -371,6 +379,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
 									order.SkuInfo += ";" + skuStr1
 									order.SkuInfo2 += ";" + skuStr2 + ";" + skuStr3
 								}
+							}
 						} else {
 							skuStr1 := strings.Join([]string{
 								utils.Int2Str(v.SkuID),