Browse Source

feat(lawyer): 添加律师收费设置功能

- 在 LawyerUser 实体中新增分钟收费和次数收费相关字段
- 在 LawyerUserDto 和 LawyerUserVo 中同步添加收费字段
- 新增编辑律师收费的接口和实现逻辑
- 更新数据库查询字段以支持新收费字段
- 移除旧的咨询费用配置逻辑
- 实现收费信息的更新接口并返回成功响应
jyc 1 week ago
parent
commit
70f5cd94ba

+ 16 - 0
alien-entity/src/main/java/shop/alien/entity/store/LawyerUser.java

@@ -337,5 +337,21 @@ public class LawyerUser extends Model<LawyerUser> {
     @TableField(exist = false)
     private Integer reviewCount;
 
+    @ApiModelProperty(value = "分钟收费-钱数")
+    @TableField("charge_minute")
+    private Integer chargeMinute;
+
+    @ApiModelProperty(value = "分钟收费-分钟数")
+    @TableField("minute_num")
+    private Integer minuteNum;
+
+    @ApiModelProperty(value = "次数收费-钱数")
+    @TableField("charge_time")
+    private Integer chargeTime;
+
+    @ApiModelProperty(value = "次数收费-次数")
+    @TableField("time_num")
+    private Integer timeNum;
+
 }
 

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

@@ -140,5 +140,21 @@ public class LawyerUserDto implements Serializable {
 
     @ApiModelProperty(value = "验证码")
     private String msgCode;
+
+    @ApiModelProperty(value = "分钟收费-钱数")
+    @TableField("charge_minute")
+    private Integer chargeMinute;
+
+    @ApiModelProperty(value = "分钟收费-分钟数")
+    @TableField("minute_num")
+    private Integer minuteNum;
+
+    @ApiModelProperty(value = "次数收费-钱数")
+    @TableField("charge_time")
+    private Integer chargeTime;
+
+    @ApiModelProperty(value = "次数收费-次数")
+    @TableField("time_num")
+    private Integer timeNum;
 }
 

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

@@ -318,7 +318,21 @@ public class LawyerUserVo implements Serializable {
     @ApiModelProperty(value = "律所地址")
     private String addressNew;
 
+    @ApiModelProperty(value = "分钟收费-钱数")
+    @TableField("charge_minute")
+    private Integer chargeMinute;
 
+    @ApiModelProperty(value = "分钟收费-分钟数")
+    @TableField("minute_num")
+    private Integer minuteNum;
+
+    @ApiModelProperty(value = "次数收费-钱数")
+    @TableField("charge_time")
+    private Integer chargeTime;
+
+    @ApiModelProperty(value = "次数收费-次数")
+    @TableField("time_num")
+    private Integer timeNum;
 
 }
 

+ 4 - 0
alien-entity/src/main/java/shop/alien/mapper/LawyerUserMapper.java

@@ -102,6 +102,10 @@ Integer updateLawyerUser(LawyerUser user);
            "user.personal_introduction, " +
            "user.order_receiving_status, " +
            "user.practice_start_date, " +
+           "user.charge_minute, " +
+           "user.minute_num, " +
+           "user.charge_time, " +
+           "user.time_num, " +
            "firm.firm_name AS firmName, " +
            "firmTwo.payment_account AS paymentNum, " +
            "firmTwo.address AS address, " +

+ 9 - 0
alien-lawyer/src/main/java/shop/alien/lawyer/controller/LawyerUserController.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.*;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.LawyerUser;
 import shop.alien.entity.store.dto.LawyerRecommendedDto;
+import shop.alien.entity.store.dto.LawyerUserDto;
 import shop.alien.entity.store.vo.LawyerUserVo;
 import shop.alien.lawyer.service.LawyerUserService;
 import shop.alien.util.myBaticsPlus.QueryBuilder;
@@ -331,5 +332,13 @@ public class LawyerUserController {
         return lawyerUserService.isRecommended(request.getLawyerId(), request.getIsRecommended());
     }
 
+    @ApiOperation("编辑律师收费")
+    @ApiOperationSupport(order = 19)
+    @PostMapping("/updateLawyerUserCharge")
+    public R<LawyerUserVo> updateLawyerUserCharge(@RequestBody LawyerUserDto lawyerUserDto) {
+        log.info("LawyerUserController.updateLawyerUserCharge?lawyerUserDto={}", lawyerUserDto);
+        return lawyerUserService.updateLawyerUserCharge(lawyerUserDto);
+    }
+
 }
 

+ 3 - 0
alien-lawyer/src/main/java/shop/alien/lawyer/service/LawyerUserService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.bind.annotation.RequestParam;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.LawyerUser;
+import shop.alien.entity.store.dto.LawyerUserDto;
 import shop.alien.entity.store.vo.LawyerUserVo;
 
 import javax.servlet.http.HttpServletResponse;
@@ -193,5 +194,7 @@ public interface LawyerUserService extends IService<LawyerUser> {
                           String endTime,
                           Integer pageNum,
                           Integer pageSize) throws Exception;
+
+    R<LawyerUserVo> updateLawyerUserCharge(LawyerUserDto lawyerUserDto);
 }
 

+ 0 - 4
alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/LawyerUserLogInServiceImpl.java

@@ -42,9 +42,6 @@ public class LawyerUserLogInServiceImpl extends ServiceImpl<LawyerUserMapper, La
     @Value("${jwt.expiration-time}")
     private String effectiveTime;
 
-    @Value("${order.lawyerFee}")
-    private String lawyerFee;
-
     /**
      * 设定初始化默认密码
      */
@@ -116,7 +113,6 @@ public class LawyerUserLogInServiceImpl extends ServiceImpl<LawyerUserMapper, La
             user.setIsRecommended(0);
             user.setOrderReceivingStatus(1);
             user.setPassType(2);
-            user.setConsultationFee(Integer.parseInt(lawyerFee));
             user.setNickName(user.getName() != null && !user.getName().isEmpty() ?
                     user.getName().charAt(0) + "律师" : "律师");
             lawyerUserMapper.insert(user);

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

@@ -14,6 +14,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.*;
+import shop.alien.entity.store.dto.LawyerUserDto;
 import shop.alien.entity.store.excelVo.LawyerUserExcelVo;
 import shop.alien.entity.store.vo.LawyerUserVo;
 import shop.alien.lawyer.config.BaseRedisService;
@@ -820,6 +821,18 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
         EasyExcelUtil.exportExcel(response, excelVoList, LawyerUserExcelVo.class, "中台律师列表", "中台律师列表");
     }
 
+    @Override
+    public R<LawyerUserVo> updateLawyerUserCharge(LawyerUserDto lawyerUserDto) {
+        LawyerUser lawyerUser = new LawyerUser();
+        lawyerUser.setId(lawyerUserDto.getId());
+        lawyerUser.setChargeMinute(lawyerUserDto.getChargeMinute());
+        lawyerUser.setMinuteNum(lawyerUserDto.getMinuteNum());
+        lawyerUser.setChargeTime(lawyerUserDto.getChargeTime());
+        lawyerUser.setTimeNum(lawyerUserDto.getTimeNum());
+        this.updateById(lawyerUser);
+        return R.success("修改成功");
+    }
+
     /**
      * 将LawyerUserVo转换为LawyerUserExcelVo
      *