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

business/jxcallback/scheduler/defsch/defsch.go

@@ -1707,6 +1707,9 @@ func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder, isAuto bool) {
 	if order.Flag&model.OrderFlagMaskFake == 0 && order.VendorID != model.VendorIDEBAI {
 		utils.CallFuncAsync(func() {
 			// order = setFakeActualPayPrice(order)
+			if order.VendorStoreID == "7290541" {
+				globals.SugarLogger.Debugf("==================test := %s", utils.Format4Output(order, false))
+			}
 			netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder, nil)
 			//目前暂且认为AdjustCount > 0 就是调整单
 			if order.AdjustCount > 0 {

business/partner/purchase/mtwm/store.go

@@ -463,11 +463,11 @@ func (c *PurchaseHandler) UpdateStoreLineStatus(ctx *jxcontext.Context, vendorOr
 	mtwmApi := getAPI(vendorOrgCode, storeID, vendorStoreID)
 	switch lineStatus {
 	case model.StoreStatusOpened:
-		if err = mtwmApi.PoiOnline(vendorStoreID); err != nil {
+		if err = mtwmApi.PoiOnline(vendorStoreID); err == nil {
 			err = mtwmApi.PoiOpen(vendorStoreID)
 		}
 	default:
-		if err = mtwmApi.PoiOffline(vendorStoreID); err != nil {
+		if err = mtwmApi.PoiOffline(vendorStoreID); err == nil {
 			err = mtwmApi.PoiClose(vendorStoreID)
 		}
 	}