From 927c261f0dc86df59845e126fb4885b9d24719d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 17 Aug 2020 15:00:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AE=A1=E7=AE=97=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/auth2/auth2.go                       |  2 --
 business/jxcallback/orderman/order.go         |  2 +-
 business/jxutils/jxutils.go                   |  2 +-
 business/partner/purchase/jx/localjx/order.go | 17 ++++++++++-------
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/business/auth2/auth2.go b/business/auth2/auth2.go
index 9c90e713d..1afde6854 100644
--- a/business/auth2/auth2.go
+++ b/business/auth2/auth2.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/base64"
 	"errors"
-	"fmt"
 	"regexp"
 	"strings"
 	"time"
@@ -296,7 +295,6 @@ func LoginInternal(ctx *Context, authType, authID, authIDType, authSecret string
 	} else {
 		err = ErrIllegalAuthType
 	}
-	fmt.Println("testauthInfo", utils.Format4Output(authInfo, false))
 	return authInfo, err
 }
 
diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 41e665df1..0e0ae072b 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -215,7 +215,7 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
 						// 	}
 						// } else {
 						if order.NewEarningPrice == 0 || order.NewEarningPrice != (order.TotalShopMoney-waybill.DesiredFee)*int64(100-store.PayPercentage/2)/int64(100) {
-							order.NewEarningPrice = (order.TotalShopMoney - waybill.DesiredFee) * int64(100-store.PayPercentage/2) / int64(100)
+							order.NewEarningPrice = order.TotalShopMoney*int64(100-store.PayPercentage/2)/int64(100) - waybill.DesiredFee
 						}
 						// }
 					}
diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go
index c7288df87..c56c1af1a 100644
--- a/business/jxutils/jxutils.go
+++ b/business/jxutils/jxutils.go
@@ -606,7 +606,7 @@ func RefreshOrderEarningPrice3(order *model.GoodsOrder, payPercentage int, bill
 		// if order.VendorID == model.VendorIDJDShop || order.VendorID == model.VendorIDJX {
 		// 	order.NewEarningPrice = (order.TotalShopMoney - bill.DesiredFee) * int64((100 - payPercentage)) / 100
 		// } else {
-		order.NewEarningPrice = (order.TotalShopMoney - bill.DesiredFee) * int64((100 - payPercentage/2)) / 100
+		order.NewEarningPrice = order.TotalShopMoney*int64((100-payPercentage/2))/100 - bill.DesiredFee
 		// }
 	} else {
 		order.NewEarningPrice = order.EarningPrice
diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 7dbb93ca8..08400ba92 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -1466,14 +1466,17 @@ func GetMatterOrderStatus(ctx *jxcontext.Context, vendorOrderID string) (result
 	if err != nil {
 		return nil, err
 	}
-	for _, v := range queryOrderStatus.OrderStatusList {
-		matter := &MatterOrderStatus{}
-		matter.Time = utils.Str2Time(v.OperateTime)
-		matter.Status = v.SoStatusName
-		matter.Name = v.SoStatusName
-		matter.Sign = 1
-		result = append(result, matter)
+	if len(queryOrderStatus.OrderStatusList) > 0 {
+		for _, v := range queryOrderStatus.OrderStatusList {
+			matter := &MatterOrderStatus{}
+			matter.Time = utils.Str2Time(v.OperateTime)
+			matter.Status = v.SoStatusName
+			matter.Name = v.SoStatusName
+			matter.Sign = 1
+			result = append(result, matter)
+		}
 	}
+
 	if len(getTrackMessagePlusByOrderResult.ResultData) > 0 {
 		for _, vv := range getTrackMessagePlusByOrderResult.ResultData {
 			matter := &MatterOrderStatus{}