From 7fdc878910932c3ca5bcb4350f305d798fc66904 Mon Sep 17 00:00:00 2001 From: laolin <237007180@qq.com> Date: Tue, 5 Sep 2023 15:51:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=90=AC=E5=AE=B6=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GetCurrentShopMoveSettingService.java | 23 ++++++++---- .../SaveCurrentShopMoveSettingService.java | 37 +++++++++++++++++-- 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/ms-biz/src/main/java/com/ms/api/spi/move/GetCurrentShopMoveSettingService.java b/ms-biz/src/main/java/com/ms/api/spi/move/GetCurrentShopMoveSettingService.java index f41ed436..b010c10a 100644 --- a/ms-biz/src/main/java/com/ms/api/spi/move/GetCurrentShopMoveSettingService.java +++ b/ms-biz/src/main/java/com/ms/api/spi/move/GetCurrentShopMoveSettingService.java @@ -5,33 +5,40 @@ import com.jinritemai.cloud.base.api.BaseResponse; import com.jinritemai.cloud.base.api.ExtensionService; import com.jinritemai.cloud.base.api.ExtensionServiceHandler; import com.ms.api.common.R; +import com.ms.api.common.Ret; import com.ms.api.common.SPIBaseService; import com.ms.api.dto.move.GetCurrentShopMoveSettingRequestDTO; +import com.ms.api.service.MoveShopSettingService; import com.ms.api.tool.DsJsonRequestTemplate; +import com.ms.dal.entity.MoveShopSetting; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import java.util.HashMap; +import java.util.Map; + /** * 获取搬家配置 */ @ExtensionService("getCurrentShopMoveSetting") @Slf4j -public class GetCurrentShopMoveSettingService extends SPIBaseService implements ExtensionServiceHandler { +public class GetCurrentShopMoveSettingService extends SPIBaseService implements ExtensionServiceHandler { @Autowired private DsJsonRequestTemplate dsJsonRequestTemplate; + @Autowired + private MoveShopSettingService moveShopSettingService; @Override - public BaseResponse handle(BaseRequest req) { + public BaseResponse handle(BaseRequest req) { initHandle(req); - // ----参数校验---- - GetCurrentShopMoveSettingRequestDTO fields = req.getData(); - // ----逻辑校验---- - // ----业务处理---- + MoveShopSetting moveShopSettings = moveShopSettingService.getDetailByShopId(shopId); + Map retData = new HashMap(); + retData.put("detail", moveShopSettings); + return R.ok(Ret.success(retData)); + - // ----结果返回---- - return R.ok(); } } diff --git a/ms-biz/src/main/java/com/ms/api/spi/move/SaveCurrentShopMoveSettingService.java b/ms-biz/src/main/java/com/ms/api/spi/move/SaveCurrentShopMoveSettingService.java index fe2da785..e24bca46 100644 --- a/ms-biz/src/main/java/com/ms/api/spi/move/SaveCurrentShopMoveSettingService.java +++ b/ms-biz/src/main/java/com/ms/api/spi/move/SaveCurrentShopMoveSettingService.java @@ -1,5 +1,6 @@ package com.ms.api.spi.move; +import cn.hutool.core.bean.BeanUtil; import com.jinritemai.cloud.base.api.BaseRequest; import com.jinritemai.cloud.base.api.BaseResponse; import com.jinritemai.cloud.base.api.ExtensionService; @@ -7,10 +8,15 @@ import com.jinritemai.cloud.base.api.ExtensionServiceHandler; import com.ms.api.common.R; import com.ms.api.common.SPIBaseService; import com.ms.api.dto.move.SaveCurrentShopMoveSettingRequestDTO; +import com.ms.api.service.MoveShopSettingService; import com.ms.api.tool.DsJsonRequestTemplate; +import com.ms.dal.entity.MoveShopSetting; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import java.util.ArrayList; +import java.util.List; + /** * 保存搬家配置 * 搬家配置编辑页面，客户可以修改搬家配置 @@ -22,17 +28,40 @@ public class SaveCurrentShopMoveSettingService extends SPIBaseService implements @Autowired private DsJsonRequestTemplate dsJsonRequestTemplate; + @Autowired + private MoveShopSettingService moveShopSettingService; + @Override public BaseResponse handle(BaseRequest req) { initHandle(req); // ----参数校验---- - SaveCurrentShopMoveSettingRequestDTO fields = req.getData(); + SaveCurrentShopMoveSettingRequestDTO fields = req.getData(); - // ----逻辑校验---- + MoveShopSetting moveShopSettings = new MoveShopSetting(); + moveShopSettings.setShopId(shopId); + moveShopSettings.setDeliveryDelayDay(fields.getDeliveryDelayDay()); + moveShopSettings.setAliPriceType(fields.getAliPriceType()); + moveShopSettings.setNoConsignPriceType(fields.getNoConsignPriceType()); + if (fields.getPriceDecimalTypeRedio().equals("priceTail")) { + moveShopSettings.setPriceTail(fields.getPriceTail()); + moveShopSettings.setPriceDecimal(null); + } else if (fields.getPriceDecimalTypeRedio().equals("priceDecimalType")) { + moveShopSettings.setPriceTail(0); + moveShopSettings.setPriceDecimal(fields.getPriceDecimalType()); + } + moveShopSettings.setMoveOnsaleType(fields.getMoveOnsaleType()); + moveShopSettings.setFreightTemplateId(fields.getFreightTemplateId()); + moveShopSettings.setReduceType(fields.getReduceType()); + moveShopSettings.setSupply7dayReturn(fields.getSupply7dayReturn()); - // ----业务处理---- + int moveShopConfigId = fields.getMoveShopConfigId(); + if (moveShopConfigId == 0) { + moveShopSettingService.insertSelective(moveShopSettings); + } else { + moveShopSettings.setMoveShopSettingId(fields.getMoveShopConfigId()); + moveShopSettingService.updateByPrimaryKeySelective(moveShopSettings); + } - // ----结果返回---- return R.ok(); } }