From 2454c494d87c6bd40e9e751eb1d488d87d3a67db Mon Sep 17 00:00:00 2001
From: lst <lst@peony.cn>
Date: Thu, 5 Sep 2024 14:45:25 +0800
Subject: [PATCH] 开发：区域划分删除、会员审核详情

---
 backend/lpg-common/src/main/java/com/hotent/lpg/common/model/WHyxx.java                                      |  5 +++++
 backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MHyxxController.java                       | 15 +++++++++++++++
 backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MStationRegionalDivisionController.java    | 14 ++++++++++++++
 backend/lpg-manage/src/main/java/com/hotent/lpg/manage/dao/MStationRegionalDivisionDao.java                  |  1 +
 backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/MHyxxManager.java                             |  2 ++
 backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/MStationRegionalDivisionManager.java          |  2 ++
 backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MHyxxManagerImpl.java                    | 26 ++++++++++++++++++++++++++
 backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MStationRegionalDivisionManagerImpl.java |  5 +++++
 backend/lpg-manage/src/main/resources/mapper/MHyxxMapper.xml                                                 |  4 +++-
 backend/lpg-manage/src/main/resources/mapper/MStationRegionalDivisionMapper.xml                              |  4 ++++
 backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/HyxxController.java                            | 43 +++++++++++++++++++++++++++++++++++++++++++
 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/HyxxManager.java                                  |  2 ++
 backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/HyxxManagerImpl.java                         |  6 +++++-
 13 files changed, 127 insertions(+), 2 deletions(-)
 create mode 100644 backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/HyxxController.java

diff --git a/backend/lpg-common/src/main/java/com/hotent/lpg/common/model/WHyxx.java b/backend/lpg-common/src/main/java/com/hotent/lpg/common/model/WHyxx.java
index 01b0d5b..8fce08f 100644
--- a/backend/lpg-common/src/main/java/com/hotent/lpg/common/model/WHyxx.java
+++ b/backend/lpg-common/src/main/java/com/hotent/lpg/common/model/WHyxx.java
@@ -303,4 +303,9 @@ public class WHyxx extends BaseModel<WHyxx> {
     @TableField("F_tjsmrzsj")
     @JsonProperty("fTjsmrzsj")
     private LocalDateTime fTjsmrzsj;
+
+    @ApiModelProperty(value = "理由")
+    @TableField("F_ly")
+    @JsonProperty("fLy")
+    private String fLy;
 }
diff --git a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MHyxxController.java b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MHyxxController.java
index 569e2ce..9a6c2bf 100644
--- a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MHyxxController.java
+++ b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MHyxxController.java
@@ -94,4 +94,19 @@ public class MHyxxController extends BaseController<MHyxxManager, WHyxx> {
         }
         return CommonResult.<String>ok().message("审核成功");
     }
+
+    @GetMapping(value = "/detail/{id}")
+    @ApiOperation(value = "会员认证详情", httpMethod = "POST", notes = "会员认证详情")
+    public CommonResult<Object> detail(@PathVariable("id") String id) throws Exception {
+        if (ObjectUtils.isEmpty(id) ) {
+            return CommonResult.error("请传入会员id");
+        }
+        Object detail = new Object();
+        try {
+            detail = mHyxxManager.detail(id);
+        } catch (Exception e) {
+            return CommonResult.error(e.getMessage());
+        }
+        return CommonResult.<Object>ok().value(detail);
+    }
 }
diff --git a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MStationRegionalDivisionController.java b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MStationRegionalDivisionController.java
index 1395434..dc33ac9 100644
--- a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MStationRegionalDivisionController.java
+++ b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/controller/MStationRegionalDivisionController.java
@@ -10,6 +10,8 @@ import com.hotent.lpg.manage.manager.MStationRegionalDivisionManager;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -90,4 +92,16 @@ public class MStationRegionalDivisionController extends BaseController<MStationR
         }
         return CommonResult.<String>ok().message(msg);
     }
+
+    @RequestMapping(value = "/delById/{id}", method = RequestMethod.DELETE, produces={"application/json; charset=utf-8" })
+    @ApiOperation(value = "删除区域划分信息", httpMethod = "DELETE", notes = "删除区域划分信息")
+    public CommonResult<Object> delById(@PathVariable("id") String id) {
+        WStationRegionalDivision ws = baseService.getById(id);
+        if (ObjectUtils.isEmpty(ws)) {
+            return CommonResult.error("区域信息不存在");
+        }
+        baseService.removeById(id);
+        baseService.removeWStationRegionalDivisionById(ws.getRefId());
+        return CommonResult.ok().message("操作成功");
+    }
 }
diff --git a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/dao/MStationRegionalDivisionDao.java b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/dao/MStationRegionalDivisionDao.java
index 1e2723b..c3a701d 100644
--- a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/dao/MStationRegionalDivisionDao.java
+++ b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/dao/MStationRegionalDivisionDao.java
@@ -31,4 +31,5 @@ public interface MStationRegionalDivisionDao extends BaseMapper<WStationRegional
 
     int updateWStationRegionalDivision_rotundity(WStationRegionalDivision stationRegionalDivision);
 
+    int removeWStationRegionalDivisionById(String id);
 }
diff --git a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/MHyxxManager.java b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/MHyxxManager.java
index bf74871..f54d02d 100644
--- a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/MHyxxManager.java
+++ b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/MHyxxManager.java
@@ -34,4 +34,6 @@ public interface MHyxxManager extends BaseManager<WHyxx> {
      * @param wHyxx
      */
     void audit(WHyxx wHyxx);
+
+    Object detail(String id);
 }
diff --git a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/MStationRegionalDivisionManager.java b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/MStationRegionalDivisionManager.java
index 35c6205..445e34b 100644
--- a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/MStationRegionalDivisionManager.java
+++ b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/MStationRegionalDivisionManager.java
@@ -23,4 +23,6 @@ public interface MStationRegionalDivisionManager extends BaseManager<WStationReg
 	 * @return
 	 */
 	void createOrUpdate(WStationRegionalDivision stationRegionalDivision);
+
+	int removeWStationRegionalDivisionById(String id);
 }
diff --git a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MHyxxManagerImpl.java b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MHyxxManagerImpl.java
index 2da60f0..2ff23a5 100644
--- a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MHyxxManagerImpl.java
+++ b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MHyxxManagerImpl.java
@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
 
@@ -146,6 +147,31 @@ public class MHyxxManagerImpl extends BaseManagerImpl<MHyxxDao, WHyxx> implement
             throw new RuntimeException("会员信息不存在，会员id=" + wHyxx.getId());
         }
         data.setFRzzt(RzztEnum.valueOf(wHyxx.getFRzzt()).getInfo());
+        data.setFLy(wHyxx.getFLy());
         baseMapper.updateById(data);
     }
+
+    @Override
+    public Object detail(String id) {
+        WHyxx wHyxx = baseMapper.selectById(id);
+//        HashMap<String, Object> result = new HashMap<>();
+//        result.put("id", id);
+//        result.put("hylx", wHyxx.getFHylx());
+//        result.put("sfzrxy", wHyxx.getFSfzrxy());//个人身份证
+//        result.put("sfzghy", wHyxx.getFSfzghy());//个人身份证
+//        result.put("sfzh", wHyxx.getFSfzh());//身份证号
+//        result.put("frsfzghy", wHyxx.getFFrsfzghy());//法人身份证
+//        result.put("frsfzghy", wHyxx.getFFrsfzghy());//法人身份证
+//        result.put("xm", wHyxx.getFXm());//姓名
+//        result.put("xb", wHyxx.getFXb());//性别
+//        result.put("symc", wHyxx.getFSymc());//商业名称
+//        result.put("sjh", wHyxx.getFSjh());//联系方式
+//        result.put("nl", wHyxx.getFNl());//年龄
+//        result.put("sfzhyxq", wHyxx.getFSfzhyxq());//身份证有效期
+//        result.put("shtysbm", wHyxx.getFShtysbm());//统一社会信用代码
+//        result.put("rzzt", wHyxx.getFRzzt());//认证状态
+//        result.put("yyzz", wHyxx.getFYyzz());//营业执照
+//        result.put("khxkz", wHyxx.getFKhxkz());//开户许可证
+        return wHyxx;
+    }
 }
diff --git a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MStationRegionalDivisionManagerImpl.java b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MStationRegionalDivisionManagerImpl.java
index 9a31f2e..a0d33b6 100644
--- a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MStationRegionalDivisionManagerImpl.java
+++ b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MStationRegionalDivisionManagerImpl.java
@@ -88,6 +88,11 @@ public class MStationRegionalDivisionManagerImpl extends BaseManagerImpl<MStatio
         }
     }
 
+    @Override
+    public int removeWStationRegionalDivisionById(String id) {
+        return baseMapper.removeWStationRegionalDivisionById(id);
+    }
+
     /**
      * 新增修改点、线、多边形、矩形坐标信息
      *
diff --git a/backend/lpg-manage/src/main/resources/mapper/MHyxxMapper.xml b/backend/lpg-manage/src/main/resources/mapper/MHyxxMapper.xml
index 5ed757e..d202934 100644
--- a/backend/lpg-manage/src/main/resources/mapper/MHyxxMapper.xml
+++ b/backend/lpg-manage/src/main/resources/mapper/MHyxxMapper.xml
@@ -60,6 +60,7 @@
         <result column="F_ssqyID" property="fSsqyID"/>
         <result column="F_ssqymc" property="fSsqymc"/>
         <result column="F_tjsmrzsj" property="fTjsmrzsj"/>
+        <result column="F_ly" property="fLy"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -119,7 +120,8 @@
         F_rzzt,
         F_ssqyID,
         F_ssqymc,
-        F_tjsmrzsj
+        F_tjsmrzsj,
+        F_ly
     </sql>
 
     <select id="selectPage" resultMap="BaseResultMap">
diff --git a/backend/lpg-manage/src/main/resources/mapper/MStationRegionalDivisionMapper.xml b/backend/lpg-manage/src/main/resources/mapper/MStationRegionalDivisionMapper.xml
index 00531a9..66ee77d 100644
--- a/backend/lpg-manage/src/main/resources/mapper/MStationRegionalDivisionMapper.xml
+++ b/backend/lpg-manage/src/main/resources/mapper/MStationRegionalDivisionMapper.xml
@@ -132,4 +132,8 @@
         f_gxsj = SYSDATE()
         where ID_ = #{id}
     </update>
+
+    <delete id="removeWStationRegionalDivisionById">
+        delete from w_station_regional_division_wbb where id = #{id}
+    </delete>
 </mapper>
diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/HyxxController.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/HyxxController.java
new file mode 100644
index 0000000..c593009
--- /dev/null
+++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/controller/HyxxController.java
@@ -0,0 +1,43 @@
+package com.hotent.lpg.user.controller;
+
+
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.hotent.base.controller.BaseController;
+import com.hotent.base.model.CommonResult;
+import com.hotent.lpg.common.model.WHyxx;
+import com.hotent.lpg.user.manager.HyxxManager;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * @author 超级管理员
+ * @company 广州宏天软件股份有限公司
+ * @since 2024-03-12
+ */
+@RestController
+@RequestMapping("/user/mHyxx/v1/")
+public class HyxxController extends BaseController<HyxxManager, WHyxx> {
+
+    @Autowired
+    private HyxxManager hyxxManager;
+
+    @GetMapping(value = "/detail/{id}")
+    @ApiOperation(value = "会员认证详情", httpMethod = "POST", notes = "会员认证详情")
+    public CommonResult<Object> detail(@PathVariable("id") String id) throws Exception {
+        if (ObjectUtils.isEmpty(id)) {
+            return CommonResult.error("请传入会员id");
+        }
+        Object detail = new Object();
+        try {
+            detail = hyxxManager.detail(id);
+        } catch (Exception e) {
+            return CommonResult.error(e.getMessage());
+        }
+        return CommonResult.<Object>ok().value(detail);
+    }
+}
diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/HyxxManager.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/HyxxManager.java
index 1698e60..45f2910 100644
--- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/HyxxManager.java
+++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/HyxxManager.java
@@ -25,4 +25,6 @@ public interface HyxxManager extends BaseManager<WHyxx> {
      * 根据会员信息创建会员和账号信息
      */
     WHyxx createByHyxx(WHyxx wHyxx) throws Exception;
+
+    Object detail(String id);
 }
diff --git a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/HyxxManagerImpl.java b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/HyxxManagerImpl.java
index df29476..629c79a 100644
--- a/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/HyxxManagerImpl.java
+++ b/backend/lpg-user/src/main/java/com/hotent/lpg/user/manager/impl/HyxxManagerImpl.java
@@ -260,5 +260,9 @@ public class HyxxManagerImpl extends BaseManagerImpl<HyxxDao, WHyxx> implements 
         wHyxx.setFHtzzcode(USER_ORG_CODE);
         return wHyxx;
     }
-
+    @Override
+    public Object detail(String id) {
+        WHyxx wHyxx = baseMapper.selectById(id);
+        return wHyxx;
+    }
 }
--
libgit2 0.21.2