修改机构资料

src/main/java/com/caimei365/user/controller/ClubApi.java

@@ -40,6 +40,32 @@ public class ClubApi {
     /**
      * 修改机构资料
      *
+     * spi旧接口：/operation/modifiedData
+     *
+     *
+						userID:this.userID,
+						clubID:this.clubID,					//会所ID
+						name:this.clubName,
+						linkMan1:this.clubContact,
+						sname:this.abbreviation,
+						provinceID:this.addressData.provinceID,
+						cityID:this.addressData.cityID,
+						townID:this.addressData.townID,
+						address:this.addressData.addressDetail,
+						socialCreditCode:this.socialCreditCode,
+						businessLicenseImage:this.uploadBusinessImage,
+						headpic:this.uploadMentuzImage,
+						firstClubType:this.isOrganizationType, //机构类型分类 医美:0和生美:1
+						secondClubType:this.secondClubType,		//机构类型二级分类 诊所:1,门诊:2,医院:3
+						department:this.department,				//科室
+						medicalPracticeLicenseImg:this.uploadMedicalImage,//资质图片
+						isAgreed:this.isAgreed,				//是否勾选协议
+						mainpro:this.mainpro,
+						fax:this.clubFax,
+						contractPhone:this.clubTelePhone,
+						info : this.companyPprofile,
+     *
+     *
      */
     @GetMapping("/info/update")
     public ResponseJson<Map<String, Object>> updateClubUserInfo() {

src/main/java/com/caimei365/user/mapper/BaseMapper.java

@@ -1,5 +1,8 @@
 package com.caimei365.user.mapper;
 
+import com.caimei365.user.model.vo.CityVo;
+import com.caimei365.user.model.vo.ProvinceVo;
+import com.caimei365.user.model.vo.TownVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -32,4 +35,28 @@ public interface BaseMapper {
      * @return userId
      */
     Integer getOperationIdByMobile(@Param("mobile") String mobile);
+
+    /**
+     * 省
+     *
+     * @param provinceId
+     * @return
+     */
+    ProvinceVo getProvince(Integer provinceId);
+
+    /**
+     * 市
+     *
+     * @param cityId
+     * @return
+     */
+    CityVo getCity(Integer cityId);
+
+    /**
+     * 区
+     *
+     * @param townId
+     * @return
+     */
+    TownVo getTown(Integer townId);
 }

src/main/java/com/caimei365/user/mapper/ClubMapper.java

@@ -1,7 +1,8 @@
 package com.caimei365.user.mapper;
 
 import com.caimei365.user.model.po.ClubPo;
-import com.caimei365.user.model.po.UserPo;
+import com.caimei365.user.model.vo.ClubVo;
+import com.caimei365.user.model.vo.UserVo;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -17,12 +18,12 @@ public interface ClubMapper {
      * @param userId
      * @return
      */
-    UserPo getUserByUserId(Integer userId);
+    UserVo getUserByUserId(Integer userId);
 
     /**
      * 根据Id查询机构
      * @param clubId
      * @return
      */
-    ClubPo getClubById(Integer clubId);
+    ClubVo getClubById(Integer clubId);
 }

src/main/java/com/caimei365/user/model/vo/CityVo.java

@@ -0,0 +1,36 @@
+package com.caimei365.user.model.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2021/3/15
+ */
+@Data
+public class CityVo implements Serializable {
+    /**
+     * 市Id
+     */
+    private Integer cityId;
+
+    /**
+     * 所属省Id
+     */
+    private Integer provinceId;
+
+    /**
+     * 市名
+     */
+    private String name;
+
+    /**
+     * 是否有效(0 无效,1 有效)
+     */
+    private String validFlag;
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/caimei365/user/model/vo/ClubVo.java

@@ -0,0 +1,20 @@
+package com.caimei365.user.model.vo;
+
+import com.caimei365.user.model.po.ClubPo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2021/3/15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ClubVo extends ClubPo {
+    /**
+     * 省市区地址
+     */
+    private String provincialAddress;
+}

src/main/java/com/caimei365/user/model/vo/ProvinceVo.java

@@ -0,0 +1,37 @@
+package com.caimei365.user.model.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2021/3/15
+ */
+@Data
+public class ProvinceVo implements Serializable {
+    private Integer provinceId;
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 是否可用，1可用
+     */
+    private String validFlag;
+
+    /**
+     * 运费
+     */
+    private Double deliveryFee;
+
+    /**
+     * 最低包邮金额
+     */
+    private Double freeMinTotalPrice;
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/caimei365/user/model/vo/TownVo.java

@@ -0,0 +1,43 @@
+package com.caimei365.user.model.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2021/3/15
+ */
+@Data
+public class TownVo implements Serializable {
+    private Integer townId;
+
+    /**
+     * 所在城市Id
+     */
+    private Integer cityId;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 邮编
+     */
+    private String zip;
+
+    /**
+     * 电话区号
+     */
+    private String telZip;
+
+    /**
+     * 是否可用，1可用
+     */
+    private String validFlag;
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/caimei365/user/model/vo/UserVo.java

@@ -0,0 +1,36 @@
+package com.caimei365.user.model.vo;
+
+import com.caimei365.user.model.po.UserPo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2021/3/15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UserVo extends UserPo {
+    /**
+     * 审核状态,0 待审 1 审核通过 2 审核不通过
+     */
+    private String auditStatus;
+
+    /**
+     * 审核时间
+     */
+    private String auditTime;
+
+    /**
+     * 审核备注
+     */
+    private String auditNote;
+    /**
+     * 审核不通过原因列表
+     */
+    private List<String> auditNoteList;
+}

src/main/java/com/caimei365/user/service/impl/ClubServiceImpl.java

@@ -3,8 +3,7 @@ package com.caimei365.user.service.impl;
 import com.caimei365.user.mapper.BaseMapper;
 import com.caimei365.user.mapper.ClubMapper;
 import com.caimei365.user.model.ResponseJson;
-import com.caimei365.user.model.po.ClubPo;
-import com.caimei365.user.model.po.UserPo;
+import com.caimei365.user.model.vo.*;
 import com.caimei365.user.service.ClubService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -28,6 +27,8 @@ public class ClubServiceImpl implements ClubService {
 
     @Resource
     private ClubMapper clubMapper;
+    @Resource
+    private BaseMapper baseMapper;
 
     /**
      * 根据用户Id查询机构资料
@@ -37,14 +38,39 @@ public class ClubServiceImpl implements ClubService {
      */
     @Override
     public ResponseJson<Map<String, Object>> getClubUserInfo(Integer userId) {
-        UserPo user = clubMapper.getUserByUserId(userId);
+        if (null == userId) {
+            return ResponseJson.error("参数异常", null);
+        }
+        // 用户信息
+        UserVo user = clubMapper.getUserByUserId(userId);
         if (user == null) {
             return ResponseJson.error("用户信息不存在", null);
         }
-        ClubPo club = clubMapper.getClubById(user.getClubId());
+        if (!StringUtils.isBlank(user.getAuditNote()) && "2".equals(user.getAuditStatus())) {
+            List<String> list = new ArrayList();
+            if (user.getAuditNote().contains(",")) {
+                String[] auditNoteArray = user.getAuditNote().split(",");
+                for (String note : auditNoteArray) {
+                    if (!StringUtils.isBlank(note)) {
+                        list.add(note);
+                    }
+                }
+            } else {
+                list.add(user.getAuditStatus());
+            }
+            user.setAuditNoteList(list);
+        }
+        // 机构信息
+        ClubVo club = clubMapper.getClubById(user.getClubId());
         if (club == null) {
             return ResponseJson.error("机构信息不存在", null);
         }
+        if (null != club.getTownId()) {
+            TownVo town = baseMapper.getTown(club.getTownId());
+            CityVo city = baseMapper.getCity(town.getCityId());
+            ProvinceVo province = baseMapper.getProvince(city.getProvinceId());
+            club.setProvincialAddress(province.getName() + "" + city.getName() + "" + town.getName());
+        }
         Map<String, Object> map = new HashMap(2);
         map.put("user", user);
         map.put("club", club);

src/main/resources/mapper/BaseMapper.xml

@@ -19,4 +19,16 @@
         where mobile = #{mobile} and delFlag = '0'
         limit 1
     </select>
+    <select id="getProvince" resultType="com.caimei365.user.model.vo.ProvinceVo">
+        select provinceID as provinceId, name, validFlag, deliveryFee, freeMinTotalPrice
+        from province where provinceID = #{provinceId}
+    </select>
+    <select id="getCity" resultType="com.caimei365.user.model.vo.CityVo">
+        select cityID as cityId, provinceID as provinceId, name, validFlag
+        from city where cityID = #{cityId}
+    </select>
+    <select id="getTown" resultType="com.caimei365.user.model.vo.TownVo">
+        select townID as townId, cityID as cityId, name, zip, telZip, validFlag
+        from town where townID = #{townID}
+    </select>
 </mapper>