xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-02 02:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Coupon filtering updated

Browse Source
This commit is contained in:
Vion 2022-03-14 16:43:44 +08:00
parent 3201a6ee2e
commit 7a234d4f3a
3 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rc-busness/ajax/getData.js
View File

@ -69,7 +69,7 @@ export const postCourseId = (productCode, buyCount, memberId, mobile, productImg
leftAllotment: leftAllotment, leftAllotment: leftAllotment,
basePiont: basePiont basePiont: basePiont
} }
return fetch('/insertCartProductInfo', data,'POST') return fetch('insertCartProductInfo', data,'POST')
} }
/** /**
* 是否存在购物车 * 是否存在购物车

41
rc-busness/pages/personal/settlement.vue
View File

@ -318,18 +318,30 @@ export default {
} else { } else {
//Into coupon discount calculation //Into coupon discount calculation
switch(this.curCoupon.couponTypeId) { switch(this.curCoupon.couponTypeId) {
case 1: //Amount deduct case 1: //Amount deduct
total = total + (itemInCart.productPrice * itemInCart.buyCount - this.curCoupon.couponAmount); if(this.curCoupon.couponAmount && this.curCoupon.couponAmount <= (itemInCart.productPrice * itemInCart.buyCount)) {
this.discountAmount = this.curCoupon.couponAmount; total = total + (itemInCart.productPrice * itemInCart.buyCount - this.curCoupon.couponAmount);
this.discountedProductCode = itemInCart.productCode; this.discountAmount = this.curCoupon.couponAmount;
couponUsed=true; this.discountedProductCode = itemInCart.productCode;
couponUsed=true;
} else if(this.curCoupon.couponAmount && this.curCoupon.couponAmount > (itemInCart.productPrice * itemInCart.buyCount)) {
total = total + itemInCart.productPrice * itemInCart.buyCount;
this.discountAmount = 0;
this.curCoupon = {couponName:'未能使用该优惠券'};
}
break; break;
case 2: //Amount deduct with minPrice restriction case 2: //Amount deduct with minPrice restriction
case 6: case 6:
total = total + (itemInCart.productPrice * itemInCart.buyCount) - this.curCoupon.couponAmount; if(this.curCoupon.couponAmount && this.curCoupon.couponAmount <= (itemInCart.productPrice * itemInCart.buyCount)) {
this.discountAmount = this.curCoupon.couponAmount; total = total + (itemInCart.productPrice * itemInCart.buyCount) - this.curCoupon.couponAmount;
this.discountedProductCode = itemInCart.productCode; this.discountAmount = this.curCoupon.couponAmount;
couponUsed=true; this.discountedProductCode = itemInCart.productCode;
couponUsed=true;
} else if(this.curCoupon.couponAmount && this.curCoupon.couponAmount > (itemInCart.productPrice * itemInCart.buyCount)) {
total = total + itemInCart.productPrice * itemInCart.buyCount;
this.discountAmount = 0;
this.curCoupon = {couponName:'未能使用该优惠券'};
}
break; break;
case 3: //Limited product % discount case 3: //Limited product % discount
case 4: //% discount case 4: //% discount
@ -417,7 +429,7 @@ export default {
valDateFromTime=0; valDateFromTime=0;
valDateToTime=0; valDateToTime=0;
dateChecked=true; dateChecked=true;
/* /* */
if(myCoupon.fValidFrom) { if(myCoupon.fValidFrom) {
//Fix ios date issue //Fix ios date issue
myCoupon.fValidFrom = myCoupon.fValidFrom.replace(/-/g, '/'); myCoupon.fValidFrom = myCoupon.fValidFrom.replace(/-/g, '/');
@ -435,19 +447,22 @@ export default {
if(valDateToTime && curTime > valDateToTime) { if(valDateToTime && curTime > valDateToTime) {
dateChecked=false; dateChecked=false;
} }
*/
if(myCoupon.minQuantity && myCoupon.minQuantity>itemInCart.buyCount) { if(myCoupon.minQuantity && myCoupon.minQuantity>itemInCart.buyCount) {
dateChecked=false; dateChecked=false;
} }
if(myCoupon.minPrice && myCoupon.minPrice>this.sumPrice) { if(myCoupon.minPrice && myCoupon.minPrice>this.sumPrice) {
dateChecked=false; dateChecked=false;
} }
if(myCoupon.couponAmount && myCoupon.couponAmount>this.sumPrice) {
dateChecked=false;
}
if(myCoupon.udf2!='H5') { if(myCoupon.udf2!='H5') {
dateChecked=false; dateChecked=false;
} }
//if(dateChecked && myCoupon.activityId != 10 && myCoupon.status == 0 && (!myCoupon.productCodes || myCoupon.productCodes.indexOf(itemInCart.productCode)>-1)) { if(dateChecked && myCoupon.activityId != 10 && myCoupon.status == 0 && (!myCoupon.productCodes || myCoupon.productCodes.indexOf(itemInCart.productCode)>-1)) {
if(dateChecked) { //if(dateChecked) {
//data.data.splice(tmpIndex,1); //data.data.splice(tmpIndex,1);
_self.drawlist.push(myCoupon); _self.drawlist.push(myCoupon);
avaliableCouponNum++; avaliableCouponNum++;

1
rc-busness/pages/productdetails/producted.vue
View File

@ -344,7 +344,6 @@ export default {
let stopIndex = 0; let stopIndex = 0;
for(let singleCode of productCode) { for(let singleCode of productCode) {
let data = await goodsmessage(singleCode); let data = await goodsmessage(singleCode);
console.log(data);
if (data && data.length>0) { if (data && data.length>0) {
newlist.push(data[0]); newlist.push(data[0]);