Merge branch 'lcw' of https://git.dev.tencent.com/XJH-Rosy/jx-callback into lcw

business/jxstore/cms/store.go

@@ -149,8 +149,8 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa
 	}
 	if keyword != "" {
 		keywordLike := "%" + keyword + "%"
-		sqlWhere += " AND (t1.name LIKE ? OR t1.tel1 LIKE ? OR t1.tel2 LIKE ? OR t1.last_operator LIKE ? OR city.name LIKE ?"
+		sqlWhere += " AND (t1.name LIKE ? OR t1.tel1 LIKE ? OR t1.tel2 LIKE ? OR t1.last_operator LIKE ? OR city.name LIKE ? OR t1.address LIKE ?"
-		sqlWhereParams = append(sqlWhereParams, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike)
+		sqlWhereParams = append(sqlWhereParams, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike, keywordLike)
 
 		if keywordInt64, err2 := strconv.ParseInt(keyword, 10, 64); err2 == nil {
 			if jxutils.IsLegalMobileNumber(keywordInt64) {

business/partner/purchase/ebai/store.go

@@ -182,11 +182,11 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 					mergeStatus := jxutils.MergeStoreStatus(store.Status, store.EbaiStoreStatus)
 					if store2.Status != mergeStatus {
 						if mergeStatus == model.StoreStatusOpened {
-							err = api.EbaiAPI.ShopOnline("", utils.Str2Int64(store.VendorStoreID))
+							err = api.EbaiAPI.ShopOpen("", utils.Str2Int64(store.VendorStoreID))
-						} else if mergeStatus == model.StoreStatusClosed {
-							err = api.EbaiAPI.ShopOffline("", utils.Str2Int64(store.VendorStoreID))
 						} else if mergeStatus == model.StoreStatusClosed {
 							err = api.EbaiAPI.ShopClose("", utils.Str2Int64(store.VendorStoreID))
+						} else if mergeStatus == model.StoreStatusDisabled {
+							err = api.EbaiAPI.ShopOffline("", utils.Str2Int64(store.VendorStoreID))
 						}
 						if intErr, ok := err.(*utils.ErrorWithCode); ok && intErr.IntCode() == 201100 {
 							err = nil

business/partner/purchase/mtwm/store.go

@@ -12,6 +12,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/business/partner"
+	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
@@ -102,14 +103,15 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 	if err != nil {
 		return err
 	}
-	// remoteStoreInfo, err := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID)
-	// if err != nil {
-	// 	return err
-	// }
 	openTime := [][2]int16{[2]int16{storeDetail.OpenTime1, storeDetail.CloseTime1}}
 	if storeDetail.OpenTime2 > 0 {
 		openTime = append(openTime, [2]int16{storeDetail.OpenTime2, storeDetail.CloseTime2})
 	}
+	openLevel, isOnline := bizStatusJX2Mtwm(jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus))
+	// remoteStoreInfo, err := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID)
+	// if err != nil {
+	// 	return err
+	// }
 	// params := map[string]interface{}{
 	// 	"name":           utils.Interface2String(remoteStoreInfo["name"]), //jxutils.ComposeStoreName(storeDetail.Store.Name, model.VendorIDMTWM),
 	// 	"phone":          storeDetail.Tel1,
@@ -117,37 +119,39 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
 	// 	"shipping_time":  openTimeJX2Mtwm(openTime),
 	// 	"third_tag_name": "蔬菜",
 	// }
-	// if storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreAddress) != 0 {
+	// if true { //storeDetail.SyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreAddress) != 0 {
 	// 	params["address"] = storeDetail.Address
 	// 	params["longitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lng)
 	// 	params["latitude"] = jxutils.IntCoordinate2Standard(storeDetail.Lat)
 	// }
-	// params["open_level"], params["is_online"] = bizStatusJX2Mtwm(jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus))
+	// params["open_level"] = openLevel
+	// params["is_online"] = isOnline
 	// globals.SugarLogger.Debug(utils.Format4Output(params, false))
-	// if globals.EnableStoreWrite && globals.EnableMtwmStoreWrite {
+	// if globals.EnableMtwmStoreWrite {
 	// 	err = api.MtwmAPI.PoiSave(storeDetail.VendorStoreID, params)
 	// }
-	openLevel, isOnline := bizStatusJX2Mtwm(jxutils.MergeStoreStatus(storeDetail.Status, storeDetail.VendorStatus))
+	if globals.EnableMtwmStoreWrite {
-	if isOnline != mtwmapi.PoiStatusOnline {
+		if isOnline != mtwmapi.PoiStatusOnline {
-		err = api.MtwmAPI.PoiOffline(storeDetail.VendorStoreID)
+			err = api.MtwmAPI.PoiOffline(storeDetail.VendorStoreID)
-	} else {
+		} else {
-		if err = api.MtwmAPI.PoiOnline(storeDetail.VendorStoreID); err == nil {
+			if err = api.MtwmAPI.PoiOnline(storeDetail.VendorStoreID); err == nil {
-			// 这个函数成功返回也并不表示上线成功。。。
+				// 这个函数成功返回也并不表示上线成功。。。
-			remoteStoreInfo, err2 := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID)
+				remoteStoreInfo, err2 := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID)
-			if err = err2; err != nil {
+				if err = err2; err != nil {
-				return err
+					return err
-			}
+				}
-			if int(utils.MustInterface2Int64(remoteStoreInfo["is_online"])) == mtwmapi.PoiStatusOnline {
+				if int(utils.MustInterface2Int64(remoteStoreInfo["is_online"])) == mtwmapi.PoiStatusOnline {
-				if openLevel == mtwmapi.PoiOpenLevelHaveRest {
+					if openLevel == mtwmapi.PoiOpenLevelHaveRest {
-					err = api.MtwmAPI.PoiClose(storeDetail.VendorStoreID)
+						err = api.MtwmAPI.PoiClose(storeDetail.VendorStoreID)
+					} else {
+						err = api.MtwmAPI.PoiOpen(storeDetail.VendorStoreID)
+					}
+					if err == nil {
+						err = api.MtwmAPI.PoiShipTimeUpdate(storeDetail.VendorStoreID, openTimeJX2Mtwm(openTime))
+					}
 				} else {
-					err = api.MtwmAPI.PoiOpen(storeDetail.VendorStoreID)
+					err = errors.New("门店还未上线，不能修改营业状态")
 				}
-				if err == nil {
-					err = api.MtwmAPI.PoiShipTimeUpdate(storeDetail.VendorStoreID, openTimeJX2Mtwm(openTime))
-				}
-			} else {
-				err = errors.New("门店还未上线，不能修改营业状态")
 			}
 		}
 	}

controllers/jd_callback.go

@@ -146,7 +146,7 @@ func (c *DjswController) StoreCrud() {
 
 func (c *DjswController) transferResponse(inCallbackResponse *jdapi.CallbackResponse) (outCallbackResponse *jdapi.CallbackResponse) {
 	if inCallbackResponse == nil {
-		return jdapi.Err2CallbackResponse(nil, "")
+		return jdapi.SuccessResponse
 	}
 	return inCallbackResponse
 }
@@ -155,11 +155,10 @@ func (c *DjswController) afterSaleBillStatus() {
 	var obj *jdapi.CallbackOrderMsg
 	var callbackResponse *jdapi.CallbackResponse
 	obj, callbackResponse = api.JdAPI.GetOrderCallbackMsg(c.Ctx.Input.RequestBody)
-	callbackResponse = jd.OnAfterSaleMsg(obj)
 	if callbackResponse == nil {
-		callbackResponse = jdapi.SuccessResponse
+		callbackResponse = jd.OnAfterSaleMsg(obj)
 	}
-	c.Data["json"] = callbackResponse
+	c.Data["json"] = c.transferResponse(callbackResponse)
 	c.ServeJSON()
 }