Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

business/partner/purchase/ebai/financial.go

@@ -50,6 +50,11 @@ func (p *PurchaseHandler) onFinancialMsg(msg *ebaiapi.CallbackMsg) (response *eb
 			if err == nil {
 				err = CurPurchaseHandler.OnOrderDetail(orderMap, partner.UpdatedPeration)
 			}
+			// 部分订单在隐私条约的保护下会隐藏用户收货地址,转自送成功自后才可以获取到正确的地址.
+			userMap := orderMap["user"].(map[string]interface{})
+			order, _ := partner.CurOrderManager.LoadOrder(vendorOrderID, model.VendorIDEBAI)
+			order.ConsigneeAddress = utils.Interface2String(userMap["address"])
+			partner.CurOrderManager.UpdateOrderFields(order, []string{"ConsigneeMobile"})
 		}
 	}
 	return api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, msg.Cmd)

business/partner/purchase/jd/store.go

@@ -204,6 +204,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 			}
 			storeParams.StoreNotice = store.PromoteInfo
 			modifyCloseStatus := false
+			//storeParams.CloseStatus = store.JdStoreStatus
 			if store.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagDeletedMask|model.SyncFlagStoreStatus) != 0 {
 				modifyCloseStatus = true
 				_, storeParams.CloseStatus = JxStoreStatus2JdStatus(jxutils.MergeStoreStatus(store.Status, store.JdStoreStatus)) // 1storeParams.CloseStatus