From 0611b513e99a804600469f60c90a4542ba58ddf5 Mon Sep 17 00:00:00 2001 From: laolin <237007180@qq.com> Date: Fri, 8 Sep 2023 10:49:22 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=20=E5=A4=B1=E8=B4=A5=E9=87=8D=E8=AF=95=20f?= =?UTF-8?q?ailRetryMoveTasks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ms/api/spi/move/FailRetryMoveTasksService.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ms-biz/src/main/java/com/ms/api/spi/move/FailRetryMoveTasksService.java b/ms-biz/src/main/java/com/ms/api/spi/move/FailRetryMoveTasksService.java index e67eeb1e..3fbf3f8a 100644 --- a/ms-biz/src/main/java/com/ms/api/spi/move/FailRetryMoveTasksService.java +++ b/ms-biz/src/main/java/com/ms/api/spi/move/FailRetryMoveTasksService.java @@ -100,6 +100,13 @@ public class FailRetryMoveTasksService extends SPIBaseService implements Extensi if (BeanUtil.isEmpty(moveCollectTask.getCondition())) { return R.fail("未找到配置信息！无法重试，请使用链接重新搬家！"); } + /** + *这边condition 格式不知道 后续加下就行了 + $condition['filterSkipReason'][$detailId] = []; + if($reason) { + $condition['filterSkipReason'][$detailId][] = $reason; + } + */ if (Objects.equals(moveCollectTaskDetail.getStatus(), StatusConst.fail) || Objects.equals(moveCollectTaskDetail.getStatus(), StatusConst.cancel) || Objects.equals(moveCollectTaskDetail.getStatus(), StatusConst.delete) || Objects.equals(moveCollectTaskDetail.getStatus(), StatusConst.skip)) { From 7c5031ee698423e67e43b3292d03f27edcb1ed82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?cxxxxxxx=E8=AF=A6?= <286460656@qq.com> Date: Fri, 8 Sep 2023 10:53:59 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B2=A1=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ms-biz/src/main/java/com/ms/api/tool/ImageTool.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/ms-biz/src/main/java/com/ms/api/tool/ImageTool.java b/ms-biz/src/main/java/com/ms/api/tool/ImageTool.java index f4ec523b..d63a4718 100644 --- a/ms-biz/src/main/java/com/ms/api/tool/ImageTool.java +++ b/ms-biz/src/main/java/com/ms/api/tool/ImageTool.java @@ -2,8 +2,6 @@ package com.ms.api.tool; import com.ms.api.common.Ret; import com.ms.api.common.StrObjMap; -import com.sun.scenario.effect.ImageData; - import java.awt.image.BufferedImage; import javax.imageio.ImageIO; import java.io.ByteArrayInputStream; From b4cf802839885dcb4dc889c100ab5fb548fe0dbc Mon Sep 17 00:00:00 2001 From: laolin <237007180@qq.com> Date: Fri, 8 Sep 2023 10:57:41 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=20=E5=A4=B1=E8=B4=A5=E9=87=8D=E8=AF=95=20f?= =?UTF-8?q?ailRetryMoveTasks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ms/api/spi/move/FailRetryMoveTasksService.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ms-biz/src/main/java/com/ms/api/spi/move/FailRetryMoveTasksService.java b/ms-biz/src/main/java/com/ms/api/spi/move/FailRetryMoveTasksService.java index 3fbf3f8a..e67eeb1e 100644 --- a/ms-biz/src/main/java/com/ms/api/spi/move/FailRetryMoveTasksService.java +++ b/ms-biz/src/main/java/com/ms/api/spi/move/FailRetryMoveTasksService.java @@ -100,13 +100,6 @@ public class FailRetryMoveTasksService extends SPIBaseService implements Extensi if (BeanUtil.isEmpty(moveCollectTask.getCondition())) { return R.fail("未找到配置信息！无法重试，请使用链接重新搬家！"); } - /** - *这边condition 格式不知道 后续加下就行了 - $condition['filterSkipReason'][$detailId] = []; - if($reason) { - $condition['filterSkipReason'][$detailId][] = $reason; - } - */ if (Objects.equals(moveCollectTaskDetail.getStatus(), StatusConst.fail) || Objects.equals(moveCollectTaskDetail.getStatus(), StatusConst.cancel) || Objects.equals(moveCollectTaskDetail.getStatus(), StatusConst.delete) || Objects.equals(moveCollectTaskDetail.getStatus(), StatusConst.skip)) { From 557ae361c610107473a20f671bb1cd4a3d9bc919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?cxxxxxxx=E8=AF=A6?= <286460656@qq.com> Date: Fri, 8 Sep 2023 11:24:39 +0800 Subject: [PATCH 4/6] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../java/com/ms/api/spi/callback/MemberAuthCallback.java | 5 ++--- .../java/com/ms/api/spi/move/CancelCollectTaskService.java | 4 ---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e0c3de78..cfae7313 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ curl --location --request POST 'localhost:8080/base/cloud/spi' \ --data-raw '{ "appId":"7264840234423027259", "authId":"4463798", -"method":"saveCurrentShopMoveSetting", +"method":"getPlatformAuthUrl", "data":"{\"moveShopSettingId\":6,\"shopId\":4463798,\"configName\":\"默认配置\",\"isConfigDefault\":0,\"mobile\":null,\"deliveryDelayDay\":48,\"freightTemplateId\":29667599,\"supply7dayReturn\":2,\"reduceType\":1,\"moveOnsaleType\":1,\"pricePercent\":null,\"priceAdd\":null,\"priceSub\":null,\"priceTail\":0,\"priceDecimal\":\"clearFen\",\"priceDecimalTypeRedio\":\"priceDecimalType\",\"priceDecimalType\":\"holdFenJiao\",\"priceDecimalDiyValue\":null,\"isPriceAddPostFee\":0,\"basePriceType\":0,\"priceMode\":null,\"aliPriceType\":\"consign\",\"noConsignPriceType\":1,\"skuMinPriceStatus\":0,\"skuMinPriceType\":0,\"addSkuMinPriceType\":0,\"addSkuMinPricePricePercent\":null,\"addSkuMinPricePriceAdd\":null,\"addSkuMinPricePriceSub\":null,\"addSkuMinPricePriceTail\":0,\"addSkuMinPricePriceDecimal\":null,\"addSkuMinPricePriceDecimalDiyValue\":null,\"addSkuMinPriceSkuName\":null,\"addSkuMinPriceQuantity\":null,\"addSkuMinPriceColorImg\":null,\"addSkuPriceSource\":0,\"updateSkuMinPricePricePercent\":null,\"updateSkuMinPricePriceAdd\":null,\"updateSkuMinPricePriceSub\":null,\"updateSkuMinPricePriceTail\":0,\"updateSkuMinPricePriceDecimal\":null,\"updateSkuMinPricePriceDecimalDiyValue\":null,\"updateSkuMinPriceQuantity\":null,\"updateSkuPriceSource\":0,\"filterOutLinks\":0,\"titleSearch\":null,\"titleSearchId\":null,\"titleReplace\":null,\"titleReplaceId\":null,\"titlePrefix\":null,\"titleSuffix\":null,\"titleDeleteId\":null,\"titleDelLetter\":0,\"titleDelNumber\":0,\"titleDelBlank\":0,\"titleDelESymbol\":0,\"titleDelProductNum\":0,\"titleDelBrand\":0,\"titleDelBracket\":null,\"height\":null,\"width\":null,\"length\":null,\"brandId\":null,\"brandName\":null,\"isCopyRecommendRemark\":0,\"recommendRemark\":null,\"recommendRemarkSearchId\":null,\"recommendRemarkReplaceId\":null,\"recommendRemarkPrefixId\":null,\"recommendRemarkSuffixId\":null,\"itemNumType\":0,\"itemNumFetchBankType\":\"move_setting\",\"itemNumTypeOther\":0,\"itemNumPrefix\":null,\"itemNumSuffix\":null,\"isBuildSkuCode\":0,\"skuCodeRule\":null,\"skuCodeSeparator\":null,\"skuCodeChinese\":null,\"skuCodeNumStart\":null,\"skuCodeNumStep\":null,\"skuCodeItemNumEmptyOperate\":null,\"copyTaobaoCidOnly\":null,\"copyJdCidOnly\":null,\"copy1688CidOnly\":null,\"copyPddCidOnly\":null,\"copyLtaoCidOnly\":null,\"isTitleOverFlowDelete\":0,\"titleOverFlowDeleteType\":null,\"processMainImageType\":null,\"delMainImgHeadNum\":null,\"delMainImgTailNum\":null,\"delMainImgIndexList\":null,\"keepFirstMainImg\":0,\"tailorImgType\":0,\"mainImgAutoFill\":0,\"useSourceMobileDesc\":0,\"descPrefixId\":null,\"descSuffixId\":null,\"descPrefixImgId\":null,\"descSuffixImgId\":null,\"descCopyType\":\"copy\",\"isOnlyImg\":0,\"delDescImgHeadNum\":null,\"delDescImgTailNum\":null,\"weight\":null,\"quantity\":null,\"resetSkuStockNum\":null,\"resetSkuZeroStockNum\":null,\"delSkuStockNum\":null,\"skipCopied\":0,\"skipWithoutColorImg\":0,\"filterEmptyColorImg\":0,\"skipForSaleProduct\":0,\"skipHasBrandName\":0,\"skip3cProduct\":0,\"skipGlobal\":0,\"skipOldWare\":0,\"skipSupermarket\":0,\"skipSeason\":null,\"skipStockNum\":0,\"skipSaleCount\":null,\"skipMinPrice\":null,\"skipMaxPrice\":null,\"isSkipMinCreditLevel\":0,\"isSkipMaxCreditLevel\":0,\"skipMinCreditLevel\":0,\"skipMaxCreditLevel\":0,\"skipReviewsCnt\":null,\"skipReviewWellRate\":0,\"skipTitleKeywordId\":null,\"skipSkuAliasKeywordId\":null,\"skipBrandKeywordId\":null,\"skipYushou\":0,\"skipSendCity\":0,\"skipSendCityInfoId\":null,\"skipNoFromDs\":0,\"baseMarketPriceType\":0,\"marketPricePercent\":null,\"marketPriceAdd\":null,\"marketPriceSub\":null,\"marketPriceTail\":null,\"marketPriceDecimal\":null,\"marketPriceDecimalDiyValue\":null,\"isAutoMatchCategory\":0,\"skipMatchCategoryFail\":0,\"matchFailUseCategoryId\":null,\"moveMatchMainCids\":null,\"autoMatchCategoryId\":null,\"forceCategoryId\":null,\"payType\":0,\"presellType\":0,\"presellDelay\":0,\"presellDeliveryType\":0,\"presellEndTime\":\"2023-09-07T05:33:27.000+0000\",\"presellEndTimeType\":0,\"presellEndTimeDelay\":0,\"presellTimeSkuSpecNameAndStockPercentMap\":null,\"presellTimeSkuSpecNameAndStockPercentMapV2\":null,\"placeOrderDelay\":0,\"presellConfigLevel\":0,\"presellConfigLevelDeliveryDelayDay\":0,\"stepStockNum\":null,\"stockType\":null,\"assocIds\":null,\"limitPerBuyer\":null,\"maximumPerOrder\":null,\"minimumPerOrder\":null,\"presetAttrsId\":null,\"presetCateAttrsId\":null,\"skuAliasDeleteId\":null,\"skuSearchId\":null,\"skuReplaceId\":null,\"isAutoFillingMainImage\":0,\"imageNumFillingToNum\":0,\"isAutoFillingUseSkuImg\":0,\"isAutoFillingUseDescImg\":0,\"isAutoFillingFlipMainImg\":0,\"isAutoFillingRotatingMainImg\":0,\"isAutoFillingCopyMainImg\":0,\"sourcePostFeePriceAddValue\":null,\"gmtCreate\":null,\"gmtModified\":null,\"qualityReportId\":null,\"classQualityId\":null,\"skipShopNameId\":null,\"taobaoMainImageSource\":null,\"useUserBanWord\":0,\"autoFilterBanWord\":0,\"useSystemBanWord\":0,\"enableRangePrice\":0,\"rangePriceGroup\":null,\"isCopySourceVideo\":0,\"isUseSourceWhiteBgImg\":0,\"buildWhiteBgImgUseMainImgIndex\":0,\"isUseSourceLongPic\":1,\"isBuildLongPic\":0,\"buildLongPicMode\":\"scaleUp\",\"buildLongPicUseMainImgIndex\":0,\"commonSizeTemplate\":\"\",\"appendSizeTemplateToDescPosition\":\"head\",\"isAppendSizeTemplateToDesc\":0,\"rangePriceGroupId\":0,\"useSourcePresell\":0}" }' diff --git a/ms-biz/src/main/java/com/ms/api/spi/callback/MemberAuthCallback.java b/ms-biz/src/main/java/com/ms/api/spi/callback/MemberAuthCallback.java index a05e3e39..d30a44dd 100644 --- a/ms-biz/src/main/java/com/ms/api/spi/callback/MemberAuthCallback.java +++ b/ms-biz/src/main/java/com/ms/api/spi/callback/MemberAuthCallback.java @@ -44,8 +44,7 @@ public class MemberAuthCallback extends SPIBaseService implements ExtensionServi // ----参数校验---- MemberAuthCallBackRequestDTO fields = req.getData(); log.info("receive callback: " + JSON.toJSONString(fields)); -// String body = fields.getBody(); - String body = "userId=gfZbbg6BSAlPMmw75xlCzQ%3D%3D&cnaliMemberId=b2b-221123084407697b20&authCode=NGNiYzEyODUtNzFhOS01ZmIwLWE5MDEtYzI3ZTAyYWFjOTA2&gmtMemberExpireTime=2023-11-13+23%3A59%3A59&type=auth"; + String body = fields.getBody(); Map map = new HashMap(); // ----逻辑校验---- @@ -64,7 +63,6 @@ public class MemberAuthCallback extends SPIBaseService implements ExtensionServi String gmtMemberExpireTime = map.get("gmtMemberExpireTime"); String userId = map.get("userId"); this.authCode = fields.getAuthCode(); - log.info(map.toString()); Shop1688DsAuth shop1688DsAuth = shop1688DsAuthService.getDetailByShopId(Long.valueOf(SecurityTool.decodeByAES(userId))); if (Objects.isNull(shop1688DsAuth)) { @@ -73,6 +71,7 @@ public class MemberAuthCallback extends SPIBaseService implements ExtensionServi } shop1688DsAuth.setAuthCode(authCode); shop1688DsAuth.setShopId(Long.valueOf(SecurityTool.decodeByAES(userId))); + log.info("receive callback: " + shop1688DsAuth); shop1688DsAuthService.updateByPrimaryKey(shop1688DsAuth); ShopTo1688DsMember shopTo1688DsMember = shopTo1688DsMemberService.getDetailByShopId(Long.valueOf(SecurityTool.decodeByAES(userId))); diff --git a/ms-biz/src/main/java/com/ms/api/spi/move/CancelCollectTaskService.java b/ms-biz/src/main/java/com/ms/api/spi/move/CancelCollectTaskService.java index b74fd9b6..802a70b1 100644 --- a/ms-biz/src/main/java/com/ms/api/spi/move/CancelCollectTaskService.java +++ b/ms-biz/src/main/java/com/ms/api/spi/move/CancelCollectTaskService.java @@ -31,10 +31,6 @@ public class CancelCollectTaskService extends SPIBaseService implements Extensio // ----逻辑校验---- // ----业务处理---- -// if (!$this->webShop->validateCsrfToken()) { -// return $this->renderJSON(CommonTool::failResult('CSRF校验不通过')); -// } -// // list($successCancelDetailIds, $skipCancelDetailIds) = $this->moveUtil->cancelCollectTask(); // $html = ''; // if ($skipCancelDetailIds) { From df2a9e782d84024c8b878a50410f520c1ab6b58c Mon Sep 17 00:00:00 2001 From: laolin <237007180@qq.com> Date: Fri, 8 Sep 2023 11:26:48 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=20=E5=A4=B1=E8=B4=A5=E9=87=8D=E8=AF=95=20f?= =?UTF-8?q?ailRetryMoveTasks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ms/api/spi/move/FailRetryMoveTasksService.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ms-biz/src/main/java/com/ms/api/spi/move/FailRetryMoveTasksService.java b/ms-biz/src/main/java/com/ms/api/spi/move/FailRetryMoveTasksService.java index e67eeb1e..87eb1b12 100644 --- a/ms-biz/src/main/java/com/ms/api/spi/move/FailRetryMoveTasksService.java +++ b/ms-biz/src/main/java/com/ms/api/spi/move/FailRetryMoveTasksService.java @@ -1,7 +1,9 @@ package com.ms.api.spi.move; import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.doudian.open.gson.Gson; import com.jinritemai.cloud.base.api.BaseRequest; import com.jinritemai.cloud.base.api.BaseResponse; import com.jinritemai.cloud.base.api.ExtensionService; @@ -43,6 +45,8 @@ public class FailRetryMoveTasksService extends SPIBaseService implements Extensi private MoveCollectTaskService moveCollectTaskService; @Autowired private MoveProductPublishBufferService moveProductPublishBufferService; + @Autowired + private MoveShopSettingService moveShopSettingService; @Override public BaseResponse handle(BaseRequest req) { @@ -97,10 +101,16 @@ public class FailRetryMoveTasksService extends SPIBaseService implements Extensi } MoveCollectTask moveCollectTask = moveCollectTaskService.getMoveCollectTask(moveCollectTaskDetail.getMoveCollectTaskId(), shopId); - if (BeanUtil.isEmpty(moveCollectTask.getCondition())) { + String condition=moveCollectTask.getCondition(); + if (BeanUtil.isEmpty(condition)) { return R.fail("未找到配置信息！无法重试，请使用链接重新搬家！"); } + MoveShopSetting shopMoveCondition = moveShopSettingService.getDetailByShopId(shopId); + shopMoveCondition.setSkipSeason(reason); + String shopMoveConditionStr = JSON.toJSONString(shopMoveCondition); + + if (Objects.equals(moveCollectTaskDetail.getStatus(), StatusConst.fail) || Objects.equals(moveCollectTaskDetail.getStatus(), StatusConst.cancel) || Objects.equals(moveCollectTaskDetail.getStatus(), StatusConst.delete) || Objects.equals(moveCollectTaskDetail.getStatus(), StatusConst.skip)) { MoveCollectTaskDetail moveCollectTaskDetail1 = new MoveCollectTaskDetail(); @@ -114,7 +124,7 @@ public class FailRetryMoveTasksService extends SPIBaseService implements Extensi MoveCollectTask moveCollectTask1 = new MoveCollectTask(); moveCollectTask1.setMoveCollectTaskId(moveCollectTask.getMoveCollectTaskId()); moveCollectTask1.setGmtModified(new Date()); - moveCollectTask1.setCondition(moveCollectTask.getCondition()); + moveCollectTask1.setCondition(shopMoveConditionStr); moveCollectTaskService.updateByPrimaryKey(moveCollectTask1); int priority = getTaskPriority(shopId); From e8c018025d7554b6256b427cdace5b747cb86cf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?cxxxxxxx=E8=AF=A6?= <286460656@qq.com> Date: Fri, 8 Sep 2023 12:10:05 +0800 Subject: [PATCH 6/6] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../com/ms/api/spi/callback/MemberAuthCallback.java | 11 ++++++----- .../com/ms/api/spi/move/CancelCollectTaskService.java | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index cfae7313..3f8f594e 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ curl --location --request POST 'localhost:8080/base/cloud/spi' \ --data-raw '{ "appId":"7264840234423027259", "authId":"4463798", -"method":"getPlatformAuthUrl", +"method":"memberAuthCallBack", "data":"{\"moveShopSettingId\":6,\"shopId\":4463798,\"configName\":\"默认配置\",\"isConfigDefault\":0,\"mobile\":null,\"deliveryDelayDay\":48,\"freightTemplateId\":29667599,\"supply7dayReturn\":2,\"reduceType\":1,\"moveOnsaleType\":1,\"pricePercent\":null,\"priceAdd\":null,\"priceSub\":null,\"priceTail\":0,\"priceDecimal\":\"clearFen\",\"priceDecimalTypeRedio\":\"priceDecimalType\",\"priceDecimalType\":\"holdFenJiao\",\"priceDecimalDiyValue\":null,\"isPriceAddPostFee\":0,\"basePriceType\":0,\"priceMode\":null,\"aliPriceType\":\"consign\",\"noConsignPriceType\":1,\"skuMinPriceStatus\":0,\"skuMinPriceType\":0,\"addSkuMinPriceType\":0,\"addSkuMinPricePricePercent\":null,\"addSkuMinPricePriceAdd\":null,\"addSkuMinPricePriceSub\":null,\"addSkuMinPricePriceTail\":0,\"addSkuMinPricePriceDecimal\":null,\"addSkuMinPricePriceDecimalDiyValue\":null,\"addSkuMinPriceSkuName\":null,\"addSkuMinPriceQuantity\":null,\"addSkuMinPriceColorImg\":null,\"addSkuPriceSource\":0,\"updateSkuMinPricePricePercent\":null,\"updateSkuMinPricePriceAdd\":null,\"updateSkuMinPricePriceSub\":null,\"updateSkuMinPricePriceTail\":0,\"updateSkuMinPricePriceDecimal\":null,\"updateSkuMinPricePriceDecimalDiyValue\":null,\"updateSkuMinPriceQuantity\":null,\"updateSkuPriceSource\":0,\"filterOutLinks\":0,\"titleSearch\":null,\"titleSearchId\":null,\"titleReplace\":null,\"titleReplaceId\":null,\"titlePrefix\":null,\"titleSuffix\":null,\"titleDeleteId\":null,\"titleDelLetter\":0,\"titleDelNumber\":0,\"titleDelBlank\":0,\"titleDelESymbol\":0,\"titleDelProductNum\":0,\"titleDelBrand\":0,\"titleDelBracket\":null,\"height\":null,\"width\":null,\"length\":null,\"brandId\":null,\"brandName\":null,\"isCopyRecommendRemark\":0,\"recommendRemark\":null,\"recommendRemarkSearchId\":null,\"recommendRemarkReplaceId\":null,\"recommendRemarkPrefixId\":null,\"recommendRemarkSuffixId\":null,\"itemNumType\":0,\"itemNumFetchBankType\":\"move_setting\",\"itemNumTypeOther\":0,\"itemNumPrefix\":null,\"itemNumSuffix\":null,\"isBuildSkuCode\":0,\"skuCodeRule\":null,\"skuCodeSeparator\":null,\"skuCodeChinese\":null,\"skuCodeNumStart\":null,\"skuCodeNumStep\":null,\"skuCodeItemNumEmptyOperate\":null,\"copyTaobaoCidOnly\":null,\"copyJdCidOnly\":null,\"copy1688CidOnly\":null,\"copyPddCidOnly\":null,\"copyLtaoCidOnly\":null,\"isTitleOverFlowDelete\":0,\"titleOverFlowDeleteType\":null,\"processMainImageType\":null,\"delMainImgHeadNum\":null,\"delMainImgTailNum\":null,\"delMainImgIndexList\":null,\"keepFirstMainImg\":0,\"tailorImgType\":0,\"mainImgAutoFill\":0,\"useSourceMobileDesc\":0,\"descPrefixId\":null,\"descSuffixId\":null,\"descPrefixImgId\":null,\"descSuffixImgId\":null,\"descCopyType\":\"copy\",\"isOnlyImg\":0,\"delDescImgHeadNum\":null,\"delDescImgTailNum\":null,\"weight\":null,\"quantity\":null,\"resetSkuStockNum\":null,\"resetSkuZeroStockNum\":null,\"delSkuStockNum\":null,\"skipCopied\":0,\"skipWithoutColorImg\":0,\"filterEmptyColorImg\":0,\"skipForSaleProduct\":0,\"skipHasBrandName\":0,\"skip3cProduct\":0,\"skipGlobal\":0,\"skipOldWare\":0,\"skipSupermarket\":0,\"skipSeason\":null,\"skipStockNum\":0,\"skipSaleCount\":null,\"skipMinPrice\":null,\"skipMaxPrice\":null,\"isSkipMinCreditLevel\":0,\"isSkipMaxCreditLevel\":0,\"skipMinCreditLevel\":0,\"skipMaxCreditLevel\":0,\"skipReviewsCnt\":null,\"skipReviewWellRate\":0,\"skipTitleKeywordId\":null,\"skipSkuAliasKeywordId\":null,\"skipBrandKeywordId\":null,\"skipYushou\":0,\"skipSendCity\":0,\"skipSendCityInfoId\":null,\"skipNoFromDs\":0,\"baseMarketPriceType\":0,\"marketPricePercent\":null,\"marketPriceAdd\":null,\"marketPriceSub\":null,\"marketPriceTail\":null,\"marketPriceDecimal\":null,\"marketPriceDecimalDiyValue\":null,\"isAutoMatchCategory\":0,\"skipMatchCategoryFail\":0,\"matchFailUseCategoryId\":null,\"moveMatchMainCids\":null,\"autoMatchCategoryId\":null,\"forceCategoryId\":null,\"payType\":0,\"presellType\":0,\"presellDelay\":0,\"presellDeliveryType\":0,\"presellEndTime\":\"2023-09-07T05:33:27.000+0000\",\"presellEndTimeType\":0,\"presellEndTimeDelay\":0,\"presellTimeSkuSpecNameAndStockPercentMap\":null,\"presellTimeSkuSpecNameAndStockPercentMapV2\":null,\"placeOrderDelay\":0,\"presellConfigLevel\":0,\"presellConfigLevelDeliveryDelayDay\":0,\"stepStockNum\":null,\"stockType\":null,\"assocIds\":null,\"limitPerBuyer\":null,\"maximumPerOrder\":null,\"minimumPerOrder\":null,\"presetAttrsId\":null,\"presetCateAttrsId\":null,\"skuAliasDeleteId\":null,\"skuSearchId\":null,\"skuReplaceId\":null,\"isAutoFillingMainImage\":0,\"imageNumFillingToNum\":0,\"isAutoFillingUseSkuImg\":0,\"isAutoFillingUseDescImg\":0,\"isAutoFillingFlipMainImg\":0,\"isAutoFillingRotatingMainImg\":0,\"isAutoFillingCopyMainImg\":0,\"sourcePostFeePriceAddValue\":null,\"gmtCreate\":null,\"gmtModified\":null,\"qualityReportId\":null,\"classQualityId\":null,\"skipShopNameId\":null,\"taobaoMainImageSource\":null,\"useUserBanWord\":0,\"autoFilterBanWord\":0,\"useSystemBanWord\":0,\"enableRangePrice\":0,\"rangePriceGroup\":null,\"isCopySourceVideo\":0,\"isUseSourceWhiteBgImg\":0,\"buildWhiteBgImgUseMainImgIndex\":0,\"isUseSourceLongPic\":1,\"isBuildLongPic\":0,\"buildLongPicMode\":\"scaleUp\",\"buildLongPicUseMainImgIndex\":0,\"commonSizeTemplate\":\"\",\"appendSizeTemplateToDescPosition\":\"head\",\"isAppendSizeTemplateToDesc\":0,\"rangePriceGroupId\":0,\"useSourcePresell\":0}" }' diff --git a/ms-biz/src/main/java/com/ms/api/spi/callback/MemberAuthCallback.java b/ms-biz/src/main/java/com/ms/api/spi/callback/MemberAuthCallback.java index d30a44dd..949380f0 100644 --- a/ms-biz/src/main/java/com/ms/api/spi/callback/MemberAuthCallback.java +++ b/ms-biz/src/main/java/com/ms/api/spi/callback/MemberAuthCallback.java @@ -44,7 +44,8 @@ public class MemberAuthCallback extends SPIBaseService implements ExtensionServi // ----参数校验---- MemberAuthCallBackRequestDTO fields = req.getData(); log.info("receive callback: " + JSON.toJSONString(fields)); - String body = fields.getBody(); +// String body = fields.getBody(); + String body = "userId=4463798&cnaliMemberId=b2b-221123084407697b20&authCode=NGNiYzEyODUtNzFhOS01ZmIwLWE5MDEtYzI3ZTAyYWFjOTA3&gmtMemberExpireTime=2023-11-13+23%3A59%3A59&type=auth"; Map map = new HashMap(); // ----逻辑校验---- @@ -64,23 +65,23 @@ public class MemberAuthCallback extends SPIBaseService implements ExtensionServi String userId = map.get("userId"); this.authCode = fields.getAuthCode(); - Shop1688DsAuth shop1688DsAuth = shop1688DsAuthService.getDetailByShopId(Long.valueOf(SecurityTool.decodeByAES(userId))); + Shop1688DsAuth shop1688DsAuth = shop1688DsAuthService.getDetailByShopId(Long.valueOf(userId)); if (Objects.isNull(shop1688DsAuth)) { shop1688DsAuth = new Shop1688DsAuth(); shop1688DsAuthService.insert(shop1688DsAuth); } shop1688DsAuth.setAuthCode(authCode); - shop1688DsAuth.setShopId(Long.valueOf(SecurityTool.decodeByAES(userId))); + shop1688DsAuth.setShopId(Long.valueOf(userId)); log.info("receive callback: " + shop1688DsAuth); shop1688DsAuthService.updateByPrimaryKey(shop1688DsAuth); - ShopTo1688DsMember shopTo1688DsMember = shopTo1688DsMemberService.getDetailByShopId(Long.valueOf(SecurityTool.decodeByAES(userId))); + ShopTo1688DsMember shopTo1688DsMember = shopTo1688DsMemberService.getDetailByShopId(Long.valueOf(userId)); if (Objects.isNull(shopTo1688DsMember)) { shopTo1688DsMember = new ShopTo1688DsMember(); shopTo1688DsMemberService.insert(shopTo1688DsMember); } shopTo1688DsMember.setCnaliMemberId(cnaliMemberId); - shopTo1688DsMember.setShopId(Long.valueOf(SecurityTool.decodeByAES(userId))); + shopTo1688DsMember.setShopId(Long.valueOf(userId)); shopTo1688DsMember.setGmtExpire(gmtMemberExpireTime); shopTo1688DsMemberService.updateByPrimaryKey(shopTo1688DsMember); } catch (Exception e) { diff --git a/ms-biz/src/main/java/com/ms/api/spi/move/CancelCollectTaskService.java b/ms-biz/src/main/java/com/ms/api/spi/move/CancelCollectTaskService.java index 802a70b1..371bcf87 100644 --- a/ms-biz/src/main/java/com/ms/api/spi/move/CancelCollectTaskService.java +++ b/ms-biz/src/main/java/com/ms/api/spi/move/CancelCollectTaskService.java @@ -32,14 +32,14 @@ public class CancelCollectTaskService extends SPIBaseService implements Extensio // ----业务处理---- // list($successCancelDetailIds, $skipCancelDetailIds) = $this->moveUtil->cancelCollectTask(); -// $html = ''; -// if ($skipCancelDetailIds) { + String html = ""; +// if ($skipCancelDetailIds) { //这一段不知道在干嘛 // list($processingTaskCount, $taskDetailList,) = $this->productUtil->getHistoryProductList($_SESSION[SessionConst::shopId], ['taskDetailIds' => $skipCancelDetailIds], 1, count($skipCancelDetailIds)); // $html = $this->renderWithoutLayout(array( // 'taskDetailList' => $taskDetailList, // ), 'move/batch/skip_cancel', true); // } -// + // return $this->renderJSON(CommonTool::successResult([ // 'processCount' => count($successCancelDetailIds), // 'skipCount' => count($skipCancelDetailIds),