fix: 修改下单时自提商品和无配送方式支付方式问题;修改店铺和渠道模板接口

src/pages/channel/channelTemplate/index.tsx

@@ -4,19 +4,19 @@ import { history } from 'umi'
 import { PageHeaderWrapper } from '@ant-design/pro-layout'
 import TemplateItem from '../components/templateItem'
 import { PublicApi } from '@/services/api'
-import { GetTemplateShopFindAllShelfShopTemplateResponse } from '@/services'
+import { GetTemplateWebPageTemplateWebFindAllShelfChannelTemplateResponse } from '@/services/TemplateApi'
 import styles from './index.less'
 
 const ShopTemplate: React.FC = () => {
 
-  const [templateList, setTemplateList] = useState<GetTemplateShopFindAllShelfShopTemplateResponse>([])
+  const [templateList, setTemplateList] = useState<GetTemplateWebPageTemplateWebFindAllShelfChannelTemplateResponse>([])
 
   useEffect(() => {
     fetchAllShelfShopTemplate()
   }, [])
 
   const fetchAllShelfShopTemplate = () => {
-    PublicApi.getTemplateChannelFindAllShelfChannelTemplate().then(res => {
+    PublicApi.getTemplateWebPageTemplateWebFindAllShelfChannelTemplate().then(res => {
       if (res.code === 1000) {
         setTemplateList(res.data)
       } else if (res.code === 47001) {

src/pages/channel/templateDetail/index.tsx

@@ -6,7 +6,7 @@ import DetailPage from '@/components/DetailPage'
 import UseModal from '../components/useModal'
 import { PublicApi } from '@/services/api'
 import { Environment_Status } from '@/constants'
-import { GetTemplateShopFindShopTemplateDetailsResponse } from '@/services'
+import { GetTemplateWebPageTemplateWebFindChannelTemplateDetailsResponse } from '@/services/TemplateApi'
 import default_img from '@/assets/imgs/template_default_img.png'
 import styles from './index.less'
 
@@ -21,7 +21,7 @@ interface TemplateDetailPropsType {
 
 const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
   const { query: { type, id } } = props.location
-  const [detailInfo, setDetailInfo] = useState<GetTemplateShopFindShopTemplateDetailsResponse>()
+  const [detailInfo, setDetailInfo] = useState<GetTemplateWebPageTemplateWebFindChannelTemplateDetailsResponse>()
   const [useModalVisible, setUseModalVisible] = useState<boolean>(false)
   const [confirmLoading, setConfirmLoading] = useState(false)
 
@@ -30,8 +30,10 @@ const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
   }, [])
 
   const fetchDetail = () => {
-    //@ts-ignore
-    PublicApi.getTemplateChannelFindChannelTemplateDetails({ id }).then(res => {
+    const param: any = {
+      id
+    }
+    PublicApi.getTemplateWebPageTemplateWebFindChannelTemplateDetails(param).then(res => {
       if (res.code === 1000) {
         setDetailInfo(res.data)
       }
@@ -43,8 +45,7 @@ const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
    */
   const handleConfirmUse = () => {
     setConfirmLoading(true)
-    //@ts-ignore
-    PublicApi.postTemplateChannelUseChannelTemplate({ id }).then(res => {
+    PublicApi.postTemplateWebPageTemplateWebUseChannelTemplate({ id }).then(res => {
       if (res.code === 1000) {
         setUseModalVisible(false)
         fetchDetail()

src/pages/lxMall/order/index.tsx

@@ -486,7 +486,7 @@ const Order: React.FC<OrderPropsType> = (props) => {
                   }} />
                 )
               }
-              <PayWay supplyMembersId={orderInfo.supplyMembersId} supplyMembersRoleId={orderInfo.supplyMembersRoleId}  selectItem={selectPayWay} payWayList={orderInfo.payWayList} onChange={(val) => setSelectPayWay(val)} />
+              <PayWay supplyMembersId={orderInfo.supplyMembersId} deliveryType={orderInfo.logistics.deliveryType} supplyMembersRoleId={orderInfo.supplyMembersRoleId}  selectItem={selectPayWay} payWayList={orderInfo.payWayList} onChange={(val) => setSelectPayWay(val)} />
               {/* <Delivery /> */}
               {
                 orderInfo.isInvoice && <Invoice state={needTheInvoice} onChange={(val) => setNeedTheInvoice(val)} onSelect={(val) => setSelectInvoiceInfo(val)} />

src/pages/lxMall/order/payway/index.tsx

@@ -14,15 +14,16 @@ interface PayWayProps {
   selectItem: any;
   supplyMembersId: number;
   supplyMembersRoleId: number;
+  deliveryType?: number;
 }
 
 const PayWay: React.FC<PayWayProps> = (props) => {
-  const { payWayList = [], onChange, selectItem = {}, supplyMembersId, supplyMembersRoleId } = props
+  const { payWayList = [], onChange, selectItem = {}, supplyMembersId, deliveryType = 1, supplyMembersRoleId } = props
   const [expand, setExpand] = useState<boolean>(false)
   const [creditInfo, setCreditInfo] = useState<GetPayCreditGetCreditResponse>()
 
   const handleSelectWay = (item) => {
-    if (item.payType === 3) {
+    if (item.payType === 3 || item.payType === 4) {
       if (!getCreditState(item)) {
         return
       }
@@ -41,11 +42,11 @@ const PayWay: React.FC<PayWayProps> = (props) => {
   }, [payWayList])
 
   const fetchCreditInfo = () => {
-    let param = {
+    const param: any = {
       parentMemberId: supplyMembersId,
       parentMemberRoleId: supplyMembersRoleId
     }
-    //@ts-ignore
+
     PublicApi.getPayCreditGetCredit(param).then(res => {
       if(res.code === 1000) {
         setCreditInfo(res.data)
@@ -62,6 +63,12 @@ const PayWay: React.FC<PayWayProps> = (props) => {
       } else if (creditInfo.isUsable === 0) {
         result = false
       }
+    } else if(info.payType === 4) {
+      if(deliveryType !==  1) {
+        result = false
+      } else {
+        result = true
+      }
     }
     return result
   }

src/pages/shop/shopTemplate/index.tsx

@@ -4,19 +4,19 @@ import { history } from 'umi'
 import { PageHeaderWrapper } from '@ant-design/pro-layout'
 import TemplateItem from '../components/templateItem'
 import { PublicApi } from '@/services/api'
-import { GetTemplateShopFindAllShelfShopTemplateResponse } from '@/services'
+import { GetTemplateWebPageTemplateWebFindAllShelfShopTemplateResponse } from '@/services/TemplateApi'
 import styles from './index.less'
 
 const ShopTemplate: React.FC = () => {
 
-  const [templateList, setTemplateList] = useState<GetTemplateShopFindAllShelfShopTemplateResponse>([])
+  const [templateList, setTemplateList] = useState<GetTemplateWebPageTemplateWebFindAllShelfShopTemplateResponse>([])
 
   useEffect(() => {
     fetchAllShelfShopTemplate()
   }, [])
 
   const fetchAllShelfShopTemplate = () => {
-    PublicApi.getTemplateShopFindAllShelfShopTemplate().then(res => {
+    PublicApi.getTemplateWebPageTemplateWebFindAllShelfShopTemplate().then(res => {
       if (res.code === 1000) {
         setTemplateList(res.data)
       } else if (res.code === 47001) {

src/pages/shop/templateDetail/index.tsx

@@ -5,7 +5,7 @@ import DetailPage from '@/components/DetailPage'
 import UseModal from '../components/useModal'
 import { PublicApi } from '@/services/api'
 import { Environment_Status } from '@/constants'
-import { GetTemplateShopFindShopTemplateDetailsResponse } from '@/services'
+import { GetTemplateWebPageTemplateWebFindShopTemplateDetailsResponse } from '@/services/TemplateApi'
 import default_img from '@/assets/imgs/template_default_img.png'
 import styles from './index.less'
 
@@ -20,7 +20,7 @@ interface TemplateDetailPropsType {
 
 const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
   const { query: { type, id } } = props.location
-  const [detailInfo, setDetailInfo] = useState<GetTemplateShopFindShopTemplateDetailsResponse>()
+  const [detailInfo, setDetailInfo] = useState<GetTemplateWebPageTemplateWebFindShopTemplateDetailsResponse>()
   const [useModalVisible, setUseModalVisible] = useState<boolean>(false)
   const [confirmLoading, setConfirmLoading] = useState(false)
 
@@ -30,8 +30,10 @@ const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
   }, [])
 
   const fetchDetail = () => {
-    //@ts-ignore
-    PublicApi.getTemplateShopFindShopTemplateDetails({ id }).then(res => {
+    const param: any = {
+      id
+    }
+    PublicApi.getTemplateWebPageTemplateWebFindShopTemplateDetails(param).then(res => {
       if (res.code === 1000) {
         setDetailInfo(res.data)
       }
@@ -43,8 +45,8 @@ const TemplateDetail: React.FC<TemplateDetailPropsType> = (props) => {
    */
   const handleConfirmUse = () => {
     setConfirmLoading(true)
-    //@ts-ignore
-    PublicApi.postTemplateShopUseShopTemplate({ id }).then(res => {
+
+    PublicApi.postTemplateWebPageTemplateWebUseShopTemplate({ id }).then(res => {
       if (res.code === 1000) {
         setUseModalVisible(false)
         fetchDetail()

src/store/site/index.ts

@@ -49,7 +49,7 @@ class SiteStore implements ISiteModule {
     const param: any = {
       siteId: this.siteId
     }
-    const res = await PublicApi.getTemplateGoodsFindUseGoodsTemplate(param)
+    const res = await PublicApi.getTemplateWebPageTemplateWebFindGoodsDescribeTemplate(param)
     runInAction(() => {
       if(res.code === 1000) {
         this.commodityTemplateInfo = res.data