diff --git a/README.md b/README.md index 4b26689e..d1a19e32 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ curl --location --request POST 'localhost:8080/base/cloud/spi' \ "appId":"7264840234423027259", "authId":"4463798", "method":"savePurchaseSetting", -"data":"{\"platformShopSetting\":{\"isEncryptDsOrder\":0,\"isEncryptDsOrderIfSellerSupport\":0,\"encryptDsOrderType\":\"allSeller\",\"allowDsEncryptOrderSourceSellers\":{\"2234567890qwertyuio\":{\"sellerName\":\"开发人员的店2\",\"sellerIdMd5\":\"2234567890qwertyuio\"},\"1234567890qwertyuio\":{\"sellerName\":\"开发人员随便写的店\",\"sellerIdMd5\":\"1234567890qwertyuio\"}}}}" +"data":"{\"dsPurchaseSetting\":{\"isAutoPay\":0,\"isAutoPurchase\":0,\"isUseAllProduct\":1,\"isUsePartProduct\":1,\"deliveryTimeType\":\"\",\"forbiddenKeywords\":\"\",\"delayPurchaseMinute\":\"2\",\"isUseForbiddenKeywords\":1,\"forbiddenPurchaseProfit\":\"222\",\"allowAutoPurchaseProducts\":{},\"filterAutoPurchaseProducts\":{\"911111111\":{\"productId\":\"911111111\",\"name\":\"开发商品名字2\",\"img\":\"https://cbu01.alicdn.com/img/ibank/O1CN01XQ4vkl1V78Qnhpvxl_!!939772605-0-cib.jpg\",\"status\":0,\"price\":99.99,\"key\":\"911111111\"}},\"isUseForbiddenPurchaseProfit\":1,\"isPurchaseLogisticsUpdateToPlatform\":0,\"filterProduct\":\"all\"}}" }' diff --git a/ms-biz/src/main/java/com/ms/api/service/impl/PurchaseOrderServiceImpl.java b/ms-biz/src/main/java/com/ms/api/service/impl/PurchaseOrderServiceImpl.java index fa4ba3fb..7731c6cf 100644 --- a/ms-biz/src/main/java/com/ms/api/service/impl/PurchaseOrderServiceImpl.java +++ b/ms-biz/src/main/java/com/ms/api/service/impl/PurchaseOrderServiceImpl.java @@ -936,10 +936,10 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService { setting.setForbiddenPurchaseProfit(dsPurchaseSettingDTO.getForbiddenPurchaseProfit()); setting.setIsUseForbiddenKeywords(dsPurchaseSettingDTO.getIsUseForbiddenKeywords()); setting.setForbiddenKeywords(dsPurchaseSettingDTO.getForbiddenKeywords()); - setting.setIsUseAllProduct(setting.getIsUseAllProduct()); - setting.setIsUsePartProduct(setting.getIsUsePartProduct()); - setting.setIsForbidIsolationPurchase(setting.getIsForbidIsolationPurchase()); - setting.setGmtIsAutoPurchase(setting.getGmtIsAutoPurchase()); + setting.setIsUseAllProduct(dsPurchaseSettingDTO.getIsUseAllProduct()); + setting.setIsUsePartProduct(dsPurchaseSettingDTO.getIsUsePartProduct()); + setting.setIsForbidIsolationPurchase(dsPurchaseSettingDTO.getIsForbidIsolationPurchase()); + setting.setGmtIsAutoPurchase(dsPurchaseSettingDTO.getGmtIsAutoPurchase()); setting.setGmtModified(new Date()); @@ -957,10 +957,10 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService { log.setForbiddenPurchaseProfit(dsPurchaseSettingDTO.getForbiddenPurchaseProfit()); log.setIsUseForbiddenKeywords(dsPurchaseSettingDTO.getIsUseForbiddenKeywords()); log.setForbiddenKeywords(dsPurchaseSettingDTO.getForbiddenKeywords()); - log.setIsUseAllProduct(setting.getIsUseAllProduct()); - log.setIsUsePartProduct(setting.getIsUsePartProduct()); - log.setIsForbidIsolationPurchase(setting.getIsForbidIsolationPurchase()); - log.setGmtIsAutoPurchase(setting.getGmtIsAutoPurchase()); + log.setIsUseAllProduct(dsPurchaseSettingDTO.getIsUseAllProduct()); + log.setIsUsePartProduct(dsPurchaseSettingDTO.getIsUsePartProduct()); + log.setIsForbidIsolationPurchase(dsPurchaseSettingDTO.getIsForbidIsolationPurchase()); + log.setGmtIsAutoPurchase(dsPurchaseSettingDTO.getGmtIsAutoPurchase()); log.setGmtCreate(new Date()); log.setGmtModified(new Date());