fix: 订单详情增加积分抵扣显示，处理商品价格校验问题

src/locales/en-US/transaction_components.ts

@@ -255,6 +255,7 @@ export default {
   'transaction_components.hejijine': 'Total amount',
   'transaction_components.cuxiaolijian': 'Promotional discount',
   'transaction_components.youhuidikou': 'Preferential deduction',
+  'transaction_components.jifendikou': 'Points deduction',
   'transaction_components.yunfei': 'Shipping',
   'transaction_components.suifei': 'Taxes',
   'transaction_components.zongjisuoxujifen': 'Total required points',

src/locales/ko-KR/transaction_components.ts

@@ -255,6 +255,7 @@ export default {
   'transaction_components.hejijine': '합계 금액',
   'transaction_components.cuxiaolijian': '세일',
   'transaction_components.youhuidikou': '특혜 공제',
+  'transaction_components.jifendikou': '적분 상계',
   'transaction_components.yunfei': '운임',
   'transaction_components.suifei': '세금과 비용',
   'transaction_components.zongjisuoxujifen': '필요한 총 포인트',

src/locales/zh-CN/transaction_components.ts

@@ -255,6 +255,7 @@ export default {
   'transaction_components.hejijine': '合计金额',
   'transaction_components.cuxiaolijian': '促销立减',
   'transaction_components.youhuidikou': '优惠抵扣',
+  'transaction_components.jifendikou': '积分抵扣',
   'transaction_components.yunfei': '运费',
   'transaction_components.suifei': '税费',
   'transaction_components.zongjisuoxujifen': '总计所需积分',

src/pages/classAndProperty/attribute/index.tsx

@@ -24,7 +24,7 @@ import { clearModalParams } from '@/utils'
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
 import { getProductCustomerGetCustomerAttributeList, getProductPlatformGetAttributeList, postProductCustomerDeleteCustomerAttribute, postProductCustomerSyncAttribute, postProductCustomerUpdateCustomerAttributeStatus } from '@/services/ProductV2Api'
 import { GlobalConfig } from '@/global/config'
-import { getManagePaasSiteEnableMultiTenancy } from '@/services/ManageV2Api/id13982'
+import { getManagePaasSiteEnableMultiTenancy } from '@/services/ManageV2Api'
 // import styles from './index.less'
 
 const formActions = createFormActions();

src/pages/classAndProperty/propertyValue/index.tsx

@@ -22,7 +22,7 @@ import { clearModalParams } from '@/utils';
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
 import { getProductCustomerGetCustomerAttributeTree, getProductCustomerGetCustomerAttributeValueList, getProductPlatformGetSyncAttributeValueList, postProductCustomerDeleteCustomerAttributeValue, postProductCustomerSyncAttributeValue, postProductCustomerUpdateCustomerAttributeValueStatus } from '@/services/ProductV2Api';
 import { GlobalConfig } from '@/global/config';
-import { getManagePaasSiteEnableMultiTenancy } from '@/services/ManageV2Api/id13982';
+import { getManagePaasSiteEnableMultiTenancy } from '@/services/ManageV2Api';
 
 const treeActions = createTreeActions()
 

src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx

@@ -1057,7 +1057,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
                                 rules={[
                                   { required: true, message: intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.modal.form.numberPrice.message.1' }) },
                                   {
-                                    pattern: /^([0](\.\d{1,4}))$|^([1-9]+(\.\d{1,4})?)$/,
+                                    pattern: /^([0](\.\d{1,4}))$|^([1-9][0-9]*(\.\d{1,4})?)$/,
                                     message: intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.modal.form.numberPrice.message.2' }),
                                   }
                                 ]}
@@ -1113,7 +1113,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
                     message: planPrice === 3 ? intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.modal.form.uniquePrice.message.1' }) : intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.modal.form.uniquePrice.message.2' })
                   },
                   {
-                    pattern: planPrice !== 3 ? /^([0](\.\d{1,4}))$|^([1-9]+(\.\d{1,4})?)$/ : /^[1-9]\d*$/,
+                    pattern: planPrice !== 3 ? /^([0](\.\d{1,4}))$|^([1-9][0-9]*(\.\d{1,4})?)$/ : /^[1-9]\d*$/,
                     message: planPrice !== 3 ? intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.modal.form.uniquePrice.message.3' }) : intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.modal.form.uniquePrice.message.4' }),
                   }
                 ]}

src/pages/transaction/components/orderProductTable/index.tsx

@@ -41,7 +41,7 @@ const RowStyle = styled(props => <Row style={{marginTop: 12}} justify='end' {...
 // 总计金额联动框
 export const MoneyTotalBox = ({ dataSource, preview }) => {
   const { product, orderMode, orderKind } = dataSource || {}
-  const { couponAmount, freight, productAmount, promotionAmount, totalAmount, products, taxes } = product
+  const { couponAmount, freight, productAmount, promotionAmount, totalAmount, products, taxes, deductionAmount } = product
 
   const creditsCommodity = (orderMode === 10 || orderMode === 25) // @todo 积分或渠道积分下单模式
   const contractOrder = (orderKind === OrderKindType.SRM_ORDER || orderKind === OrderKindType.REQUISITION_ORDER) // 合同下单和请购单下单模式
@@ -70,6 +70,12 @@ export const MoneyTotalBox = ({ dataSource, preview }) => {
       </Col>
     }
     {
+      !creditsCommodity && <Col span={2}>
+        <div>{intl.formatMessage({id: 'transaction_components.jifendikou'})}</div>
+        <div>{`-￥${deductionAmount}`}</div>
+      </Col>
+    }
+    {
       contractOrder ? null : <>
         <Col span={2}>
           <div>{intl.formatMessage({id: 'transaction_components.yunfei'})}</div>

src/pages/transaction/components/saleOrderProductTable/index.tsx

@@ -176,7 +176,7 @@ export const MoneyTotalBox = ({ dataSource, isEditData, setCouponModalVisible })
   const contractOrder = (orderKind === OrderKindType.SRM_ORDER || orderKind === OrderKindType.REQUISITION_ORDER)  // 合同下单和请购单下单模式
   const { modifyPrice = false } = usePageStatus()
 
-  const { productAmount, freight, totalAmount, promotionAmount, couponAmount, products, taxes } = product
+  const { productAmount, freight, totalAmount, promotionAmount, couponAmount, products, taxes, deductionAmount } = product
   // const modelRef = useRef<any>({})
   const modifyRef = useRef<any>({})
   const [freePrice, setFreePrice] = useState<number>(freight || 0)
@@ -268,6 +268,12 @@ export const MoneyTotalBox = ({ dataSource, isEditData, setCouponModalVisible })
       </Col>
     }
     {
+      !creditsCommodity && <Col span={2}>
+        <div>{intl.formatMessage({ id: 'transaction_components.jifendikou' })}</div>
+        <div>{`-￥${deductionAmount}`}</div>
+      </Col>
+    }
+    {
       contractOrder ? null : <>
         <Col span={2}>
           <div>{intl.formatMessage({ id: 'transaction_components.yunfei' })}