czg_team/cashier_admin_app
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改商品抵扣券抵扣逻辑

Browse Source
This commit is contained in:
YeMingfei666
2024-11-19 15:52:13 +08:00
parent 31df2b99d4
commit 688ff10833
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pagesOrder/pay-order/pay-order.vue
View File

@@ -395,8 +395,8 @@
uni.$off('choose-quan') uni.$off('choose-quan')
uni.$on('choose-quan', (arr) => { uni.$on('choose-quan', (arr) => {
console.log(arr); console.log(arr);
const manjianCoup = arr.filter(v => v.type == 1) const manjianCoup = arr.filter(v => v.type == 1&&v.num>=1)
let productCoup = arr.filter(v => v.type == 2) let productCoup = arr.filter(v => v.type == 2&&v.num>=1)
console.log(productCoup); console.log(productCoup);
//商品券分组 //商品券分组
let coupMap={} let coupMap={}
@@ -413,10 +413,9 @@
for(let i in arr){ for(let i in arr){
const coup=arr[i] const coup=arr[i]
const proCoupStartIndex=returnProCoupStartIndex(arr,i) const proCoupStartIndex=returnProCoupStartIndex(arr,i)
console.log(proCoupStartIndex); const num=Math.min($goodsPayPriceMap[coup.proId].length,coup.num)
console.log($goodsPayPriceMap[coup.proId]); coup.num=num
coup.discountAmount=returnProductCoupAllPrice($goodsPayPriceMap[coup.proId],proCoupStartIndex,coup.num) coup.discountAmount=returnProductCoupAllPrice($goodsPayPriceMap[coup.proId],proCoupStartIndex,num).toFixed(2)
console.log(coup.discountAmount);
} }
} }
console.log(productCoup); console.log(productCoup);

5
pagesOrder/quan/quan.vue
View File

@@ -21,7 +21,7 @@
</view> </view>
<view class=" u-m-t-20 u-flex"> <view class=" u-m-t-20 u-flex">
<view>有效期:</view> <view>有效期:</view>
<view class="u-font-24 u-m-l-6"> {{item.endTime}}</view> <view class="u-font-24 u-m-l-6"> {{dayjs(item.endTime).format('YYYY-MM-DD HH:mm:ss') }}</view>
</view> </view>
<view class="u-m-t-10 color-999 u-font-24"> <view class="u-m-t-10 color-999 u-font-24">
{{ formatStr(item.useRestrictions)}} {{ formatStr(item.useRestrictions)}}
@@ -65,7 +65,7 @@
</view> </view>
<view class=" u-m-t-14 u-flex"> <view class=" u-m-t-14 u-flex">
<view>有效期:</view> <view>有效期:</view>
<view class="u-font-24 u-m-l-6"> {{item.endTime}}</view> <view class="u-font-24 u-m-l-6"> {{dayjs(item.endTime).format('YYYY-MM-DD HH:mm:ss') }}</view>
</view> </view>
<view class="u-m-t-10 color-999 u-font-24"> <view class="u-m-t-10 color-999 u-font-24">
{{ formatStr(item.useRestrictions)}} {{ formatStr(item.useRestrictions)}}
@@ -138,6 +138,7 @@
onMounted onMounted
} from 'vue'; } from 'vue';
import color from '@/commons/color.js' import color from '@/commons/color.js'
import dayjs from 'dayjs';
import { import {
getSafeBottomHeight getSafeBottomHeight
} from '@/commons/utils/safe-bottom.js' } from '@/commons/utils/safe-bottom.js'

7
pagesOrder/quan_util.js
View File

@@ -58,8 +58,9 @@ export function returnProductCoupon(coup, goodsArr, vipUser, selCoupArr = []) {
const discountAmount = (price * coup.num).toFixed(2) const discountAmount = (price * coup.num).toFixed(2)
console.log(discountAmount); console.log(discountAmount);
const canUse = !coup.use ? false : (discountAmount > 0 && returnCoupCanUse(goodsArr, coup, selCoupArr)) // const canUse = !coup.use ? false : (discountAmount > 0 && returnCoupCanUse(goodsArr, coup, selCoupArr))
// const canUse=discountAmount>0 // const canUse=discountAmount>0
const canUse=coup.use
return { return {
...coup, ...coup,
discountAmount: discountAmount, discountAmount: discountAmount,
@@ -166,7 +167,9 @@ export function returnProductCouponAllPrice(coupArr, goodsArr, vipUser) {
} }
const proCoupStartIndex=returnProCoupStartIndex(arr,i) const proCoupStartIndex=returnProCoupStartIndex(arr,i)
console.log(proCoupStartIndex); console.log(proCoupStartIndex);
total+=returnProductCoupAllPrice(goodsPayPriceMap[coup.proId],proCoupStartIndex,coup.num) const coupNum=Math.min(goodsPayPriceMap[coup.proId].length,coup.num)
console.log(coupNum);
total+=returnProductCoupAllPrice(goodsPayPriceMap[coup.proId],proCoupStartIndex,coupNum)
} }
} }