Merge branch 'dev' into 'master'

Dev See merge request !32

Merge branch 'dev' into 'master'
Dev See merge request !32
boyang
2 parents bc0849a9 66e38ec1
Showing 5 changed files with 297 additions and 44 deletions
src/pages/Order/OrderList/OrderDrawer.tsx
src/pages/OrderReport/components/OrderStatisticCard.tsx
src/pages/Prepaid/index.tsx
src/services/definition.ts
src/services/request.ts
@@ -11,6 +11,7 @@ import {
   postKingdeeRepMaterialUnit,
   postKingdeeRepMeasureUnit,
   postPrepaidPhoneAvailableList,
+  postResearchGroupsMemberExists,
   postResearchGroupsNameSet,
   postServiceConstCompanyType,
   postServiceConstOrderSource,
@@ -1242,49 +1243,132 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           <ProFormDependency name={['companyType']}>
             {({ companyType }) => {
               const renderInstitutionContactName = () => (
-                <Group>
-                  <ProFormSelect
-                    key="institutionContactName"
-                    width="xl"
-                    showSearch
-                    name="institutionContactName"
-                    rules={[{ required: true, message: '请输入课题组名称!' }]}
-                    request={async (value) => {
-                      const keywords = value?.keyWords || '';
-                      const res = await postResearchGroupsNameSet({
-                        data: { status: 'ADD_AUDIT_PASS', groupName: keywords },
-                      });
-                      return Object.entries(res?.data || {}).map(
-                        ([researchGroupsId, researchGroupsName]) => ({
-                          label: researchGroupsName,
-                          value: researchGroupsName, // 使用 researchGroupsId 作为 value
-                          key: researchGroupsId,
-                          id: researchGroupsId,
-                        }),
-                      );
-                    }}
-                    fieldProps={{
-                      filterOption: () => true,
-                      onChange: (_, option) => {
-                        form.setFieldsValue({
-                          researchGroupId: option?.id || '',
+                <>
+                  <Group>
+                    <ProFormSelect
+                      key="institutionContactName"
+                      width="xl"
+                      showSearch
+                      name="institutionContactName"
+                      rules={[{ required: true, message: '请输入课题组名称!' }]}
+                      request={async (value) => {
+                        const keywords = value?.keyWords || '';
+                        const res = await postResearchGroupsNameSet({
+                          data: {
+                            status: 'ADD_AUDIT_PASS',
+                            groupName: keywords,
+                          },
                         });
-                      },
+                        return Object.entries(res?.data || {}).map(
+                          ([researchGroupsId, researchGroupsName]) => ({
+                            label: researchGroupsName,
+                            value: researchGroupsName, // 使用 researchGroupsId 作为 value
+                            key: researchGroupsId,
+                            id: researchGroupsId,
+                          }),
+                        );
+                      }}
+                      fieldProps={{
+                        filterOption: () => true,
+                        onChange: async (_, option) => {
+                          const researchGroupId = option?.id || '';
+                          form.setFieldsValue({
+                            researchGroupId: researchGroupId,
+                          });
+
+                          // 检查用户是否已经是该课题组成员
+                          if (researchGroupId) {
+                            const customerContact = form.getFieldValue(
+                              'customerContactNumber',
+                            );
+                            if (customerContact) {
+                              try {
+                                const res =
+                                  await postResearchGroupsMemberExists({
+                                    query: {
+                                      customerContact,
+                                      researchGroupId: Number(researchGroupId),
+                                    },
+                                  });
+
+                                // 响应码200表示请求成功，值为false表示用户不是课题组成员
+                                // 必须先检查res是否存在并且是否有200属性
+                                console.log(res, '5656res');
+                                const isMember = res;
+
+                                if (!isMember) {
+                                  // 显示用户将被添加到课题组的信息
+                                  form.setFields([
+                                    {
+                                      name: 'researchGroupWarning',
+                                      value: true,
+                                    },
+                                  ]);
+                                } else {
+                                  form.setFields([
+                                    {
+                                      name: 'researchGroupWarning',
+                                      value: false,
+                                    },
+                                  ]);
+                                }
+                              } catch (error) {
+                                console.error('检查课题组成员失败:', error);
+                              }
+                            }
+                          }
+                        },
+                      }}
+                      debounceTime={1000}
+                      label="课题组名称"
+                      placeholder="请输入名称"
+                    />
+                    <ProFormDigit
+                      readonly
+                      key="researchGroupId"
+                      width="md"
+                      name="researchGroupId"
+                      label="课题组Id"
+                      fieldProps={{ precision: 0 }} // 只允许整数
+                      rules={[{ required: true, message: '请重新选择课题组!' }]}
+                    />
+                  </Group>
+                  <ProFormDependency
+                    name={[
+                      'researchGroupWarning',
+                      'institutionContactName',
+                      'researchGroupId',
+                    ]}
+                  >
+                    {({
+                      researchGroupWarning,
+                      institutionContactName,
+                      researchGroupId,
+                    }) => {
+                      if (
+                        researchGroupWarning &&
+                        institutionContactName &&
+                        researchGroupId
+                      ) {
+                        const customerNameString =
+                          form.getFieldValue('customerNameString') || '客户';
+                        return (
+                          <div
+                            style={{
+                              color: 'red',
+                              marginBottom: '15px',
+                              marginTop: '0px',
+                            }}
+                          >
+                            订单提交后{customerNameString}将默认加入
+                            {institutionContactName}课题组
+                          </div>
+                        );
+                      }
+                      return null;
                     }}
-                    debounceTime={1000}
-                    label="课题组名称"
-                    placeholder="请输入名称"
-                  />
-                  <ProFormDigit
-                    readonly
-                    key="researchGroupId"
-                    width="md"
-                    name="researchGroupId"
-                    label="课题组Id"
-                    fieldProps={{ precision: 0 }} // 只允许整数
-                    rules={[{ required: true, message: '请重新选择课题组!' }]}
-                  />
-                </Group>
+                  </ProFormDependency>
+                </>
               );
               const renderPlatformType = (fieldKey) => (
                 <ProFormSelect
@@ -338,9 +338,9 @@ export default ({ data, statisticsMethod, reFreshData }) =&gt; {
         <ProCard
           className="order-statictis-card"
           bordered
-          title={<CardTitle title="已开票已回款订单" />}
+          title={<CardTitle title="未回款订单总金额" />}
         >
-          <CardContent content={data?.invoicedAndReiceptedCount} />
+          <CardContent unit="￥" content={data?.unpaidOrdersTotalAmount} />
         </ProCard>
         <ProCard
           className="order-statictis-card"
@@ -8,6 +8,7 @@ import {
   postPrepaidList,
 } from '@/services';
 import { enumValueToLabel, formatDateTime } from '@/utils';
+import { getUserInfo } from '@/utils/user';
 import { PlusOutlined } from '@ant-design/icons';
 import { ActionType, ProTable } from '@ant-design/pro-components';
 import { Button, Divider, Image, Tabs, message } from 'antd';
@@ -27,6 +28,7 @@ import {
 import './index.less';
  
 const PrepaidPage = () => {
+  const user = getUserInfo();
   const prepaidActionRef = useRef<ActionType>();
   const accountActionRef = useRef<ActionType>();
   const [rechargePrepaymentModalVisible, setRechargePrepaymentModalVisible] =
@@ -327,8 +329,32 @@ const PrepaidPage = () =&gt; {
             const res = await postCanrdApiUserList({
               data: { ...params },
             });
+            const data = res?.data?.data || [];
+            const targetPhones = [
+              '18550286106',
+              '15286038815',
+              '15202597163',
+              '13267086260',
+              '15900392469',
+              '13529047645',
+            ];
+
+            const processedData = data.map((item) => {
+              const isAdmin = user.roles.includes('ADMIN');
+              const isSalesManager = user.roles.includes('SALES_MANAGER');
+              if (
+                targetPhones.includes(item.phone) &&
+                !(isAdmin || isSalesManager)
+              ) {
+                return {
+                  ...item,
+                  nowMoney: '****',
+                };
+              }
+              return item;
+            });
             return {
-              data: res?.data?.data || [],
+              data: processedData,
               total: res?.data?.total || 0,
             };
           }}
@@ -3838,6 +3838,12 @@ export interface ResearchGroupListRequest {
   end?: number;
   /**
    * @description
+   *   课题组ID
+   * @format int64
+   */
+  groupId?: number;
+  /**
+   * @description
    *   课题组名称
    */
   groupName?: string;
@@ -4134,6 +4140,12 @@ export interface ResearchGroupsAccessDTO {
   deleteFlag?: number;
   /**
    * @description
+   *   课题组id
+   * @format int64
+   */
+  groupId?: number;
+  /**
+   * @description
    *   课题组名称
    */
   groupName?: string;
@@ -15311,6 +15311,82 @@ export const postResearchGroupsList = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
+/** @description request parameter type for postResearchGroupsMemberExists */
+export interface PostResearchGroupsMemberExistsOption {
+  /**
+   * @description
+   *   customerContact
+   */
+  query?: {
+    /**
+        @description
+          customerContact */
+    customerContact?: string;
+    /**
+        @description
+          researchGroupId
+        @format int64 */
+    researchGroupId?: number;
+  };
+}
+
+/** @description response type for postResearchGroupsMemberExists */
+export interface PostResearchGroupsMemberExistsResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: boolean;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostResearchGroupsMemberExistsResponseSuccess =
+  PostResearchGroupsMemberExistsResponse[200];
+/**
+ * @description
+ *   查询课题组成员
+ * @tags research-groups-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postResearchGroupsMemberExists = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/research/groups/memberExists';
+  function request(
+    option?: PostResearchGroupsMemberExistsOption,
+  ): Promise<PostResearchGroupsMemberExistsResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostResearchGroupsMemberExistsResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postResearchGroupsNameSet */
 export interface PostResearchGroupsNameSetOption {
   /**
@@ -21089,6 +21165,61 @@ export const postServiceOrderAuditPaymentReceipt = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
+/** @description response type for postServiceOrderBatchCaculateAndSetIntegral */
+export interface PostServiceOrderBatchCaculateAndSetIntegralResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderBatchCaculateAndSetIntegralResponseSuccess =
+  PostServiceOrderBatchCaculateAndSetIntegralResponse[200];
+/**
+ * @description
+ *   计算积分
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderBatchCaculateAndSetIntegral =
+  /* #__PURE__ */ (() => {
+    const method = 'post';
+    const url = '/service/order/batchCaculateAndSetIntegral';
+    function request(): Promise<PostServiceOrderBatchCaculateAndSetIntegralResponseSuccess> {
+      return requester(request.url, {
+        method: request.method,
+      }) as unknown as Promise<PostServiceOrderBatchCaculateAndSetIntegralResponseSuccess>;
+    }
+
+    /** http method */
+    request.method = method;
+    /** request url */
+    request.url = url;
+    return request;
+  })();
+
 /** @description request parameter type for postServiceOrderCancelSend */
 export interface PostServiceOrderCancelSendOption {
   /**