From 9df9e33ce1a4ba52b36a88a33237e9043efecda7 Mon Sep 17 00:00:00 2001 From: paulGao Date: Wed, 2 Nov 2022 19:54:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili/modules/goods/entity/dos/Goods.java | 1 - .../entity/dto/GoodsOperationFuLuDTO.java | 137 ------------------ .../modules/goods/service/GoodsService.java | 1 - .../goods/serviceimpl/GoodsServiceImpl.java | 1 - .../store/entity/dto/FuLuConfigureDTO.java | 23 --- .../store/mapper/StoreDetailMapper.java | 10 -- .../settings/StoreSettingsController.java | 1 - 7 files changed, 174 deletions(-) delete mode 100644 framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationFuLuDTO.java delete mode 100644 framework/src/main/java/cn/lili/modules/store/entity/dto/FuLuConfigureDTO.java diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java index a810fef9..6f175250 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java @@ -8,7 +8,6 @@ import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.modules.goods.entity.dto.DraftGoodsDTO; import cn.lili.modules.goods.entity.dto.GoodsOperationDTO; -import cn.lili.modules.goods.entity.dto.GoodsOperationFuLuDTO; import cn.lili.modules.goods.entity.enums.GoodsAuthEnum; import cn.lili.modules.goods.entity.enums.GoodsSalesModeEnum; import cn.lili.modules.goods.entity.enums.GoodsStatusEnum; diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationFuLuDTO.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationFuLuDTO.java deleted file mode 100644 index 71d11b25..00000000 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationFuLuDTO.java +++ /dev/null @@ -1,137 +0,0 @@ -package cn.lili.modules.goods.entity.dto; - -import cn.lili.common.validation.EnumValue; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.ToString; -import org.hibernate.validator.constraints.Length; - -import javax.validation.Valid; -import javax.validation.constraints.*; -import java.io.Serializable; -import java.util.List; -import java.util.Map; - -/** - * 商品编辑DTO - * - * @author pikachu - * @since 2020-02-24 19:27:20 - */ -@Data -@ToString -public class GoodsOperationFuLuDTO implements Serializable { - - private static final long serialVersionUID = -509667581371776913L; - - @ApiModelProperty(hidden = true) - private String goodsId; - - @ApiModelProperty(value = "商品价格", required = true) - @NotNull(message = "商品价格不能为空") - @Min(value = 0, message = "商品价格不能为负数") - @Max(value = 99999999, message = "商品价格不能超过99999999") - private Double price; - - @ApiModelProperty(value = "分类path") - private String categoryPath; - - @ApiModelProperty(value = "店铺分类id", required = true) - @Size(max = 200, message = "选择了太多店铺分类") - private String storeCategoryPath; - - @ApiModelProperty(value = "品牌id") - @Min(value = 0, message = "品牌值不正确") - private String brandId; - - @ApiModelProperty(value = "商品名称", required = true) - @NotEmpty(message = "商品名称不能为空") - @Length(max = 50, message = "商品名称不能超过50个字符") - private String goodsName; - - @ApiModelProperty(value = "详情") - private String intro; - - @ApiModelProperty(value = "商品移动端详情") - private String mobileIntro; - - @ApiModelProperty(value = "库存") - @Min(value = 0, message = "库存不能为负数") - @Max(value = 99999999, message = "库存不能超过99999999") - private Integer quantity; - - @ApiModelProperty(value = "是否立即发布") - private Boolean release; - - @ApiModelProperty(value = "是否是推荐商品") - private Boolean recommend; - - @ApiModelProperty(value = "商品参数") - private List goodsParamsDTOList; - - @ApiModelProperty(value = "商品图片") - private List goodsGalleryList; - - @ApiModelProperty(value = "运费模板id,不需要运费模板时值是0", required = true) - @NotNull(message = "运费模板不能为空，没有运费模板时，传值0") - @Min(value = 0, message = "运费模板值不正确") - private String templateId; - - @ApiModelProperty(value = "sku列表") - @Valid - private List> skuList; - - @ApiModelProperty(value = "卖点") - private String sellingPoint; - - @ApiModelProperty(value = "销售模式", required = true) - private String salesModel; - - @ApiModelProperty(value = "是否有规格", hidden = true) - private String haveSpec; - - @ApiModelProperty(value = "销售模式", required = true) - private String goodsUnit; - - @ApiModelProperty(value = "商品描述") - private String info; - - @ApiModelProperty(value = "是否重新生成sku数据") - private Boolean regeneratorSkuFlag = true; - - /** - * @see cn.lili.modules.goods.entity.enums.GoodsTypeEnum - */ - @ApiModelProperty(value = "商品类型") - @EnumValue(strValues = {"PHYSICAL_GOODS", "VIRTUAL_GOODS", "E_COUPON"}, message = "商品类型参数值错误") - private String goodsType; - - /** - * 商品视频 - */ - @ApiModelProperty(value = "商品视频") - private String goodsVideo; - - public String getGoodsName() { - //对商品对名称做一个极限处理。这里没有用xss过滤是因为xss过滤为全局过滤，影响很大。 - // 业务中，全局代码中只有商品名称不能拥有英文逗号，是由于商品名称存在一个数据库联合查询，结果要根据逗号分组 - return goodsName.replace(",", ""); - } - - - - //福禄所需参数 - @ApiModelProperty(value = "商品编号", required = true) - @Length(max = 30, message = "商品编号太长，不能超过30个字符") - private String sn; - - @ApiModelProperty(value = "市场价格", required = true) - @NotNull(message = "市场价格不能为空") - private Double cost; - - @ApiModelProperty(value = "重量", required = true) - @NotNull(message = "商品重量不能为空") - @Min(value = 0, message = "重量不能为负数") - @Max(value = 99999999, message = "重量不能超过99999999") - private Double weight; -} diff --git a/framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java b/framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java index 845eab50..7757a7da 100644 --- a/framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java @@ -2,7 +2,6 @@ package cn.lili.modules.goods.service; import cn.lili.modules.goods.entity.dos.Goods; import cn.lili.modules.goods.entity.dto.GoodsOperationDTO; -import cn.lili.modules.goods.entity.dto.GoodsOperationFuLuDTO; import cn.lili.modules.goods.entity.dto.GoodsSearchParams; import cn.lili.modules.goods.entity.enums.GoodsAuthEnum; import cn.lili.modules.goods.entity.enums.GoodsStatusEnum; diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java index 8fe08f5f..29f50414 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java @@ -18,7 +18,6 @@ import cn.lili.modules.goods.entity.dos.Goods; import cn.lili.modules.goods.entity.dos.GoodsGallery; import cn.lili.modules.goods.entity.dos.Wholesale; import cn.lili.modules.goods.entity.dto.GoodsOperationDTO; -import cn.lili.modules.goods.entity.dto.GoodsOperationFuLuDTO; import cn.lili.modules.goods.entity.dto.GoodsParamsDTO; import cn.lili.modules.goods.entity.dto.GoodsSearchParams; import cn.lili.modules.goods.entity.enums.GoodsAuthEnum; diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/FuLuConfigureDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/FuLuConfigureDTO.java deleted file mode 100644 index 571d3d2b..00000000 --- a/framework/src/main/java/cn/lili/modules/store/entity/dto/FuLuConfigureDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.lili.modules.store.entity.dto; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * 店铺福禄配置 - * - * @author pikachu - * @since 2021-01-11 15:10:51 - */ -@Data -public class FuLuConfigureDTO { - - @ApiModelProperty(value = "福禄app密钥") - private String appSecretKey; - - @ApiModelProperty(value = "福禄商户号") - private String merchantNumber; - - @ApiModelProperty(value = "福禄appKEY商户key") - private String appMerchantKey; -} diff --git a/framework/src/main/java/cn/lili/modules/store/mapper/StoreDetailMapper.java b/framework/src/main/java/cn/lili/modules/store/mapper/StoreDetailMapper.java index 20ce9e1c..ade17620 100644 --- a/framework/src/main/java/cn/lili/modules/store/mapper/StoreDetailMapper.java +++ b/framework/src/main/java/cn/lili/modules/store/mapper/StoreDetailMapper.java @@ -2,7 +2,6 @@ package cn.lili.modules.store.mapper; import cn.hutool.core.date.DateTime; import cn.lili.modules.store.entity.dos.StoreDetail; -import cn.lili.modules.store.entity.dto.FuLuConfigureDTO; import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO; import cn.lili.modules.store.entity.dto.StoreDeliverGoodsAddressDTO; import cn.lili.modules.store.entity.dto.StoreSettlementDay; @@ -62,15 +61,6 @@ public interface StoreDetailMapper extends BaseMapper { "from li_store_detail s where s.store_id=#{storeId}") StoreAfterSaleAddressDTO getStoreAfterSaleAddressDTO(String storeId); - /** - * 获取店铺福禄配置DTO - * - * @param storeId 店铺ID - * @return 店铺店铺福禄配置DTO - */ - @Select("select s.app_secret_key,s.merchant_number,s.app_merchant_key from li_store_detail s where s.store_id =#{storeId}") - FuLuConfigureDTO getFuLuConfigureDTO(String storeId); - /** * 获取待结算店铺列表 * diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java b/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java index 150fe05a..d651b6d5 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java @@ -3,7 +3,6 @@ package cn.lili.controller.settings; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.store.entity.dto.FuLuConfigureDTO; import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO; import cn.lili.modules.store.entity.dto.StoreDeliverGoodsAddressDTO; import cn.lili.modules.store.entity.dto.StoreSettingDTO;