Fix all backend api that return results

core/service/src/main/kotlin/com/wansenai/service/financial/impl/AdvanceChargeServiceImpl.kt

@@ -46,6 +46,7 @@ import lombok.extern.slf4j.Slf4j
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Propagation
 import org.springframework.transaction.annotation.Transactional
+import java.math.BigDecimal
 import java.time.LocalDateTime
 
 @Service
@@ -172,6 +173,7 @@ open class AdvanceChargeServiceImpl(
             advanceChargeDTO?.remark?.let { like(FinancialMain::getRemark, it) }
             advanceChargeDTO?.startDate?.let { ge(FinancialMain::getCreateTime, it) }
             advanceChargeDTO?.endDate?.let { le(FinancialMain::getCreateTime, it) }
+            eq(FinancialMain::getType, "收预付款")
             eq(FinancialMain::getDeleteFlag, CommonConstants.NOT_DELETED)
         }
 
@@ -198,7 +200,7 @@ open class AdvanceChargeServiceImpl(
             financialPersonnel = financialPerson?.name ?: "",
             memberName = member?.memberName,
             totalAmount = this.totalAmount,
-            collectedAmount = this.changeAmount,
+            collectedAmount = this.changeAmount ?: BigDecimal.ZERO,
             status = this.status,
             remark = this.remark
         )

core/utils/src/main/java/com/wansenai/utils/enums/FinancialCodeEnum.java

@@ -29,9 +29,9 @@ public enum FinancialCodeEnum {
 
     DELETE_ACCOUNT_ERROR("F0502", "删除账户失败"),
 
-    UPDATE_ACCOUNT_STATUS_SUCCESS("F0004", "修改账号状态成功"),
+    UPDATE_ACCOUNT_STATUS_SUCCESS("F0004", "账户状态修改成功"),
 
-    UPDATE_ACCOUNT_STATUS_ERROR("F0503", "修改账号状态失败"),
+    UPDATE_ACCOUNT_STATUS_ERROR("F0503", "账户状态修改失败"),
 
     ADD_ADVANCE_SUCCESS("F0005", "新增预收款成功"),
 

core/utils/src/main/kotlin/com/wansenai/utils/enums/CustomerCodeEnum.kt

@@ -6,15 +6,15 @@ package com.wansenai.utils.enums
  */
 enum class CustomerCodeEnum(val code: String, val msg: String) {
 
-    ADD_CUSTOMER_SUCCESS("U0001", "供应商添加成功"),
-    ADD_CUSTOMER_ERROR("U0500", "供应商添加失败"),
+    ADD_CUSTOMER_SUCCESS("U0001", "客户添加成功"),
+    ADD_CUSTOMER_ERROR("U0500", "客户添加失败"),
 
-    UPDATE_CUSTOMER_SUCCESS("U0002", "供应商修改成功"),
-    UPDATE_CUSTOMER_ERROR("U0501", "供应商修改失败"),
+    UPDATE_CUSTOMER_SUCCESS("U0002", "客户资料修改成功"),
+    UPDATE_CUSTOMER_ERROR("U0501", "客户资料修改失败"),
 
-    DELETE_CUSTOMER_SUCCESS("U0003", "供应商删除成功"),
-    DELETE_CUSTOMER_ERROR("U0504", "供应商删除失败"),
+    DELETE_CUSTOMER_SUCCESS("U0003", "客户删除成功"),
+    DELETE_CUSTOMER_ERROR("U0504", "客户删除失败"),
 
-    UPDATE_CUSTOMER_STATUS_SUCCESS("U0004", "供应商状态修改成功"),
-    UPDATE_CUSTOMER_STATUS_ERROR("U0505", "供应商状态修改失败")
+    UPDATE_CUSTOMER_STATUS_SUCCESS("U0004", "客户状态修改成功"),
+    UPDATE_CUSTOMER_STATUS_ERROR("U0505", "客户状态修改失败")
 }

web/src/api/basic/common.ts

@@ -1,5 +1,5 @@
 import {defHttp} from '/@/utils/http/axios';
-import { ErrorMessageMode } from '/#/axios';
+import {ErrorMessageMode, SuccessMessageMode} from '/#/axios';
 import {BaseDataResp, BaseResp} from "@/api/model/baseModel";
 import {ContentTypeEnum} from "@/enums/httpEnum";
 
@@ -15,7 +15,7 @@ export interface UploadFileParams {
     file: File;
 }
 
-export function uploadXlsx(params: UploadFileParams, mode: ErrorMessageMode = 'notice') {
+export function uploadXlsx(params: UploadFileParams, successMode: SuccessMessageMode = 'notice', errorMode: ErrorMessageMode = 'message') {
     return defHttp.post<BaseResp>(
         {
             url: Api.UploadXlsx,
@@ -25,26 +25,26 @@ export function uploadXlsx(params: UploadFileParams, mode: ErrorMessageMode = 'n
                 // @ts-ignore
                 ignoreCancelToken: true,
             },
-        },
-        {
-            errorMessageMode: mode,
-        },
+        },{
+            successMessageMode: successMode,
+            errorMessageMode: errorMode,
+        }
     );
 }
 
-export function exportXlsx(type: string, mode: ErrorMessageMode = 'notice') {
+export function exportXlsx(type: string, successMode: SuccessMessageMode = 'notice', errorMode: ErrorMessageMode = 'message') {
     return defHttp.get<BaseDataResp<Blob>>(
         {
             url: `${Api.ExportXlsx}?type=${type}`,
             responseType: "blob"
-        },
-        {
-            errorMessageMode: mode,
-        },
+        },{
+            successMessageMode: successMode,
+            errorMessageMode: errorMode,
+        }
     );
 }
 
-export function uploadOss(params: UploadFileParams, mode: ErrorMessageMode = 'notice') {
+export function uploadOss(params: UploadFileParams, successMode: SuccessMessageMode = 'notice', errorMode: ErrorMessageMode = 'message') {
     return defHttp.post<BaseResp>(
         {
             url: Api.UploadOss,
@@ -54,10 +54,10 @@ export function uploadOss(params: UploadFileParams, mode: ErrorMessageMode = 'no
                 // @ts-ignore
                 ignoreCancelToken: true,
             },
-        },
-        {
-            errorMessageMode: mode,
-        },
+        },{
+            successMessageMode: successMode,
+            errorMessageMode: errorMode,
+        }
     );
 }
 

web/src/api/basic/customer.ts

@@ -1,5 +1,5 @@
 import {defHttp} from '/@/utils/http/axios';
-import { ErrorMessageMode } from '/#/axios';
+import {ErrorMessageMode, SuccessMessageMode} from '/#/axios';
 import {BaseDataResp, BaseResp} from "@/api/model/baseModel";
 import {
     CustomerResp,
@@ -16,16 +16,12 @@ enum API {
     UpdateStatus = '/basic/customer/updateStatus',
 }
 
-export function getCustomerPageList(params: QueryCustomerReq, mode: ErrorMessageMode = 'notice') {
+export function getCustomerPageList(params: QueryCustomerReq) {
     return defHttp.post<BaseDataResp<CustomerResp>>(
         {
             url: API.PageList,
             params,
         },
-        {
-            errorMessageMode: mode,
-            successMessageMode: mode,
-        },
     );
 }
 
@@ -37,36 +33,39 @@ export function getCustomerList() {
     );
 }
 
-export function addOrUpdateCustomer(params: AddOrUpdateCustomerReq, mode: ErrorMessageMode = 'notice') {
+export function addOrUpdateCustomer(params: AddOrUpdateCustomerReq, successMode: SuccessMessageMode = 'notice', errorMode: ErrorMessageMode = 'message') {
     return defHttp.post<BaseResp>(
         {
             url: API.AddOrUpdateCustomer,
             params,
         },
         {
-            errorMessageMode: mode,
+            successMessageMode: successMode,
+            errorMessageMode: errorMode,
         },
     );
 }
 
-export function updateCustomerStatus(ids: number[], status: number, mode: ErrorMessageMode = 'notice') {
+export function updateCustomerStatus(ids: number[], status: number, successMode: SuccessMessageMode = 'notice', errorMode: ErrorMessageMode = 'message') {
     return defHttp.post<BaseResp>(
         {
             url: `${API.UpdateStatus}?ids=${ids}&status=${status}`
         },
         {
-            errorMessageMode: mode,
+            successMessageMode: successMode,
+            errorMessageMode: errorMode,
         },
     );
 }
 
-export function deleteBatchCustomer(ids: number[], mode: ErrorMessageMode = 'notice') {
+export function deleteBatchCustomer(ids: number[], successMode: SuccessMessageMode = 'notice', errorMode: ErrorMessageMode = 'message') {
     return defHttp.delete<BaseResp>(
         {
             url: `${API.DeleteBatch}?ids=${ids}`
         },
         {
-            errorMessageMode: mode,
+            successMessageMode: successMode,
+            errorMessageMode: errorMode,
         },
     );
 }

web/src/api/basic/incomeExpense.ts

@@ -1,5 +1,5 @@
 import {defHttp} from '/@/utils/http/axios';
-import { ErrorMessageMode } from '/#/axios';
+import {ErrorMessageMode, SuccessMessageMode} from '/#/axios';
 import {BaseDataResp, BaseResp} from "@/api/model/baseModel";
 import {
     QueryIncomeExpenseReq,
@@ -15,16 +15,12 @@ enum API {
     UpdateStatus = '/basic/incomeExpense/updateStatus',
 }
 
-export function getIncomeExpensePageList(params: QueryIncomeExpenseReq, mode: ErrorMessageMode = 'notice') {
+export function getIncomeExpensePageList(params: QueryIncomeExpenseReq) {
     return defHttp.post<BaseDataResp<IncomeExpenseResp>>(
         {
             url: API.PageList,
             params,
-        },
-        {
-            errorMessageMode: mode,
-            successMessageMode: mode,
-        },
+        }
     );
 }
 
@@ -36,33 +32,38 @@ export function getIncomeExpenseList(type: string) {
     );
 }
 
-export function addOrUpdateIncomeExpense(params: AddOrUpdateIncomeExpenseReq, mode: ErrorMessageMode = 'notice') {
+export function addOrUpdateIncomeExpense(params: AddOrUpdateIncomeExpenseReq, successMode: SuccessMessageMode = 'notice', errorMode: ErrorMessageMode = 'message') {
     return defHttp.post<BaseResp>(
         {
             url: API.AddOrUpdateIncomeExpense,
             params,
+        },{
+            successMessageMode: successMode,
+            errorMessageMode: errorMode,
         }
     );
 }
 
-export function deleteIncomeExpense(ids: number[], mode: ErrorMessageMode = 'notice') {
+export function deleteIncomeExpense(ids: number[], successMode: SuccessMessageMode = 'notice', errorMode: ErrorMessageMode = 'message') {
     return defHttp.delete<BaseResp>(
         {
             url: `${API.DeleteBatch}?ids=${ids}`
         },
         {
-            errorMessageMode: mode,
+            successMessageMode: successMode,
+            errorMessageMode: errorMode,
         },
     );
 }
 
-export function updateIncomeExpenseStatus(ids: number[], status: number, mode: ErrorMessageMode = 'notice') {
+export function updateIncomeExpenseStatus(ids: number[], status: number, successMode: SuccessMessageMode = 'notice', errorMode: ErrorMessageMode = 'message') {
     return defHttp.post<BaseResp>(
         {
             url: `${API.UpdateStatus}?ids=${ids}&status=${status}`
         },
         {
-            errorMessageMode: mode,
+            successMessageMode: successMode,
+            errorMessageMode: errorMode,
         },
     );
 }

web/src/api/basic/member.ts

@@ -1,5 +1,5 @@
 import {defHttp} from '/@/utils/http/axios';
-import { ErrorMessageMode } from '/#/axios';
+import {ErrorMessageMode, SuccessMessageMode} from '/#/axios';
 import {BaseDataResp, BaseResp} from "@/api/model/baseModel";
 import {
     MemberResp,
@@ -16,50 +16,46 @@ enum API {
     UpdateStatus = '/basic/member/updateStatus',
 }
 
-export function getMemberPageList(params: QueryMemberReq, mode: ErrorMessageMode = 'notice') {
+export function getMemberPageList(params: QueryMemberReq) {
     return defHttp.post<BaseDataResp<MemberResp>>(
         {
             url: API.PageList,
             params,
-        },
-        {
-            errorMessageMode: mode,
-            successMessageMode: mode,
-        },
+        }
     );
 }
 
-export function addOrUpdateMember(params: AddOrUpdateMemberReq, mode: ErrorMessageMode = 'notice') {
+export function addOrUpdateMember(params: AddOrUpdateMemberReq, successMode: SuccessMessageMode = 'notice', errorMode: ErrorMessageMode = 'message') {
     return defHttp.post<BaseResp>(
         {
             url: API.AddOrUpdateMember,
             params,
-        },
-        {
-            errorMessageMode: mode,
-        },
+        },{
+            successMessageMode: successMode,
+            errorMessageMode: errorMode,
+        }
     );
 }
 
-export function updateMemberStatus(ids: number[], status: number, mode: ErrorMessageMode = 'notice') {
+export function updateMemberStatus(ids: number[], status: number, successMode: SuccessMessageMode = 'notice', errorMode: ErrorMessageMode = 'message') {
     return defHttp.post<BaseResp>(
         {
             url: `${API.UpdateStatus}?ids=${ids}&status=${status}`
-        },
-        {
-            errorMessageMode: mode,
-        },
+        },{
+            successMessageMode: successMode,
+            errorMessageMode: errorMode,
+        }
     );
 }
 
-export function deleteBatchMember(ids: number[], mode: ErrorMessageMode = 'notice') {
+export function deleteBatchMember(ids: number[], successMode: SuccessMessageMode = 'notice', errorMode: ErrorMessageMode = 'message') {
     return defHttp.delete<BaseResp>(
         {
             url: `${API.DeleteBatch}?ids=${ids}`
-        },
-        {
-            errorMessageMode: mode,
-        },
+        },{
+            successMessageMode: successMode,
+            errorMessageMode: errorMode,
+        }
     );
 }