From ada55be7dcf046915ac862d5e23d7dac8d569208 Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期四, 15 六月 2023 01:04:19 +0800
Subject: [PATCH] 进件管理
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java | 20 ++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RegionServiceImpl.java | 19 ---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java | 6 +
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java | 21 ++++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java | 20 ++++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 26 +++++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopAuthPageDto.java | 40 ++++++++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopByCodePageDto.java | 23 ++++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopAuthPageVo.java | 34 ++++++
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml | 52 ++++++++++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopAuthentication.java | 28 ++--
11 files changed, 256 insertions(+), 33 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
index ac3dc58..22ac099 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
@@ -7,6 +7,7 @@
import com.ruoyi.shop.domain.vo.*;
import com.ruoyi.shop.service.shop.*;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
+import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestBody;
@@ -175,4 +176,24 @@
shopCertificateService.mgtAuditShopCertificate(mgtAuditShopCertificateDto);
return R.ok();
}
+
+ @RequestMapping(value = "/pageMgtShopByCityCode", method = RequestMethod.POST)
+ @ApiOperation(value = "通过市code分页获取商户列表")
+ public R<Page<MgtSimpleShopVo>> pageMgtShopByCityCode(@RequestBody MgtShopByCodePageDto mgtShopByCodePageDto) {
+ Page<MgtSimpleShopVo> page = new Page<>();
+ page.setSize(mgtShopByCodePageDto.getPageSize());
+ page.setCurrent(mgtShopByCodePageDto.getPageNum());
+ List<MgtSimpleShopVo> mgtSimpleShopVoList = shopService.pageMgtShopByCityCode(page,mgtShopByCodePageDto);
+ return R.ok(page.setRecords(mgtSimpleShopVoList));
+ }
+
+ @RequestMapping(value = "/pageMgtShopAuth", method = RequestMethod.POST)
+ @ApiOperation(value = "分页获取商户进件列表")
+ public R<Page<MgtShopAuthPageVo>> pageMgtShopAuth(@RequestBody MgtShopAuthPageDto mgtShopAuthPageDto) {
+ Page<MgtShopAuthPageVo> page = new Page<>();
+ page.setSize(mgtShopAuthPageDto.getPageSize());
+ page.setCurrent(mgtShopAuthPageDto.getPageNum());
+ List<MgtShopAuthPageVo> mgtShopAuthPageVoList = shopService.pageMgtShopAuth(page,mgtShopAuthPageDto);
+ return R.ok(page.setRecords(mgtShopAuthPageVoList));
+ }
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopAuthPageDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopAuthPageDto.java
new file mode 100644
index 0000000..1d3cdfa
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopAuthPageDto.java
@@ -0,0 +1,40 @@
+package com.ruoyi.shop.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MgtPageDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @version 1.0
+ * @classname MgtShopAuthPageDto
+ * @description: TODO
+ * @date 2023 2023/6/14 22:18
+ */
+@Data
+public class MgtShopAuthPageDto extends MgtPageDto {
+
+
+ @ApiModelProperty(value = "商户名称")
+ private String shopName;
+
+ @ApiModelProperty("店主姓名")
+ private String shopownerName;
+
+ @ApiModelProperty("店主联系方式")
+ private String shopownerPhone;
+
+ @ApiModelProperty("认证类型1个人2企业")
+ private Integer mainType;
+
+ @ApiModelProperty("审核状态0:未提交\n" +
+ " 1：CHECKING：资料校验中\n" +
+ " 2：ACCOUNT_NEED_VERIFY：待账户验证\n" +
+ " 3：AUDITING：审核中\n" +
+ " 4：REJECTED：已驳回\n" +
+ " 5：NEED_SIGN：待签约\n" +
+ " 6：FINISH：完成\n" +
+ " 7：FROZEN：已冻结\n" +
+ " 8：CANCELED：已作废")
+ private Integer auditStatus;
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopByCodePageDto.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopByCodePageDto.java
new file mode 100644
index 0000000..bcca6c9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtShopByCodePageDto.java
@@ -0,0 +1,23 @@
+package com.ruoyi.shop.domain.dto;
+
+import com.ruoyi.system.api.domain.dto.MgtPageDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author jqs34
+ * @version 1.0
+ * @classname MgtShopByCodePageDto
+ * @description: TODO
+ * @date 2023 2023/6/14 20:54
+ */
+@Data
+public class MgtShopByCodePageDto extends MgtPageDto {
+
+
+ @ApiModelProperty(value = "城市列表")
+ private List<String> cityCodeList ;
+
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopAuthentication.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopAuthentication.java
index 2496261..898c107 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopAuthentication.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopAuthentication.java
@@ -1,16 +1,16 @@
package com.ruoyi.shop.domain.pojo.shop;
-import java.math.BigDecimal;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* <p>
@@ -50,14 +50,14 @@
private String applyNumber;
/**
* 审核状态
-1：CHECKING：资料校验中
-2：ACCOUNT_NEED_VERIFY：待账户验证
-3：AUDITING：审核中
-4：REJECTED：已驳回
-5：NEED_SIGN：待签约
-6：FINISH：完成
-7：FROZEN：已冻结
-8：CANCELED：已作废
+ 1：CHECKING：资料校验中
+ 2：ACCOUNT_NEED_VERIFY：待账户验证
+ 3：AUDITING：审核中
+ 4：REJECTED：已驳回
+ 5：NEED_SIGN：待签约
+ 6：FINISH：完成
+ 7：FROZEN：已冻结
+ 8：CANCELED：已作废
*/
@TableField("audit_status")
private Integer auditStatus;
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopAuthPageVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopAuthPageVo.java
new file mode 100644
index 0000000..da02e39
--- /dev/null
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopAuthPageVo.java
@@ -0,0 +1,34 @@
+package com.ruoyi.shop.domain.vo;
+
+import com.ruoyi.system.api.domain.dto.MgtPageDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jqs34
+ * @version 1.0
+ * @classname MgtShopAuthPageVo
+ * @description: TODO
+ * @date 2023 2023/6/14 21:13
+ */
+@Data
+public class MgtShopAuthPageVo extends MgtPageDto {
+
+ @ApiModelProperty(value = "商户id")
+ private Long shopId;
+
+ @ApiModelProperty(value = "商户名称")
+ private String shopName;
+
+ @ApiModelProperty("店主姓名")
+ private String shopownerName;
+
+ @ApiModelProperty("店主联系方式")
+ private String shopownerPhone;
+
+ @ApiModelProperty("认证类型")
+ private String mainType;
+
+ @ApiModelProperty("审核状态")
+ private String auditStatus;
+}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java
index 20aac9a..f11cace 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java
@@ -89,4 +89,24 @@
* @return List<MgtSimpleShopVo>
*/
List<MgtSimpleShopVo> listShopSimpleVoByIds(@Param("shopIds")String shopIds);
+
+ /**
+ * @description pageMgtShopByCityCode
+ * @param page
+ * @param mgtShopByCodePageDto
+ * @return List<MgtSimpleShopVo>
+ * @author jqs34
+ * @date 2023/6/14 20:56
+ */
+ List<MgtSimpleShopVo> pageMgtShopByCityCode(Page page, @Param("param")MgtShopByCodePageDto mgtShopByCodePageDto);
+
+ /**
+ * @description pageMgtShopAuth
+ * @param page
+ * @param mgtShopAuthPageDto
+ * @return List<MgtShopAuthPageVo>
+ * @author jqs34
+ * @date 2023/6/15 0:05
+ */
+ List<MgtShopAuthPageVo> pageMgtShopAuth(Page page, @Param("param")MgtShopAuthPageDto mgtShopAuthPageDto);
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index 41aa9b3..e5307dc 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -566,4 +566,30 @@
public List<MgtSimpleShopVo> listShopSimpleVoByIds(String shopIds){
return shopMapper.listShopSimpleVoByIds(shopIds);
}
+
+ /**
+ * @description pageMgtShopByCityCode
+ * @param page
+ * @param mgtShopByCodePageDto
+ * @return List<MgtSimpleShopVo>
+ * @author jqs34
+ * @date 2023/6/14 20:56
+ */
+ @Override
+ public List<MgtSimpleShopVo> pageMgtShopByCityCode(Page page, MgtShopByCodePageDto mgtShopByCodePageDto){
+ return shopMapper.pageMgtShopByCityCode(page, mgtShopByCodePageDto);
+ }
+
+ /**
+ * @description pageMgtShopAuth
+ * @param page
+ * @param mgtShopAuthPageDto
+ * @return List<MgtShopAuthPageVo>
+ * @author jqs34
+ * @date 2023/6/14 23:01
+ */
+ @Override
+ public List<MgtShopAuthPageVo> pageMgtShopAuth(Page page, MgtShopAuthPageDto mgtShopAuthPageDto){
+ return shopMapper.pageMgtShopAuth(page, mgtShopAuthPageDto);
+ }
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java
index 1d2ff6d..7d3153a 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java
@@ -139,4 +139,24 @@
* @return List<MgtSimpleShopVo>
*/
List<MgtSimpleShopVo> listShopSimpleVoByIds(String shopIds);
+
+ /**
+ * @description pageMgtShopByCityCode
+ * @param page
+ * @param mgtShopByCodePageDto
+ * @return List<MgtSimpleShopVo>
+ * @author jqs34
+ * @date 2023/6/14 20:56
+ */
+ List<MgtSimpleShopVo> pageMgtShopByCityCode(Page page, MgtShopByCodePageDto mgtShopByCodePageDto);
+
+ /**
+ * @description pageMgtShopAuth
+ * @param page
+ * @param mgtShopAuthPageDto
+ * @return List<MgtShopAuthPageVo>
+ * @author jqs34
+ * @date 2023/6/15 0:05
+ */
+ List<MgtShopAuthPageVo> pageMgtShopAuth(Page page, MgtShopAuthPageDto mgtShopAuthPageDto);
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml
index d5aedfd..c446cf7 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml
@@ -484,4 +484,56 @@
FROM t_shop
WHERE del_flag = 0 AND shop_id IN (#{shopIds})
</select>
+
+ <select id="pageMgtShopByCityCode" resultType="com.ruoyi.system.api.domain.vo.MgtSimpleShopVo">
+ SELECT
+ shop_id,
+ shop_name
+ FROM t_shop
+ WHERE del_flag = 0 AND shop_city_code IN
+ <foreach collection="list" item="item" open="(" separator="," close=")">
+ #{param.cityCodeList}
+ </foreach>
+ </select>
+
+ <select id="pageMgtShopAuth" resultType="com.ruoyi.shop.domain.vo.MgtShopAuthPageVo">
+ SELECT
+ ts.shop_id shopId,
+ ts.shop_name shopName,
+ ts.shopowner_name shopownerName,
+ ts.shopowner_phone shopownerPhone,
+ CASE tsa.main_mype
+ WHEN 1 THEN '个人'
+ WHEN 2 THEN '企业'
+ END mainType
+ CASE tsa.audit_status
+ WHEN 0 THEN '未提交'
+ WHEN 1 THEN '资料校验中'
+ WHEN 2 THEN '待账户验证'
+ WHEN 3 THEN '资料校验中'
+ WHEN 4 THEN '待账户验证'
+ WHEN 5 THEN '资料校验中'
+ WHEN 6 THEN '待账户验证'
+ WHEN 7 THEN '资料校验中'
+ WHEN 8 THEN '待账户验证'
+ END audit_status
+ FROM t_shop ts
+ INNER JOIN t_shop_authentication tsa ON ts.shop_id = tsa.shop_id AND tsa.del_flag = 0
+ WHERE ts.del_flag = 0
+ <if test="param.shopName!=null and param.shopName!=''">
+ AND ts.shop_name LIKE CONCAT('%',#{param.shopName},'%')
+ </if>
+ <if test="param.shopownerName!=null and param.shopownerName!=''">
+ AND ts.shopowner_name LIKE CONCAT('%',#{param.shopownerName},'%')
+ </if>
+ <if test="param.shopownerPhone!=null and param.shopownerPhone!=''">
+ AND ts.shopowner_phone LIKE CONCAT('%',#{param.shopownerPhone},'%')
+ </if>
+ <if test="param.mainType!=null and param.mainType!=''">
+ AND tsa.main_mype = #{param.mainType}
+ </if>
+ <if test="param.auditStatus!=null">
+ AND tsa.audit_status = #{param.auditStatus}
+ </if>
+ </select>
</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
index 0386707..015e3db 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
@@ -368,4 +368,10 @@
return R.ok(regionVoList);
}
+ @RequestMapping(value = "/listCity", method = RequestMethod.POST)
+ @ApiOperation(value = "获取省市列表")
+ public R<List<RegionVo>> listCity(){
+ List<RegionVo> regionVoList = regionService.listRegionVo();
+ return R.ok(regionVoList);
+ }
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RegionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RegionServiceImpl.java
index a7fb541..e5e9bb5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RegionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RegionServiceImpl.java
@@ -49,7 +49,6 @@
List<RegionVo> regionVoList = regionMapper.listRegionVo();
List<RegionVo> regionVoList1 = new ArrayList<>();
List<RegionVo> regionVoList2 = new ArrayList<>();
- List<RegionVo> regionVoList3 = new ArrayList<>();
// 将地区按照级别分别存放到不同的列表中
for (RegionVo regionVo : regionVoList) {
if (regionVo.getLevel() == 1) {
@@ -58,26 +57,8 @@
if (regionVo.getLevel() == 2) {
regionVoList2.add(regionVo);
}
- if (regionVo.getLevel() == 3) {
- regionVoList3.add(regionVo);
- }
}
- Iterator<RegionVo> regionVoIterator3;
RegionVo children;
- // 将第三级地区挂到第二级地区下面
- for (RegionVo regionVo : regionVoList2) {
- if (null == regionVo.getChildren()) {
- regionVo.setChildren(new ArrayList<>());
- }
- regionVoIterator3 = regionVoList3.iterator();
- while (regionVoIterator3.hasNext()) {
- children = regionVoIterator3.next();
- if (regionVo.getId().equals(children.getParentId())) {
- regionVo.getChildren().add(children);
- regionVoIterator3.remove();
- }
- }
- }
Iterator<RegionVo> regionVoIterator2;
// 将第二级地区挂到第一级地区下面
for (RegionVo regionVo : regionVoList1) {
--
Gitblit v1.7.1