From 0fd69d25e103062a23e7640a1140c9c28b177fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 28 Feb 2020 11:19:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=81=94=E5=AE=9D=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go             | 28 +++++++++----------
 business/partner/purchase/jx/localjx/order.go |  1 -
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 7ccf820d9..aa2f22cf0 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -3627,14 +3627,14 @@ func RefreshJxPriceByVendor(ctx *jxcontext.Context, jdStoreSkus []*JdStoreSkus,
 					for kk, vv := range v {
 						result, err := dao.GetStoreSkuBindByNameID(db, k, kk, model.SkuStatusNormal)
 						if len(result) > 0 && err == nil {
-							// if result[0].UnitPrice > vv {
-							storeSkuBindInfo := &StoreSkuBindInfo{
-								StoreID:   k,
-								NameID:    kk,
-								UnitPrice: vv,
+							if result[0].UnitPrice > vv {
+								storeSkuBindInfo := &StoreSkuBindInfo{
+									StoreID:   k,
+									NameID:    kk,
+									UnitPrice: vv,
+								}
+								param = append(param, storeSkuBindInfo)
 							}
-							param = append(param, storeSkuBindInfo)
-							// }
 						}
 					}
 				}
@@ -3672,14 +3672,14 @@ func RefreshJxPriceByVendor(ctx *jxcontext.Context, jdStoreSkus []*JdStoreSkus,
 					for kk, vv := range v {
 						result, err := dao.GetStoreSkuBindByNameID(db, k, kk, model.SkuStatusNormal)
 						if len(result) > 0 && err == nil {
-							// if result[0].UnitPrice > vv {
-							storeSkuBindInfo := &StoreSkuBindInfo{
-								StoreID:   k,
-								NameID:    kk,
-								UnitPrice: vv,
+							if result[0].UnitPrice > vv {
+								storeSkuBindInfo := &StoreSkuBindInfo{
+									StoreID:   k,
+									NameID:    kk,
+									UnitPrice: vv,
+								}
+								param = append(param, storeSkuBindInfo)
 							}
-							param = append(param, storeSkuBindInfo)
-							// }
 						}
 					}
 				}
diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go
index 44a9e2658..3481d2303 100644
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -587,7 +587,6 @@ func CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string)
 		db := dao.GetDB()
 		payList, err2 := dao.GetOrderPayList(db, order.VendorOrderID, jxutils.GetPossibleVendorIDFromVendorOrderID(order.VendorOrderID))
 		if err = err2; err == nil {
-			globals.SugarLogger.Debugf("CancelOrderTL1, [%v]", payList)
 			for _, orderPay := range payList {
 				globals.SugarLogger.Debugf("CancelOrderTL2, [%v]", *orderPay)
 				if orderPay.Status == model.PayStatusYes {