From d2c1a4e9d74c81576a305efdb26c8987d7072e80 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Sun, 21 Apr 2019 20:13:31 +0800
Subject: [PATCH] =?UTF-8?q?-=20onWaybillNew=E4=B8=AD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=BF=A1=E6=81=AF=EF=BC=8C=E4=BB=A5=E6=9F=A5?=
 =?UTF-8?q?=E6=89=BEwaybill.duplilcateCount=E4=B8=8E=E8=A7=82=E5=AF=9F?=
 =?UTF-8?q?=E4=B8=8D=E7=AC=A6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/waybill.go | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/business/jxcallback/orderman/waybill.go b/business/jxcallback/orderman/waybill.go
index 7ffb2aab7..5e02511ad 100644
--- a/business/jxcallback/orderman/waybill.go
+++ b/business/jxcallback/orderman/waybill.go
@@ -46,15 +46,23 @@ func (w *OrderManager) onWaybillNew(bill2 *model.Waybill, db *dao.DaoDB) (isDupl
 			if !created {
 				bill.DuplicatedCount++
 				if bill2.VendorOrderID == bill2.VendorWaybillID { // 购物平台（比如京东）重新建的运单，单号始终是与订单相同的
+					globals.SugarLogger.Infof("onWaybillNew duplicated1, DuplicatedCount:%d, bill:%v msg received", bill2.DuplicatedCount, bill2)
 					bill2.ID = bill.ID
 					bill2.DuplicatedCount = bill.DuplicatedCount
-					db.Db.Update(bill2) //更新所有字段
+					err = utils.CallFuncLogError(func() error {
+						_, err = db.Db.Update(bill2) //更新所有字段
+						return err
+					}, "onWaybillNew Update1")
 				} else {
-					db.Db.Update(bill, "DuplicatedCount")
+					globals.SugarLogger.Infof("onWaybillNew duplicated2 DuplicatedCount:%d, bill:%v msg received", bill.DuplicatedCount, bill2)
 					isDuplicated = true
-					globals.SugarLogger.Infof("onWaybillNew duplicated bill:%v msg received", bill2)
+					err = utils.CallFuncLogError(func() error {
+						_, err = db.Db.Update(bill, "DuplicatedCount")
+						return err
+					}, "onWaybillNew Update2")
 				}
 			} else {
+				globals.SugarLogger.Debugf("onWaybillNew created bill:%v", bill2)
 				*bill2 = *bill
 			}
 		} else {