律师表增加营业执照字段

alien-entity/src/main/java/shop/alien/entity/store/LawyerUser.java

@@ -211,6 +211,10 @@ public class LawyerUser extends Model<LawyerUser> {
     @TableField("id_card_back_image")
     private String idCardBackImage;
 
+    @ApiModelProperty(value = "营业执照照片")
+    @TableField("business_license_image")
+    private String businessLicenseImage;
+
     @ApiModelProperty(value = "服务评分, 0-5分（保留一位小数）")
     @TableField("service_score")
     private Double serviceScore;

alien-entity/src/main/java/shop/alien/entity/store/dto/LawyerUserDto.java

@@ -90,6 +90,10 @@ public class LawyerUserDto implements Serializable {
     @TableField("certificate_image")
     private String certificateImage;
 
+    @ApiModelProperty(value = "营业执照照片（URL）")
+    @TableField("business_license_image")
+    private String businessLicenseImage;
+
     @ApiModelProperty(value = "所属省份")
     @TableField("province")
     private String province;

alien-entity/src/main/java/shop/alien/entity/store/vo/LawyerUserVo.java

@@ -173,6 +173,10 @@ public class LawyerUserVo implements Serializable {
     @TableField("id_card_back_image")
     private String idCardBackImage;
 
+    @ApiModelProperty(value = "营业执照照片")
+    @TableField("business_license_image")
+    private String businessLicenseImage;
+
     @ApiModelProperty(value = "服务评分, 0-5分（保留一位小数）")
     @TableField("service_score")
     private Double serviceScore;

alien-entity/src/main/java/shop/alien/mapper/LawyerUserMapper.java

@@ -59,6 +59,7 @@ public interface LawyerUserMapper extends BaseMapper<LawyerUser> {
         "<if test='certificateImage != null'>certificate_image = #{certificateImage},</if>" +
         "<if test='idCardFrontImage != null'>id_card_front_image = #{idCardFrontImage},</if>" +
         "<if test='idCardBackImage != null'>id_card_back_image = #{idCardBackImage},</if>" +
+        "<if test='businessLicenseImage != null'>business_license_image = #{businessLicenseImage},</if>" +
         "<if test='serviceScore != null'>service_score = #{serviceScore},</if>" +
         "<if test='serviceCount != null'>service_count = #{serviceCount},</if>" +
         "<if test='goodReviewCount != null'>good_review_count = #{goodReviewCount},</if>" +
@@ -107,6 +108,7 @@ Integer updateLawyerUser(LawyerUser user);
            "user.charge_time, " +
            "user.time_num, " +
            "user.certificate_image, " +
+           "user.business_license_image, " +
            "firm.firm_name AS firmName, " +
            "firmTwo.payment_account AS paymentNum, " +
            "firmTwo.address AS address, " +
@@ -115,16 +117,13 @@ Integer updateLawyerUser(LawyerUser user);
            "(SELECT GROUP_CONCAT(id SEPARATOR ',') FROM lawyer_legal_problem_scenario WHERE level = 1) AS firstLevelScenarioId, " +
            "(SELECT GROUP_CONCAT(name SEPARATOR ',') FROM lawyer_legal_problem_scenario WHERE level = 1) AS firstLevelScenario " +
            "FROM lawyer_user user " +
-           "LEFT JOIN law_firm firm ON firm.id = user.firm_id " +
+           "LEFT JOIN law_firm firm ON firm.id = user.firm_id AND firm.delete_flag = 0 " +
            "LEFT JOIN law_firm_payment firmTwo ON firmTwo.firm_id = user.firm_id " +
-           "LEFT JOIN lawyer_service_area area ON area.lawyer_user_id = user.id " +
-           "LEFT JOIN lawyer_legal_problem_scenario a ON a.id = area.problem_scenario_id " +
+           "LEFT JOIN lawyer_service_area area ON area.lawyer_user_id = user.id AND area.delete_flag = 0 AND area.status = 1 " +
+           "LEFT JOIN lawyer_legal_problem_scenario a ON a.id = area.problem_scenario_id AND a.delete_flag = 0 " +
            "<where>" +
            "<if test='lawyerId != null'>user.id = #{lawyerId} AND </if>" +
-           "firm.delete_flag = 0 AND " +
-           "user.delete_flag = 0 AND " +
-           "area.delete_flag = 0 AND " +
-           "a.delete_flag = 0" +
+           "user.delete_flag = 0" +
            "</where>" +
            "GROUP BY " +
            "user.id" +

alien-entity/src/main/resources/mapper/LawyerUserMapper.xml

@@ -39,6 +39,7 @@
         <result column="certificate_image" property="certificateImage" />
         <result column="id_card_front_image" property="idCardFrontImage" />
         <result column="id_card_back_image" property="idCardBackImage" />
+        <result column="business_license_image" property="businessLicenseImage" />
         <result column="service_score" property="serviceScore" />
         <result column="service_count" property="serviceCount" />
         <result column="good_review_count" property="goodReviewCount" />
@@ -70,7 +71,7 @@
         logout_time, logout_code, nick_name, account_blurb, head_img, alipay_account,
         lawyer_certificate_no, law_firm, law_firm_id, practice_years, practice_start_date,
         specialty_fields, certification_status, certification_fail_reason, certification_time,
-        certification_reviewer_id, certificate_image, id_card_front_image, id_card_back_image,
+        certification_reviewer_id, certificate_image, id_card_front_image, id_card_back_image, business_license_image,
         service_score, service_count, good_review_count, medium_review_count, bad_review_count,
         consultation_fee, agency_fee, province, city, district, address, email, gender, birthday,
         personal_introduction, education_background, work_experience, expertise_cases,

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/LawyerUserServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -614,16 +615,19 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
             return R.fail("律师信息已删除");
         }
 
-        LawyerUserVo result=lawyerUserMapper.selectInfo(lawyerId);
+        LawyerUserVo result = lawyerUserMapper.selectInfo(lawyerId);
+        if (result == null) {
+            result = new LawyerUserVo();
+            BeanUtils.copyProperties(lawyer, result);
+        }
 
-        //把result中的数据problemScenarioId，scenarioNames 这两个数据放入到lawyerLegalProblemScenarioList中
         QueryWrapper<LawyerServiceArea> wrapper = new QueryWrapper<>();
         wrapper.in("lsa.lawyer_user_id", lawyerId)
                 .eq("lsa.delete_flag", 0)
                 .eq("lsa.status", 1);
-        result.setLawyerLegalProblemScenarioList(lawyerServiceAreaMapper.getProblemScenario(wrapper));
-
-
+        List<LawyerLegalProblemScenario> scenarios = lawyerServiceAreaMapper.getProblemScenario(wrapper);
+        result.setLawyerLegalProblemScenarioList(
+                scenarios != null ? scenarios : Collections.emptyList());
 
         return R.data(result);
     }