修复已知问题

src/main/java/com/gxwebsoft/cms/controller/CmsArticleController.java

@@ -3,6 +3,7 @@ package com.gxwebsoft.cms.controller;
 import com.alipay.api.domain.Article;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.gxwebsoft.cms.entity.CmsArticleContent;
+import com.gxwebsoft.cms.param.CmsNavigationParam;
 import com.gxwebsoft.cms.service.CmsArticleContentService;
 import com.gxwebsoft.common.core.web.BaseController;
 import com.gxwebsoft.cms.service.CmsArticleService;
@@ -14,6 +15,7 @@ import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.BatchParam;
 import com.gxwebsoft.common.core.annotation.OperationLog;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -38,6 +40,8 @@ public class CmsArticleController extends BaseController {
     private CmsArticleService cmsArticleService;
     @Resource
     private CmsArticleContentService articleContentService;
+    @Resource
+    private UserService userService;
 
     @ApiOperation("分页查询文章")
     @GetMapping("/page")
@@ -76,6 +80,12 @@ public class CmsArticleController extends BaseController {
       User loginUser = getLoginUser();
       if (loginUser != null) {
         article.setUserId(loginUser.getUserId());
+        article.setAuthor(loginUser.getNickname());
+        article.setMerchantId(loginUser.getMerchantId());
+      }
+      // 是否密码可见
+      if(article.getPermission() == 2){
+        article.setPassword(userService.encodePassword(article.getPassword()));
       }
       if (cmsArticleService.save(article)) {
         // 保存文章内容
@@ -92,6 +102,10 @@ public class CmsArticleController extends BaseController {
     @ApiOperation("修改文章")
     @PutMapping()
     public ApiResult<?> update(@RequestBody CmsArticle cmsArticle) {
+        // 是否密码可见
+        if(cmsArticle.getPermission() == 2){
+          cmsArticle.setPassword(userService.encodePassword(cmsArticle.getPassword()));
+        }
         if (cmsArticleService.updateById(cmsArticle)) {
             return success("修改成功");
         }
@@ -192,4 +206,13 @@ public class CmsArticleController extends BaseController {
     return success(data);
   }
 
+  @ApiOperation("密码校验")
+  @GetMapping("/checkArticlePassword")
+  public ApiResult<?> checkArticlePassword(CmsArticle param) {
+    if (!userService.comparePassword(param.getPassword(), param.getPassword2())) {
+      return fail("密码不正确");
+    }
+    return success("密码正确");
+  }
+
 }

src/main/java/com/gxwebsoft/cms/controller/CmsNavigationController.java

@@ -17,6 +17,7 @@ import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.BatchParam;
 import com.gxwebsoft.common.core.annotation.OperationLog;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -39,6 +40,8 @@ public class CmsNavigationController extends BaseController {
     private CmsNavigationService cmsNavigationService;
     @Resource
     private CmsDesignService cmsDesignService;
+    @Resource
+    private UserService userService;
 
     @ApiOperation("分页查询网站导航记录表")
     @GetMapping("/page")
@@ -82,6 +85,8 @@ public class CmsNavigationController extends BaseController {
     @PutMapping()
     public ApiResult<?> update(@RequestBody CmsNavigation cmsNavigation) {
         if (cmsNavigationService.updateById(cmsNavigation)) {
+            // 修改成功事务处理
+            cmsNavigationService.saveAsync(cmsNavigation);
             return success("修改成功");
         }
         return fail("修改失败");
@@ -156,4 +161,13 @@ public class CmsNavigationController extends BaseController {
       return success(navigation);
     }
 
+    @ApiOperation("密码校验")
+    @GetMapping("/checkNavigationPassword")
+    public ApiResult<?> checkNavigationPassword(CmsNavigationParam param) {
+      if (!userService.comparePassword(param.getPassword(), param.getPassword2())) {
+        return fail("密码不正确");
+      }
+      return success("密码正确");
+    }
+
 }

src/main/java/com/gxwebsoft/cms/entity/CmsArticle.java

@@ -71,6 +71,16 @@ public class CmsArticle implements Serializable {
     @ApiModelProperty(value = "实际阅读量")
     private Integer actualViews;
 
+    @ApiModelProperty(value = "可见类型 0所有人 1登录可见 2密码可见")
+    private Integer permission;
+
+    @ApiModelProperty(value = "访问密码")
+    private String password;
+
+    @ApiModelProperty(value = "验证密码(前端回传)")
+    @TableField(exist = false)
+    private String password2;
+
     @ApiModelProperty(value = "发布来源客户端 (APP、H5、小程序等)")
     private String platform;
 
@@ -113,8 +123,17 @@ public class CmsArticle implements Serializable {
     @ApiModelProperty(value = "用户ID")
     private Integer userId;
 
+    @ApiModelProperty(value = "作者")
+    private String author;
+
     @ApiModelProperty(value = "商户ID")
-    private Integer merchantId;
+    private Long merchantId;
+
+    @ApiModelProperty(value = "商户名称")
+    private String merchantName;
+
+    @ApiModelProperty(value = "商户名称")
+    private String merchantAvatar;
 
     @ApiModelProperty(value = "昵称")
     @TableField(exist = false)

src/main/java/com/gxwebsoft/cms/entity/CmsNavigation.java

@@ -66,6 +66,10 @@ public class CmsNavigation implements Serializable {
     @ApiModelProperty(value = "访问密码")
     private String password;
 
+    @ApiModelProperty(value = "验证密码(前端回传)")
+    @TableField(exist = false)
+    private String password2;
+
     @ApiModelProperty(value = "位置 0不限 1顶部 2底部")
     private Integer position;
 

src/main/java/com/gxwebsoft/cms/entity/CmsProduct.java

@@ -39,6 +39,9 @@ public class CmsProduct implements Serializable {
     @ApiModelProperty(value = "封面图")
     private String image;
 
+    @ApiModelProperty(value = "标签")
+    private String tag;
+
     @ApiModelProperty(value = "产品详情")
     private String content;
 

src/main/java/com/gxwebsoft/cms/param/CmsArticleParam.java

@@ -43,6 +43,10 @@ public class CmsArticleParam extends BaseParam {
     @ApiModelProperty(value = "话题")
     private String topic;
 
+    @ApiModelProperty(value = "栏目ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer navigationId;
+
     @ApiModelProperty(value = "文章分类ID")
     @QueryField(type = QueryType.EQ)
     private Integer categoryId;
@@ -61,6 +65,18 @@ public class CmsArticleParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer actualViews;
 
+    @ApiModelProperty(value = "可见类型 0所有人 1登录可见 2密码可见")
+    @QueryField(type = QueryType.EQ)
+    private Integer permission;
+
+    @ApiModelProperty(value = "访问密码")
+    @QueryField(type = QueryType.EQ)
+    private String password;
+
+    @ApiModelProperty(value = "访问密码")
+    @QueryField(type = QueryType.EQ)
+    private String password2;
+
     @ApiModelProperty(value = "发布来源客户端 (APP、H5、小程序等)")
     private String platform;
 

src/main/java/com/gxwebsoft/cms/param/CmsNavigationParam.java

@@ -63,8 +63,13 @@ public class CmsNavigationParam extends BaseParam {
     private Integer permission;
 
     @ApiModelProperty(value = "访问密码")
+    @QueryField(type = QueryType.EQ)
     private String password;
 
+    @ApiModelProperty(value = "访问密码")
+    @QueryField(type = QueryType.EQ)
+    private String password2;
+
     @ApiModelProperty(value = "位置 0不限 1顶部 2底部")
     @QueryField(type = QueryType.EQ)
     private Integer position;

src/main/java/com/gxwebsoft/cms/service/impl/CmsArticleServiceImpl.java

@@ -23,7 +23,7 @@ public class CmsArticleServiceImpl extends ServiceImpl<CmsArticleMapper, CmsArti
     @Override
     public PageResult<CmsArticle> pageRel(CmsArticleParam param) {
         PageParam<CmsArticle, CmsArticleParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("sortNumber asc,create_time desc");
         List<CmsArticle> list = baseMapper.selectPageRel(page, param);
         return new PageResult<>(list, page.getTotal());
     }
@@ -33,7 +33,7 @@ public class CmsArticleServiceImpl extends ServiceImpl<CmsArticleMapper, CmsArti
         List<CmsArticle> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<CmsArticle, CmsArticleParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("sortNumber asc,create_time desc");
         return page.sortRecords(list);
     }
 

src/main/java/com/gxwebsoft/cms/service/impl/CmsNavigationServiceImpl.java

@@ -14,6 +14,7 @@ import com.gxwebsoft.cms.param.CmsNavigationParam;
 import com.gxwebsoft.common.core.exception.BusinessException;
 import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.service.UserService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -33,6 +34,9 @@ public class CmsNavigationServiceImpl extends ServiceImpl<CmsNavigationMapper, C
   private CmsDesignService cmsDesignService;
   @Resource
   private CmsNavigationMapper cmsNavigationMapper;
+  @Resource
+  private UserService userService;
+
     @Override
     public PageResult<CmsNavigation> pageRel(CmsNavigationParam param) {
         PageParam<CmsNavigation, CmsNavigationParam> page = new PageParam<>(param);
@@ -98,7 +102,12 @@ public class CmsNavigationServiceImpl extends ServiceImpl<CmsNavigationMapper, C
         }
       }
 
-      // 更新
+      // 3.密码可见
+      if(StrUtil.isNotBlank(navigation.getPassword())){
+        navigation.setPassword(userService.encodePassword(navigation.getPassword()));
+      }
+
+      // 更新操作
       navigation.setPath(path);
       navigation.setComponent(component);
       updateById(navigation);

src/main/java/com/gxwebsoft/cms/service/impl/CmsProductServiceImpl.java

@@ -23,7 +23,7 @@ public class CmsProductServiceImpl extends ServiceImpl<CmsProductMapper, CmsProd
     @Override
     public PageResult<CmsProduct> pageRel(CmsProductParam param) {
         PageParam<CmsProduct, CmsProductParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("sortNumber asc,create_time desc");
         List<CmsProduct> list = baseMapper.selectPageRel(page, param);
         return new PageResult<>(list, page.getTotal());
     }
@@ -33,7 +33,7 @@ public class CmsProductServiceImpl extends ServiceImpl<CmsProductMapper, CmsProd
         List<CmsProduct> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<CmsProduct, CmsProductParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("sortNumber asc,create_time desc");
         return page.sortRecords(list);
     }
 

src/main/java/com/gxwebsoft/cms/service/impl/CmsProductUrlServiceImpl.java

@@ -23,7 +23,7 @@ public class CmsProductUrlServiceImpl extends ServiceImpl<CmsProductUrlMapper, C
     @Override
     public PageResult<CmsProductUrl> pageRel(CmsProductUrlParam param) {
         PageParam<CmsProductUrl, CmsProductUrlParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("create_time asc");
         List<CmsProductUrl> list = baseMapper.selectPageRel(page, param);
         return new PageResult<>(list, page.getTotal());
     }
@@ -33,7 +33,7 @@ public class CmsProductUrlServiceImpl extends ServiceImpl<CmsProductUrlMapper, C
         List<CmsProductUrl> list = baseMapper.selectListRel(param);
         // 排序
         PageParam<CmsProductUrl, CmsProductUrlParam> page = new PageParam<>();
-        page.setDefaultOrder("create_time desc");
+        page.setDefaultOrder("create_time asc");
         return page.sortRecords(list);
     }
 

src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java

@@ -62,6 +62,7 @@ public class MybatisPlusConfig {
       public boolean ignoreTable(String tableName) {
         return Arrays.asList(
           "sys_tenant",
+//          "sys_user",
           "sys_dictionary",
           "sys_dictionary_data",
           "sys_user_oauth",
@@ -73,6 +74,7 @@ public class MybatisPlusConfig {
           "sys_environment",
           "sys_components",
           "sys_website_field",
+//          "sys_company",
           "sys_domain",
           "sys_white_domain",
           "cms_website",

src/main/java/com/gxwebsoft/common/system/controller/MainController.java

@@ -581,6 +581,7 @@ public class MainController extends BaseController {
 
     // 租户初始化
     final Company company = new Company();
+    company.setDomain(tenant.getTenantId().toString().concat(".websoft.top"));
     company.setEmail(email);
     company.setPhone(phone);
     company.setPassword(password);

src/main/java/com/gxwebsoft/common/system/entity/MerchantApply.java

@@ -65,6 +65,9 @@ public class MerchantApply implements Serializable {
     @ApiModelProperty(value = "是否需要审核")
     private Integer goodsReview;
 
+    @ApiModelProperty(value = "用户ID")
+    private Integer userId;
+
     @ApiModelProperty(value = "备注")
     private String comments;
 

src/main/java/com/gxwebsoft/shop/controller/ShopMerchantAccountController.java

@@ -22,7 +22,7 @@ import java.util.List;
  * 商户账号控制器
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:51
  */
 @Api(tags = "商户账号管理")
 @RestController
@@ -41,11 +41,8 @@ public class ShopMerchantAccountController extends BaseController {
     @ApiOperation("查询全部商户账号")
     @GetMapping()
     public ApiResult<List<ShopMerchantAccount>> list(ShopMerchantAccountParam param) {
-        PageParam<ShopMerchantAccount, ShopMerchantAccountParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(shopMerchantAccountService.list(page.getOrderWrapper()));
         // 使用关联查询
-        //return success(shopMerchantAccountService.listRel(param));
+        return success(shopMerchantAccountService.listRel(param));
     }
 
     @PreAuthorize("hasAuthority('shop:shopMerchantAccount:list')")
@@ -53,9 +50,8 @@ public class ShopMerchantAccountController extends BaseController {
     @ApiOperation("根据id查询商户账号")
     @GetMapping("/{id}")
     public ApiResult<ShopMerchantAccount> get(@PathVariable("id") Integer id) {
-        return success(shopMerchantAccountService.getById(id));
         // 使用关联查询
-        //return success(shopMerchantAccountService.getByIdRel(id));
+        return success(shopMerchantAccountService.getByIdRel(id));
     }
 
     @ApiOperation("添加商户账号")

src/main/java/com/gxwebsoft/shop/controller/ShopMerchantApplyController.java

@@ -22,7 +22,7 @@ import java.util.List;
  * 商户入驻申请控制器
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 08:08:23
  */
 @Api(tags = "商户入驻申请管理")
 @RestController
@@ -41,11 +41,8 @@ public class ShopMerchantApplyController extends BaseController {
     @ApiOperation("查询全部商户入驻申请")
     @GetMapping()
     public ApiResult<List<ShopMerchantApply>> list(ShopMerchantApplyParam param) {
-        PageParam<ShopMerchantApply, ShopMerchantApplyParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(shopMerchantApplyService.list(page.getOrderWrapper()));
         // 使用关联查询
-        //return success(shopMerchantApplyService.listRel(param));
+        return success(shopMerchantApplyService.listRel(param));
     }
 
     @PreAuthorize("hasAuthority('shop:shopMerchantApply:list')")
@@ -53,9 +50,8 @@ public class ShopMerchantApplyController extends BaseController {
     @ApiOperation("根据id查询商户入驻申请")
     @GetMapping("/{id}")
     public ApiResult<ShopMerchantApply> get(@PathVariable("id") Integer id) {
-        return success(shopMerchantApplyService.getById(id));
         // 使用关联查询
-        //return success(shopMerchantApplyService.getByIdRel(id));
+        return success(shopMerchantApplyService.getByIdRel(id));
     }
 
     @ApiOperation("添加商户入驻申请")

src/main/java/com/gxwebsoft/shop/controller/ShopMerchantController.java

@@ -1,5 +1,6 @@
 package com.gxwebsoft.shop.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.gxwebsoft.common.core.web.BaseController;
 import com.gxwebsoft.common.system.entity.User;
 import com.gxwebsoft.shop.service.ShopMerchantService;
@@ -22,7 +23,7 @@ import java.util.List;
  * 商户控制器
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:51
  */
 @Api(tags = "商户管理")
 @RestController
@@ -41,21 +42,17 @@ public class ShopMerchantController extends BaseController {
     @ApiOperation("查询全部商户")
     @GetMapping()
     public ApiResult<List<ShopMerchant>> list(ShopMerchantParam param) {
-        PageParam<ShopMerchant, ShopMerchantParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(shopMerchantService.list(page.getOrderWrapper()));
         // 使用关联查询
-        //return success(shopMerchantService.listRel(param));
+        return success(shopMerchantService.listRel(param));
     }
 
     @PreAuthorize("hasAuthority('shop:shopMerchant:list')")
     @OperationLog
     @ApiOperation("根据id查询商户")
     @GetMapping("/{id}")
-    public ApiResult<ShopMerchant> get(@PathVariable("id") Integer id) {
+    public ApiResult<ShopMerchant> get(@PathVariable("id") Long id) {
-        return success(shopMerchantService.getById(id));
         // 使用关联查询
-        //return success(shopMerchantService.getByIdRel(id));
+        return success(shopMerchantService.getByIdRel(id));
     }
 
     @ApiOperation("添加商户")
@@ -117,4 +114,12 @@ public class ShopMerchantController extends BaseController {
         return fail("删除失败");
     }
 
+    @ApiOperation("我的商户信息")
+    @GetMapping("/getByUserId")
+    public ApiResult<ShopMerchant> getByUserId() {
+      // 使用关联查询
+      final ShopMerchant shopMerchant = shopMerchantService.getOne(new LambdaQueryWrapper<ShopMerchant>().eq(ShopMerchant::getUserId, getLoginUser().getUserId()).last("limit 1"));
+      return success(shopMerchant);
+    }
+
 }

src/main/java/com/gxwebsoft/shop/controller/ShopMerchantCountController.java

@@ -22,7 +22,7 @@ import java.util.List;
  * 门店销售统计表控制器
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:51
  */
 @Api(tags = "门店销售统计表管理")
 @RestController
@@ -41,11 +41,8 @@ public class ShopMerchantCountController extends BaseController {
     @ApiOperation("查询全部门店销售统计表")
     @GetMapping()
     public ApiResult<List<ShopMerchantCount>> list(ShopMerchantCountParam param) {
-        PageParam<ShopMerchantCount, ShopMerchantCountParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(shopMerchantCountService.list(page.getOrderWrapper()));
         // 使用关联查询
-        //return success(shopMerchantCountService.listRel(param));
+        return success(shopMerchantCountService.listRel(param));
     }
 
     @PreAuthorize("hasAuthority('shop:shopMerchantCount:list')")
@@ -53,9 +50,8 @@ public class ShopMerchantCountController extends BaseController {
     @ApiOperation("根据id查询门店销售统计表")
     @GetMapping("/{id}")
     public ApiResult<ShopMerchantCount> get(@PathVariable("id") Integer id) {
-        return success(shopMerchantCountService.getById(id));
         // 使用关联查询
-        //return success(shopMerchantCountService.getByIdRel(id));
+        return success(shopMerchantCountService.getByIdRel(id));
     }
 
     @ApiOperation("添加门店销售统计表")

src/main/java/com/gxwebsoft/shop/controller/ShopMerchantTypeController.java

@@ -22,7 +22,7 @@ import java.util.List;
  * 商户类型控制器
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:52
  */
 @Api(tags = "商户类型管理")
 @RestController
@@ -41,11 +41,8 @@ public class ShopMerchantTypeController extends BaseController {
     @ApiOperation("查询全部商户类型")
     @GetMapping()
     public ApiResult<List<ShopMerchantType>> list(ShopMerchantTypeParam param) {
-        PageParam<ShopMerchantType, ShopMerchantTypeParam> page = new PageParam<>(param);
-        page.setDefaultOrder("create_time desc");
-        return success(shopMerchantTypeService.list(page.getOrderWrapper()));
         // 使用关联查询
-        //return success(shopMerchantTypeService.listRel(param));
+        return success(shopMerchantTypeService.listRel(param));
     }
 
     @PreAuthorize("hasAuthority('shop:shopMerchantType:list')")
@@ -53,9 +50,8 @@ public class ShopMerchantTypeController extends BaseController {
     @ApiOperation("根据id查询商户类型")
     @GetMapping("/{id}")
     public ApiResult<ShopMerchantType> get(@PathVariable("id") Integer id) {
-        return success(shopMerchantTypeService.getById(id));
         // 使用关联查询
-        //return success(shopMerchantTypeService.getByIdRel(id));
+        return success(shopMerchantTypeService.getByIdRel(id));
     }
 
     @ApiOperation("添加商户类型")

src/main/java/com/gxwebsoft/shop/entity/ShopMerchant.java

@@ -3,9 +3,11 @@ package com.gxwebsoft.shop.entity;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
+import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,7 +17,7 @@ import lombok.EqualsAndHashCode;
  * 商户
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:51
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -25,7 +27,7 @@ public class ShopMerchant implements Serializable {
 
     @ApiModelProperty(value = "ID")
     @TableId(value = "merchant_id", type = IdType.AUTO)
-    private Long merchantId;
+    private Integer merchantId;
 
     @ApiModelProperty(value = "商户名称")
     private String merchantName;
@@ -54,9 +56,19 @@ public class ShopMerchant implements Serializable {
     @ApiModelProperty(value = "商户分类")
     private String category;
 
+    @ApiModelProperty(value = "商户经营分类")
+    private Integer merchantCategoryId;
+
+    @ApiModelProperty(value = "商户分类")
+    private String merchantCategoryTitle;
+
     @ApiModelProperty(value = "经纬度")
     private String lngAndLat;
 
+    private String lng;
+
+    private String lat;
+
     @ApiModelProperty(value = "所在省份")
     private String province;
 

src/main/java/com/gxwebsoft/shop/entity/ShopMerchantAccount.java

@@ -2,8 +2,10 @@ package com.gxwebsoft.shop.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,7 +15,7 @@ import lombok.EqualsAndHashCode;
  * 商户账号
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:51
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -32,7 +34,7 @@ public class ShopMerchantAccount implements Serializable {
     private String realName;
 
     @ApiModelProperty(value = "商户ID")
-    private Long merchantId;
+    private Integer merchantId;
 
     @ApiModelProperty(value = "角色ID")
     private Integer roleId;

src/main/java/com/gxwebsoft/shop/entity/ShopMerchantApply.java

@@ -3,8 +3,10 @@ package com.gxwebsoft.shop.entity;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,7 +16,7 @@ import lombok.EqualsAndHashCode;
  * 商户入驻申请
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 08:08:23
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -38,6 +40,9 @@ public class ShopMerchantApply implements Serializable {
     @ApiModelProperty(value = "商户姓名")
     private String realName;
 
+    @ApiModelProperty(value = "身份证号码")
+    private String idCard;
+
     @ApiModelProperty(value = "店铺类型")
     private String shopType;
 

src/main/java/com/gxwebsoft/shop/entity/ShopMerchantCount.java

@@ -2,8 +2,10 @@ package com.gxwebsoft.shop.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,7 +15,7 @@ import lombok.EqualsAndHashCode;
  * 门店销售统计表
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:51
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

src/main/java/com/gxwebsoft/shop/entity/ShopMerchantType.java

@@ -2,8 +2,10 @@ package com.gxwebsoft.shop.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,7 +15,7 @@ import lombok.EqualsAndHashCode;
  * 商户类型
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:52
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

src/main/java/com/gxwebsoft/shop/mapper/ShopMerchantAccountMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
  * 商户账号Mapper
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:51
  */
 public interface ShopMerchantAccountMapper extends BaseMapper<ShopMerchantAccount> {
 

src/main/java/com/gxwebsoft/shop/mapper/ShopMerchantApplyMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
  * 商户入驻申请Mapper
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 08:08:23
  */
 public interface ShopMerchantApplyMapper extends BaseMapper<ShopMerchantApply> {
 

src/main/java/com/gxwebsoft/shop/mapper/ShopMerchantCountMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
  * 门店销售统计表Mapper
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:51
  */
 public interface ShopMerchantCountMapper extends BaseMapper<ShopMerchantCount> {
 

src/main/java/com/gxwebsoft/shop/mapper/ShopMerchantMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
  * 商户Mapper
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:51
  */
 public interface ShopMerchantMapper extends BaseMapper<ShopMerchant> {
 

src/main/java/com/gxwebsoft/shop/mapper/ShopMerchantTypeMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
  * 商户类型Mapper
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:52
  */
 public interface ShopMerchantTypeMapper extends BaseMapper<ShopMerchantType> {
 

src/main/java/com/gxwebsoft/shop/mapper/xml/ShopMerchantApplyMapper.xml

@@ -22,6 +22,9 @@
             <if test="param.realName != null">
                 AND a.real_name LIKE CONCAT('%', #{param.realName}, '%')
             </if>
+            <if test="param.idCard != null">
+                AND a.id_card LIKE CONCAT('%', #{param.idCard}, '%')
+            </if>
             <if test="param.shopType != null">
                 AND a.shop_type LIKE CONCAT('%', #{param.shopType}, '%')
             </if>

src/main/java/com/gxwebsoft/shop/mapper/xml/ShopMerchantMapper.xml

@@ -37,9 +37,21 @@
             <if test="param.category != null">
                 AND a.category LIKE CONCAT('%', #{param.category}, '%')
             </if>
+            <if test="param.merchantCategoryId != null">
+                AND a.merchant_category_id = #{param.merchantCategoryId}
+            </if>
+            <if test="param.merchantCategoryTitle != null">
+                AND a.merchant_category_title LIKE CONCAT('%', #{param.merchantCategoryTitle}, '%')
+            </if>
             <if test="param.lngAndLat != null">
                 AND a.lng_and_lat LIKE CONCAT('%', #{param.lngAndLat}, '%')
             </if>
+            <if test="param.lng != null">
+                AND a.lng LIKE CONCAT('%', #{param.lng}, '%')
+            </if>
+            <if test="param.lat != null">
+                AND a.lat LIKE CONCAT('%', #{param.lat}, '%')
+            </if>
             <if test="param.province != null">
                 AND a.province LIKE CONCAT('%', #{param.province}, '%')
             </if>

src/main/java/com/gxwebsoft/shop/param/ShopMerchantAccountParam.java

@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
  * 商户账号查询参数
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:51
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

src/main/java/com/gxwebsoft/shop/param/ShopMerchantApplyParam.java

@@ -15,7 +15,7 @@ import java.math.BigDecimal;
  * 商户入驻申请查询参数
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 08:08:23
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -40,6 +40,9 @@ public class ShopMerchantApplyParam extends BaseParam {
     @ApiModelProperty(value = "商户姓名")
     private String realName;
 
+    @ApiModelProperty(value = "身份证号码")
+    private String idCard;
+
     @ApiModelProperty(value = "店铺类型")
     private String shopType;
 

src/main/java/com/gxwebsoft/shop/param/ShopMerchantCountParam.java

@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
  * 门店销售统计表查询参数
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:51
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

src/main/java/com/gxwebsoft/shop/param/ShopMerchantParam.java

@@ -15,7 +15,7 @@ import java.math.BigDecimal;
  * 商户查询参数
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:51
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -56,9 +56,20 @@ public class ShopMerchantParam extends BaseParam {
     @ApiModelProperty(value = "商户分类")
     private String category;
 
+    @ApiModelProperty(value = "商户经营分类")
+    @QueryField(type = QueryType.EQ)
+    private Integer merchantCategoryId;
+
+    @ApiModelProperty(value = "商户分类")
+    private String merchantCategoryTitle;
+
     @ApiModelProperty(value = "经纬度")
     private String lngAndLat;
 
+    private String lng;
+
+    private String lat;
+
     @ApiModelProperty(value = "所在省份")
     private String province;
 

src/main/java/com/gxwebsoft/shop/param/ShopMerchantTypeParam.java

@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
  * 商户类型查询参数
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:51
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

src/main/java/com/gxwebsoft/shop/service/ShopMerchantAccountService.java

@@ -11,7 +11,7 @@ import java.util.List;
  * 商户账号Service
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:51
  */
 public interface ShopMerchantAccountService extends IService<ShopMerchantAccount> {
 

src/main/java/com/gxwebsoft/shop/service/ShopMerchantApplyService.java

@@ -11,7 +11,7 @@ import java.util.List;
  * 商户入驻申请Service
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 08:08:23
  */
 public interface ShopMerchantApplyService extends IService<ShopMerchantApply> {
 

src/main/java/com/gxwebsoft/shop/service/ShopMerchantCountService.java

@@ -11,7 +11,7 @@ import java.util.List;
  * 门店销售统计表Service
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:51
  */
 public interface ShopMerchantCountService extends IService<ShopMerchantCount> {
 

src/main/java/com/gxwebsoft/shop/service/ShopMerchantService.java

@@ -11,7 +11,7 @@ import java.util.List;
  * 商户Service
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:51
  */
 public interface ShopMerchantService extends IService<ShopMerchant> {
 

src/main/java/com/gxwebsoft/shop/service/ShopMerchantTypeService.java

@@ -11,7 +11,7 @@ import java.util.List;
  * 商户类型Service
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:52
  */
 public interface ShopMerchantTypeService extends IService<ShopMerchantType> {
 

src/main/java/com/gxwebsoft/shop/service/impl/ShopMerchantAccountServiceImpl.java

@@ -15,7 +15,7 @@ import java.util.List;
  * 商户账号Service实现
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:51
  */
 @Service
 public class ShopMerchantAccountServiceImpl extends ServiceImpl<ShopMerchantAccountMapper, ShopMerchantAccount> implements ShopMerchantAccountService {

src/main/java/com/gxwebsoft/shop/service/impl/ShopMerchantApplyServiceImpl.java

@@ -15,7 +15,7 @@ import java.util.List;
  * 商户入驻申请Service实现
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 08:08:23
  */
 @Service
 public class ShopMerchantApplyServiceImpl extends ServiceImpl<ShopMerchantApplyMapper, ShopMerchantApply> implements ShopMerchantApplyService {

src/main/java/com/gxwebsoft/shop/service/impl/ShopMerchantCountServiceImpl.java

@@ -15,7 +15,7 @@ import java.util.List;
  * 门店销售统计表Service实现
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:51
  */
 @Service
 public class ShopMerchantCountServiceImpl extends ServiceImpl<ShopMerchantCountMapper, ShopMerchantCount> implements ShopMerchantCountService {

src/main/java/com/gxwebsoft/shop/service/impl/ShopMerchantServiceImpl.java

@@ -15,7 +15,7 @@ import java.util.List;
  * 商户Service实现
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:51
  */
 @Service
 public class ShopMerchantServiceImpl extends ServiceImpl<ShopMerchantMapper, ShopMerchant> implements ShopMerchantService {

src/main/java/com/gxwebsoft/shop/service/impl/ShopMerchantTypeServiceImpl.java

@@ -15,7 +15,7 @@ import java.util.List;
  * 商户类型Service实现
  *
  * @author 科技小王子
- * @since 2024-09-10 21:05:07
+ * @since 2024-10-02 10:07:52
  */
 @Service
 public class ShopMerchantTypeServiceImpl extends ServiceImpl<ShopMerchantTypeMapper, ShopMerchantType> implements ShopMerchantTypeService {

src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@
 # 数据源配置
 spring:
   datasource:
-    url: jdbc:mysql://47.119.165.234:3308/gxwebsoft_core?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://47.119.165.234:3308/gxwebsoft_core?useSSL=false&serverTimezone=UTC
     username: gxwebsoft_core
     password: jdj7HYEdYHnYEFBy
     driver-class-name: com.mysql.cj.jdbc.Driver

src/main/resources/application-prod.yml

@@ -3,7 +3,7 @@
 # 数据源配置
 spring:
   datasource:
-    url: jdbc:mysql://127.0.0.1:3308/gxwebsoft_core?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://127.0.0.1:3308/gxwebsoft_core?useSSL=false&serverTimezone=UTC
     username: gxwebsoft_core
     password: jdj7HYEdYHnYEFBy
     driver-class-name: com.mysql.cj.jdbc.Driver

src/main/resources/application.yml

@@ -1,9 +1,9 @@
 # 端口
 server:
-  port: 9090
+  port: 30000
 # socketIo
 socketio:
-  port: 9191
+  port: 30091
 # 多环境配置
 spring:
   profiles:

src/test/java/com/gxwebsoft/generator/ShoplGenerator.java

@@ -20,7 +20,7 @@ import java.util.Map;
  * @author WebSoft
  * @since 2021-09-05 00:31:14
  */
-public class MallGenerator {
+public class ShoplGenerator {
   // 输出位置
   private static final String OUTPUT_LOCATION = System.getProperty("user.dir");
   //private static final String OUTPUT_LOCATION = "D:/codegen";  // 不想生成到项目中可以写磁盘路径
@@ -46,40 +46,40 @@ public class MallGenerator {
   private static final String MODULE_NAME = "shop";
   // 需要生成的表
   private static final String[] TABLE_NAMES = new String[]{
-    "shop_brand",
+//    "shop_brand",
-    "shop_cart",
+//    "shop_cart",
-    "shop_cashier",
+//    "shop_cashier",
-    "shop_count",
+//    "shop_count",
-    "shop_dealer_apply",
+//    "shop_dealer_apply",
-    "shop_dealer_capital",
+//    "shop_dealer_capital",
-    "shop_dealer_order",
+//    "shop_dealer_order",
-    "shop_dealer_referee",
+//    "shop_dealer_referee",
-    "shop_dealer_setting",
+//    "shop_dealer_setting",
-    "shop_dealer_user",
+//    "shop_dealer_user",
-    "shop_dealer_withdraw",
+//    "shop_dealer_withdraw",
-    "shop_goods",
+//    "shop_goods",
-    "shop_goods_category",
+//    "shop_goods_category",
-    "shop_goods_comment",
+//    "shop_goods_comment",
-    "shop_goods_coupon",
+//    "shop_goods_coupon",
-    "shop_goods_log",
+//    "shop_goods_log",
-    "shop_goods_relation",
+//    "shop_goods_relation",
-    "shop_goods_sku",
+//    "shop_goods_sku",
-    "shop_goods_spec",
+//    "shop_goods_spec",
     "shop_merchant",
     "shop_merchant_account",
-    "shop_merchant_apply",
+//    "shop_merchant_apply",
     "shop_merchant_count",
     "shop_merchant_type",
-    "shop_order",
+//    "shop_order",
-    "shop_order_cart_info",
+//    "shop_order_cart_info",
-    "shop_order_goods",
+//    "shop_order_goods",
-    "shop_order_info",
+//    "shop_order_info",
-    "shop_order_info_log",
+//    "shop_order_info_log",
-    "shop_spec",
+//    "shop_spec",
-    "shop_spec_value",
+//    "shop_spec_value",
-    "shop_user_address",
+//    "shop_user_address",
-    "shop_user_collection",
+//    "shop_user_collection",
-    "shop_wechat_deposit"
+//    "shop_wechat_deposit"
   };
   // 需要去除的表前缀
   private static final String[] TABLE_PREFIX = new String[]{