修改京东自配送门店调用达达转自送接口错误

business/partner/purchase/jd/order.go

@@ -485,6 +485,9 @@ func (p *PurchaseHandler) ConfirmReceiveGoods(ctx *jxcontext.Context, order *mod
 func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) {
 	globals.SugarLogger.Debugf("jd Swtich2SelfDeliver orderID:%s", order.VendorOrderID)
 	if globals.EnableJdStoreWrite {
+		if order.VendorOrgCode == jdapi.ModifySellerDeliveryNo { // 自配送门店不需要达达配送转自送
+			return err
+		}
 		_, err = getAPI(order.VendorOrgCode).ModifySellerDelivery(order.VendorOrderID, userName)
 		if err != nil {
 			if errWithCode, ok := err.(*utils.ErrorWithCode); ok && errWithCode.Level() == 1 {

controllers/event.go

@@ -113,12 +113,12 @@ func (c *EventController) GetWeixinUnlimited() {
 		// 抖音小程序二维码
 		tiktok, err := api.TiktokApi.GetTiktokQrCode(params.Scene)
 		if err != nil || result == nil {
-			return retVal, "", err
+			return result, "", err
 		}
 		tiktokName := "tiktok" + utils.Int64ToStr(time.Now().Unix()) + ".jpg"
 		tiktokQrCode, err := jxutils.UploadExportContent([]byte(tiktok["fakeData"].(string)), tiktokName)
 		if err != nil || result == nil {
-			return retVal, "", err
+			return result, "", err
 		}
 		result["tiktok"] = tiktokQrCode