change: 修改表结构, 添加商户logo

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/merchant/MerchantController.java

@@ -13,6 +13,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
+import javax.validation.constraints.*;
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/merchant/vo/MerchantPageReqVO.java

@@ -56,4 +56,7 @@ public class MerchantPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "logo地址", example = "https://www.zhongxing.cn")
+    private String logoUrl;
+
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/merchant/vo/MerchantRespVO.java

@@ -69,4 +69,8 @@ public class MerchantRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "logo地址", example = "https://www.zhongxing.cn")
+    @ExcelProperty("logo地址")
+    private String logoUrl;
+
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/merchant/vo/MerchantSaveReqVO.java

@@ -52,4 +52,7 @@ public class MerchantSaveReqVO {
     @Schema(description = "服务到期时间")
     private LocalDateTime expireTime;
 
+    @Schema(description = "logo地址", example = "https://www.zhongxing.cn")
+    private String logoUrl;
+
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/shop/ShopController.java

@@ -1,10 +1,5 @@
 package cn.newfeifan.mall.module.controller.admin.shop;
 
-import cn.newfeifan.mall.module.controller.admin.shop.vo.ShopRespVO;
-import cn.newfeifan.mall.module.controller.admin.shop.vo.ShopPageReqVO;
-import cn.newfeifan.mall.module.controller.admin.shop.vo.ShopSaveReqVO;
-import cn.newfeifan.mall.module.dal.dataobject.shop.ShopDO;
-import cn.newfeifan.mall.module.service.shop.ShopService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -13,6 +8,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
+import javax.validation.constraints.*;
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
@@ -29,6 +25,9 @@ import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
 import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
 import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.*;
 
+import cn.newfeifan.mall.module.controller.admin.shop.vo.*;
+import cn.newfeifan.mall.module.dal.dataobject.shop.ShopDO;
+import cn.newfeifan.mall.module.service.shop.ShopService;
 
 @Tag(name = "管理后台 - 店铺")
 @RestController

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/shop/vo/ShopPageReqVO.java

@@ -28,4 +28,7 @@ public class ShopPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "logo地址", example = "https://www.zhongxing.cn")
+    private String logoUrl;
+
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/shop/vo/ShopRespVO.java

@@ -33,4 +33,8 @@ public class ShopRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "logo地址", example = "https://www.zhongxing.cn")
+    @ExcelProperty("logo地址")
+    private String logoUrl;
+
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/shop/vo/ShopSaveReqVO.java

@@ -24,4 +24,7 @@ public class ShopSaveReqVO {
     @NotNull(message = "商户id不能为空")
     private Long merchantId;
 
+    @Schema(description = "logo地址", example = "https://www.zhongxing.cn")
+    private String logoUrl;
+
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/dal/dataobject/merchant/MerchantDO.java

@@ -76,5 +76,9 @@ public class MerchantDO extends BaseDO {
      * 服务到期时间
      */
     private LocalDateTime expireTime;
+    /**
+     * logo地址
+     */
+    private String logoUrl;
 
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/dal/dataobject/shop/ShopDO.java

@@ -39,5 +39,9 @@ public class ShopDO extends BaseDO {
      * 商户id
      */
     private Long merchantId;
+    /**
+     * logo地址
+     */
+    private String logoUrl;
 
 }

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/dal/mysql/merchant/MerchantMapper.java

@@ -1,5 +1,7 @@
 package cn.newfeifan.mall.module.dal.mysql.merchant;
 
+import java.util.*;
+
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.newfeifan.mall.framework.mybatis.core.mapper.BaseMapperX;
@@ -30,6 +32,7 @@ public interface MerchantMapper extends BaseMapperX<MerchantDO> {
                 .eqIfPresent(MerchantDO::getBusinessLicensePicture, reqVO.getBusinessLicensePicture())
                 .betweenIfPresent(MerchantDO::getExpireTime, reqVO.getExpireTime())
                 .betweenIfPresent(MerchantDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(MerchantDO::getLogoUrl, reqVO.getLogoUrl())
                 .orderByDesc(MerchantDO::getId));
     }
 

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/dal/mysql/shop/ShopMapper.java

@@ -1,11 +1,13 @@
 package cn.newfeifan.mall.module.dal.mysql.shop;
 
+import java.util.*;
+
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.newfeifan.mall.framework.mybatis.core.mapper.BaseMapperX;
-import cn.newfeifan.mall.module.controller.admin.shop.vo.ShopPageReqVO;
 import cn.newfeifan.mall.module.dal.dataobject.shop.ShopDO;
 import org.apache.ibatis.annotations.Mapper;
+import cn.newfeifan.mall.module.controller.admin.shop.vo.*;
 
 /**
  * 店铺 Mapper
@@ -21,6 +23,7 @@ public interface ShopMapper extends BaseMapperX<ShopDO> {
                 .eqIfPresent(ShopDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(ShopDO::getMerchantId, reqVO.getMerchantId())
                 .betweenIfPresent(ShopDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(ShopDO::getLogoUrl, reqVO.getLogoUrl())
                 .orderByDesc(ShopDO::getId));
     }
 

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/service/merchant/MerchantService.java

@@ -1,10 +1,12 @@
 package cn.newfeifan.mall.module.service.merchant;
 
-import javax.validation.*;
+import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.module.controller.admin.merchant.vo.MerchantPageReqVO;
 import cn.newfeifan.mall.module.controller.admin.merchant.vo.MerchantSaveReqVO;
 import cn.newfeifan.mall.module.dal.dataobject.merchant.MerchantDO;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
+
+import java.util.*;
+import javax.validation.*;
 
 /**
  * 商户 Service 接口

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/service/merchant/MerchantServiceImpl.java

@@ -1,16 +1,18 @@
 package cn.newfeifan.mall.module.service.merchant;
 
+import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.module.controller.admin.merchant.vo.MerchantPageReqVO;
 import cn.newfeifan.mall.module.controller.admin.merchant.vo.MerchantSaveReqVO;
+import cn.newfeifan.mall.module.dal.dataobject.merchant.MerchantDO;
+import cn.newfeifan.mall.module.dal.mysql.merchant.MerchantMapper;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
 
-import cn.newfeifan.mall.module.dal.dataobject.merchant.MerchantDO;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import java.util.*;
 import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 
-import cn.newfeifan.mall.module.dal.mysql.merchant.MerchantMapper;
 
 import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.newfeifan.mall.module.enums.ErrorCodeConstants.MERCHANT_NOT_EXISTS;

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/service/shop/ShopService.java

@@ -1,11 +1,11 @@
 package cn.newfeifan.mall.module.service.shop;
 
+import java.util.*;
 import javax.validation.*;
-
-import cn.newfeifan.mall.module.controller.admin.shop.vo.ShopPageReqVO;
-import cn.newfeifan.mall.module.controller.admin.shop.vo.ShopSaveReqVO;
+import cn.newfeifan.mall.module.controller.admin.shop.vo.*;
 import cn.newfeifan.mall.module.dal.dataobject.shop.ShopDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.framework.common.pojo.PageParam;
 
 /**
  * 店铺 Service 接口

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/service/shop/ShopServiceImpl.java

@@ -1,13 +1,15 @@
 package cn.newfeifan.mall.module.service.shop;
 
-import cn.newfeifan.mall.module.controller.admin.shop.vo.ShopPageReqVO;
-import cn.newfeifan.mall.module.controller.admin.shop.vo.ShopSaveReqVO;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.*;
+import cn.newfeifan.mall.module.controller.admin.shop.vo.*;
 import cn.newfeifan.mall.module.dal.dataobject.shop.ShopDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.framework.common.pojo.PageParam;
 import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 
 import cn.newfeifan.mall.module.dal.mysql.shop.ShopMapper;