From 98f443379d852b1cf8957a4b7da07bcb6cc704ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 7 Apr 2021 14:00:43 +0800
Subject: [PATCH] aa

---
 business/jxcallback/orderman/order.go        | 10 ++++++++++
 business/partner/purchase/jdshop/callback.go |  1 +
 2 files changed, 11 insertions(+)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 95e139e33..cb0e98a5e 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -1533,6 +1533,16 @@ func TransferJdsOrder(ctx *jxcontext.Context, vendorOrderID string, storeID int)
 	for _, sku := range skus {
 		sku.VendorOrderID = order.VendorOrderID
 		sku.ID = 0
+		var storesSku *model.StoreSkuBind
+		sql := `
+			SELECT * FROM store_sku_bind WHERE deleted_at = ? AND store_id = ? AND jds_id = ?
+		`
+		sqlParams := []interface{}{utils.DefaultTimeValue, model.JdShopMainStoreID, sku.VendorSkuID}
+		if err = dao.GetRow(db, &storesSku, sql, sqlParams); err == nil && storesSku != nil {
+			if realStoresSkus, err := dao.GetStoresSkusInfo(db, []int{storeID}, []int{storesSku.SkuID}); err == nil && len(realStoresSkus) > 0 {
+				sku.ShopPrice = int64(realStoresSkus[0].Price)
+			}
+		}
 		order.Skus = append(order.Skus, sku)
 	}
 	setJdsOrderSeq(order)
diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go
index 7ee6160f0..abd9ead88 100644
--- a/business/partner/purchase/jdshop/callback.go
+++ b/business/partner/purchase/jdshop/callback.go
@@ -125,6 +125,7 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
 	}
 	if utils.Str2Float64(msg.BalanceUsed) != 0 {
 		order.ActualPayPrice += jxutils.StandardPrice2Int(utils.Str2Float64(msg.BalanceUsed))
+		order.TotalShopMoney += utils.Float64TwoInt64(math.Round(float64(jxutils.StandardPrice2Int(utils.Str2Float64(msg.BalanceUsed))) * jdshopapi.JdsPayPercentage))
 	}
 	if len(msg.ConsigneeInfo.Mobile) != 11 {
 		order.ConsigneeMobile = Decrypt(msg.ConsigneeInfo.Mobile, msg.VendorOrgCode)