平台抽成比例从律所表中获取

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

@@ -189,5 +189,9 @@ public class LawFirm extends Model<LawFirm> implements Serializable {
     @ApiModelProperty(value = "律师事务所收款账号")
     @TableField("payment_account")
     private String paymentAccount;
+
+    @ApiModelProperty(value = "律师事务所收款账号")
+    @TableField("platform_commission_ratio")
+    private Float platformCommissionRatio;
 }
 

alien-store/src/main/java/shop/alien/store/service/impl/LawyerConsultationOrderServiceImpl.java

@@ -15,17 +15,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import shop.alien.entity.result.R;
-import shop.alien.entity.store.LawyerConsultationOrder;
-import shop.alien.entity.store.LawyerServiceArea;
-import shop.alien.entity.store.LawyerUser;
-import shop.alien.entity.store.StoreAliPayLog;
+import shop.alien.entity.store.*;
 import shop.alien.entity.store.dto.LawyerConsultationOrderDto;
 import shop.alien.entity.store.dto.PayStatusRequest;
 import shop.alien.entity.store.vo.LawyerConsultationOrderVO;
-import shop.alien.mapper.LawyerConsultationOrderMapper;
-import shop.alien.mapper.LawyerExpertiseAreaMapper;
-import shop.alien.mapper.LawyerServiceAreaMapper;
-import shop.alien.mapper.LawyerUserMapper;
+import shop.alien.mapper.*;
 import shop.alien.store.service.LawyerConsultationOrderService;
 import shop.alien.store.service.LawyerUserService;
 import shop.alien.store.service.OrderExpirationService;
@@ -59,6 +53,7 @@ public class LawyerConsultationOrderServiceImpl extends ServiceImpl<LawyerConsul
     private final LawyerExpertiseAreaMapper lawyerExpertiseAreaMapper;
     private final OrderExpirationService orderExpirationService;
     private final AliApi aliApi;
+    private final LawFirmMapper lawFirmMapper;
 
     @Override
     public R<IPage<LawyerConsultationOrderVO>> getConsultationOrderList(int pageNum, int pageSize, String orderNumber,
@@ -419,13 +414,21 @@ public class LawyerConsultationOrderServiceImpl extends ServiceImpl<LawyerConsul
         order.setOrderNumber(orderNumber);
         //计算本单收益
         LawyerUser lawyerUser = lawyerUserMapper.selectById(lawyerConsultationOrder.getLawyerUserId());
+        Float commissionRate = 3F;
         if(lawyerUser != null){
-            Integer commissionRate = lawyerUser.getCommissionRate();
-            int rate = commissionRate!=null&&commissionRate>0?commissionRate:3;
+            //获取律所信息
+            Integer firmId = lawyerUser.getFirmId();
+            if(firmId != null && firmId > 0){
+                LawFirm lawyerFirm =  lawFirmMapper.selectById(firmId);
+                if(lawyerFirm != null && lawyerFirm.getPlatformCommissionRatio() != null && lawyerFirm.getPlatformCommissionRatio() > 0){
+                    commissionRate = lawyerFirm.getPlatformCommissionRatio();
+                }
+            }
+
             Integer orderAmount =  lawyerConsultationOrder.getOrderAmount();
 //            BigDecimal result2 = orderAmount.multiply(new BigDecimal(rate/100))
 //                    .setScale(0, RoundingMode.HALF_UP);
-            Integer result2=orderAmount*rate/100;
+            int result2 = Math.round(orderAmount*commissionRate/100);
             order.setConsultationFee(result2);
         }
         int num = consultationOrderMapper.insertOrder(order);