Merge remote-tracking branch 'origin/dev' into dev

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

@@ -9,6 +9,7 @@ import lombok.Data;
 import shop.alien.entity.store.LawyerLegalProblemScenario;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -165,6 +166,9 @@ public class LawyerConsultationOrderVO implements Serializable {
     @ApiModelProperty(value = "佣金比例")
     private String commissionRate;
 
+    @ApiModelProperty(value = "佣金比例(前端使用)")
+    private String commissionRateStr;
+
     @ApiModelProperty(value = "律师收益（订单金额-平台佣金）")
     private  Integer lawyerEarnings;
 }

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

@@ -216,6 +216,7 @@ public interface LawyerConsultationOrderMapper extends BaseMapper<LawyerConsulta
             "        lu.nick_name,\n" +
             "        lu.personal_introduction,\n" +
             "        lf.platform_commission_ratio as commission_rate,\n" +
+            "        CONCAT(TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM CAST(lf.platform_commission_ratio AS CHAR))), '%') AS commissionRateStr, \n" +
             "        lea.expertise_area_info,\n" +
             "        lur.user_name client_user_name,\n" +
             "        lur.user_phone client_user_phone,\n" +