Merge remote-tracking branch 'origin/jdshop' into mark

2020-08-24 10:21:19 +08:00
parent fde5bbde83 8901bb2a13
commit 5d041591e1
3 changed files with 10 additions and 6 deletions
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -1297,8 +1297,12 @@ func RefreshJdShopOrdersEarningPrice(ctx *jxcontext.Context, orderStartTime, ord
 			order := &model.GoodsOrder{}
 			order.VendorOrderID = utils.Int64ToStr(v.OrderID)
 			dao.GetEntity(db, order, "VendorOrderID")
+			storeDeatil, _ := dao.GetStoreDetail(db, jxutils.GetSaleStoreIDFromOrder(order), order.VendorID)
 			order.TotalShopMoney = utils.Float64TwoInt64(v.DueAmount * 100)
-			dao.UpdateEntity(db, order, "TotalShopMoney")
+			if order.NewEarningPrice == 0 {
+				jxutils.RefreshOrderEarningPrice2(order, storeDeatil.PayPercentage)
+			}
+			dao.UpdateEntity(db, order, "TotalShopMoney", "NewEarningPrice")
 		}
 	}
 	return err