Procházet zdrojové kódy

导出去掉平台手续费

qxy před 4 dny
rodič
revize
eec2790297

+ 1 - 1
alien-entity/src/main/java/shop/alien/entity/store/vo/LawyerListVO.java

@@ -47,7 +47,7 @@ public class LawyerListVO implements Serializable {
     @ApiModelProperty(value = "总订单金额(单位:元)")
     private String totalOrderAmountYuan;
 
-    @ExcelProperty(value = "平台信息服务费(元)", index = 5)
+    @ExcelIgnore
     @ApiModelProperty(value = "平台信息服务费(单位:元)")
     private String platformServiceFeeYuan;
 

+ 4 - 4
alien-gateway/src/main/java/shop/alien/gateway/controller/SystemController.java

@@ -261,7 +261,7 @@ public class SystemController {
                     "            \"icon\": \"Briefcase\",\n" +
                     "            \"title\": \"对账总览\",\n" +
                     "            \"isLink\": \"\",\n" +
-                    "            \"isHide\": true,\n" +
+                    "            \"isHide\": false,\n" +
                     "            \"isFull\": false,\n" +
                     "            \"isAffix\": false,\n" +
                     "            \"isKeepAlive\": false\n" +
@@ -277,7 +277,7 @@ public class SystemController {
                     "        \"icon\": \"UserFilled\",\n" +
                     "        \"title\": \"用户管理\",\n" +
                     "        \"isLink\": \"\",\n" +
-                    "        \"isHide\": false,\n" +
+                    "        \"isHide\": true,\n" +
                     "        \"isFull\": false,\n" +
                     "        \"isAffix\": false,\n" +
                     "        \"isKeepAlive\": false\n" +
@@ -291,7 +291,7 @@ public class SystemController {
                     "        \"icon\": \"UserFilled\",\n" +
                     "        \"title\": \"举报审核\",\n" +
                     "        \"isLink\": \"\",\n" +
-                    "        \"isHide\": false,\n" +
+                    "        \"isHide\": true,\n" +
                     "        \"isFull\": false,\n" +
                     "        \"isAffix\": false,\n" +
                     "        \"isKeepAlive\": false\n" +
@@ -305,7 +305,7 @@ public class SystemController {
                     "        \"icon\": \"UserFilled\",\n" +
                     "        \"title\": \"申诉审核\",\n" +
                     "        \"isLink\": \"\",\n" +
-                    "        \"isHide\": false,\n" +
+                    "        \"isHide\": true,\n" +
                     "        \"isFull\": false,\n" +
                     "        \"isAffix\": false,\n" +
                     "        \"isKeepAlive\": false\n" +

+ 3 - 3
alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/LawFirmReconciliationServiceImpl.java

@@ -69,9 +69,9 @@ public class LawFirmReconciliationServiceImpl implements LawFirmReconciliationSe
                 return R.fail("律所不存在或已被删除");
             }
             resultFirmName = lawFirm.getFirmName();
-            if (lawFirm.getPlatformCommissionRatio() == null) {
-                return R.fail("律所[" + resultFirmName + "]的平台佣金比例未设置,无法计算对账信息");
-            }
+//            if (lawFirm.getPlatformCommissionRatio() == null) {
+//                return R.fail("律所[" + resultFirmName + "]的平台佣金比例未设置,无法计算对账信息");
+//            }
         } else if (firmName != null && !firmName.trim().isEmpty()) {
             // 如果只传了 firmName,使用传入的名称
             resultFirmName = firmName;

+ 3 - 3
alien-store/src/main/java/shop/alien/store/service/impl/LawFirmReconciliationServiceImpl.java

@@ -69,9 +69,9 @@ public class LawFirmReconciliationServiceImpl implements LawFirmReconciliationSe
                 return R.fail("律所不存在或已被删除");
             }
             resultFirmName = lawFirm.getFirmName();
-            if (lawFirm.getPlatformCommissionRatio() == null) {
-                return R.fail("律所[" + resultFirmName + "]的平台佣金比例未设置,无法计算对账信息");
-            }
+//            if (lawFirm.getPlatformCommissionRatio() == null) {
+//                return R.fail("律所[" + resultFirmName + "]的平台佣金比例未设置,无法计算对账信息");
+//            }
         } else if (firmName != null && !firmName.trim().isEmpty()) {
             // 如果只传了 firmName,使用传入的名称
             resultFirmName = firmName;