bugfix2

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

@@ -2,6 +2,7 @@ package com.caimei365.user.model.vo;
 
 import com.caimei365.user.model.po.ClubPo;
 import com.caimei365.user.model.po.ShopPo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -44,7 +45,12 @@ public class ShopVo implements Serializable {
     /**
      * 联系人邮箱
      */
+    private String email;
     private String contractEmail;
+    /**
+     * 固定电话
+     */
+    private String contractPhone;
     /**
      * 省
      */
@@ -122,4 +128,44 @@ public class ShopVo implements Serializable {
      * 税务登记证
      */
     private String taxLicense;
+    /**
+     * 主打商品说明(productDesc)
+     */
+    private String mainProductDesc;
+    /**
+     * 法人代表
+     */
+    private String legalPerson;
+    /**
+     * 注册资本
+     */
+    private Double registeredCapital;
+    /**
+     * 传真号(fax)
+     */
+    private String faxNumber;
+    /**
+     * 公司性质(nature)
+     */
+    private String companyNature;
+    /**
+     * 年营业额
+     */
+    private Double turnover;
+    /**
+     * 医疗执业许可证(medicalPracticeLicenseImg1)
+     */
+    private String medicalPracticeLicense;
+    /**
+     * 公司介绍(info)
+     */
+    private String shopDesc;
+    /**
+     * 经营范围
+     */
+    private String businessScope;
+    /**
+     * 公司LOGO
+     */
+    private String logo;
 }

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

@@ -47,19 +47,13 @@ public class ClubServiceImpl implements ClubService {
         if (user == null) {
             return ResponseJson.error("用户信息不存在", null);
         }
-        if (!StringUtils.isBlank(user.getAuditNote()) && "2".equals(user.getAuditStatus())) {
-            List<String> list = new ArrayList();
+        if (!StringUtils.isBlank(user.getAuditNote()) && 2 == user.getAuditStatus()) {
             if (user.getAuditNote().contains(",")) {
-                String[] auditNoteArray = user.getAuditNote().split(",");
-                for (String note : auditNoteArray) {
-                    if (!StringUtils.isBlank(note)) {
-                        list.add(note);
-                    }
-                }
+                List<String> list = Arrays.asList(user.getAuditNote().split(","));
+                user.setAuditNoteList(list);
             } else {
-                list.add(user.getAuditStatus().toString());
+                user.setAuditNoteList(Collections.singletonList(user.getAuditStatus().toString()));
             }
-            user.setAuditNoteList(list);
         }
         // 机构信息
         ClubVo club = clubMapper.getClubById(user.getClubId());

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

@@ -14,10 +14,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Description
@@ -54,19 +51,13 @@ public class ShopServiceImpl implements ShopService {
         if (user == null) {
             return ResponseJson.error("用户信息不存在", null);
         }
-        if (!StringUtils.isBlank(user.getAuditNote()) && "2".equals(user.getAuditStatus())) {
-            ArrayList<String> list = new ArrayList<>();
+        if (!StringUtils.isBlank(user.getAuditNote()) && 2 == user.getAuditStatus()) {
             if (user.getAuditNote().contains(",")) {
-                String[] auditNoteArray = user.getAuditNote().split(",");
-                for (String note : auditNoteArray) {
-                    if (!StringUtils.isBlank(note)) {
-                        list.add(note);
-                    }
-                }
+                List<String> list = Arrays.asList(user.getAuditNote().split(","));
+                user.setAuditNoteList(list);
             } else {
-                list.add(user.getAuditStatus().toString());
+                user.setAuditNoteList(Collections.singletonList(user.getAuditStatus().toString()));
             }
-            user.setAuditNoteList(list);
         }
         // 供应商信息
         ShopVo shop = shopMapper.getShopById(user.getShopId());

src/main/resources/mapper/ShopMapper.xml

@@ -89,8 +89,11 @@
     </select>
     <select id="getShopById" resultType="com.caimei365.user.model.vo.ShopVo">
         select userID as userId, shopID as shopId, name, sname as shortName, linkMan, contractMobile,
-               contractEmail1 as contractEmail, provinceID as proviceId, cityID as cityId, townID as townId,
-               address, socialCreditCode, businessLicenseImage as businessLicense, firstShopType,
-               secondShopType, mainpro as mainProduct, addTime, status, validFlag from shop where shopID = #{shopId}
+               contractEmail1 as contractEmail, contractEmail1 as email, provinceID as proviceId, cityID as cityId, townID as townId,
+               address, socialCreditCode, businessLicenseImage as businessLicense, firstShopType, secondShopType,
+               mainpro as mainProduct, productDesc as mainProductDesc,legalPerson,registeredCapital,fax as faxNumber,
+               nature as companyNature, turnover, medicalPracticeLicenseImg1 as medicalPracticeLicense, info as shopDesc,
+               businessScope, logo, addTime, status, contractPhone,  validFlag
+        from shop where shopID = #{shopId}
     </select>
 </mapper>