AbyGwX(>gI~1Z~u^Eu&wQo5`9eTd)FgkCeC)Mz``z@@NEmfkUQk*m`2JP8a5N3X>yPUx_KLsV!uCk~LsqeHo?tk`
zlnH_ws(~vV`Eh^WIzQioMkYX~(K1Y`=n5YA(Z8p^y*neOnUPXWpP%r#Qg0@1#XFZS
zu5~;iUEFZCj`zreZn$zS!uF9U335CY6dhO%R+-c+7BPXgZr#NAcgr_JVUIVSUKdah
zl^^4IYrF9xevq52l0_C7v|i5zY5+e=F=CVGbjJ)CCRQr8?r?r%^Z+s_?drEhm`9W8
z?NRsbv@Sy-Rp}UQ9cg7`#Hi3gyQ>236
z-v{#zqxw+}%F>N@>)WkaVLk#WV;8!Tvt##vO41RK7bbFm$DI`4ML7cg^$^KomiN=p
z2RBh)e}qe>D-flSt+Xb@5fy2I
zGhC9h`e#QTp835wdM%m;$54jZ1g}XYt~GVk6F1QNvI)4Ng?_rarB&ubh`3W+xB2mz
zLcwe>Q~LvMDSWaGY4>DQS8}O1^QC8sU;T`}>lx=eIISnJk^*9;LSMb-LwM2G$K(|V
z0%At0X`a0BtYVUzlIb3-y0(NDyCRH8DQOEu+Q&tyokxkipM*5vC9xsnbQ5TZe}tab
zY8&lvq${I#hK(c#{TtLEYGD@L8gfvrGY$
zgOoswW1;YQF1hq#p?sEA5_675Jz6zWmyCOak4|FO}9jl689sbrFK#`7>1k`lLbwIafb(EQ-mM3H=m-!anme^%XUqHkxsXhh5+%
zQJl7zrVwp_lqm^YNzfnFGvez-nF?c)aMjbG(X-2TnA0T-i!)kzn@?jnoZD|JL0Qa;VI6VaoLX}u`f_v;
z*OvEl#%LDH{xp}h#)m-t8k6k+EF(Vq6NC~6GmgYhg~*^qO$EatvWw%V`|gm*J9ohXkNyhJlTejHhK)UtOEOsBK`^Sf>X{F
z_NaZ$Q^j07z+KKzn$IrPr@8qi_aUA{($tHye?*ZB{qry^aJ=@lxFVByepe(r2cBYB
z`oGQu(L#yv`C4Oj;CtZd7b}I1D1;o9qAjt_T$i7l}sr@@jD-!wuA1
z?aK7sz@roFpF;sw1~
zhj{ochKC}lO6{n%4c&X4)t2Ayur!se2Jv$kG|3CHL7pw%D281_qQOo_L<{~8uFlMw
zw)VfBXZGr#M&-Am4w%goE00Z$w=+ZysPwFhcaTm<vvA*z-2L4@B4v
z9#X{-Ip;n0)l}=PTcY|z94RTZtyy)3bLDD!W+?yV*}gJwnS*7?G$kF_`4v*`%+$Mp
zNb6k%M~jS9fxF3qxT*_>|Ax>BySArXm3=%nTqPkKJLg(fqx?*@{hY^a!0N9O+)wZN
zRrVp(NjYjImZHY7Ab>29l;CzBye0Y26lJM_`v#TpxBX&ajNR=NgX{Fa
zq3{@+1D|zo{;N$>@%fS^L)SFD{3W-%9ew}9t4f|AVo&2lTDWn5oX*1k~e>+Y0WJ8EVP@Y1N;uL~jJ>SZjU$^Dd
z`dzIFWkTc}4%?uG*eviGtV~0}i8eG%iNU?ao0J)Rzw2lhPfJP`E3o?^J)Py3YNYklRWbJ4%4J$a(6@_>RR|`1~!EICn~t3icc$1r2Y|pSU6
z1m!uI#R)m3%;~JYSgAA0MPky;5PzmIeTRrxmU%}0<-X*71*eOQj`EHco+i?z4$7-w
z&zYp&HT>WjDZE%~WPfM(r1)Gug-VR_ypK9~jKz~9vVNF1{hN*^QOKWK#i3!?Zajpp
z{|pzH*ewQ=5W_7}`UEu9m^%WZHfZ)_X=J>@O@;B0&5C8mT9hXQbx#iueudjuRxtj*
z%w>SwN(;l<^oiq4V`pBOeht9IGjN>xEi316;Ni4*H%!^^LoV{wFUFT?A1h(X1hoZv
z91XD2@m24(2<}PH24nJJ(!bxg(FxmZJ+;j(@o*pw(rsF~gwG$?EDPlC8CN_S9;&UC
zN0<+?9o8J?HGI%)zPp^zUB?n%I~sj-JM3wSZ?fmJ{aiI5bMj9X|HI-x$y|ClYx>$1
zYE#wpSApeI*iZxRYq@=zqo8Clxk}h!(JppcG#$Ra(+g90X60Ab5N+Nqjr^@CR^Dc|
z4d`$bS@eMTBxIR7g6F^7ZcoX9_gcD};b{6iJ+N%d2mja0f1O#1-+jNwT76?;^q3^-
zGug`N)bYf(qi{bYy#3m1ups@m!uI=|dXdkf*ttrbAi4FwaRzUX%Yln$P7%=?A(?eC
z8<8d~Tnk=hZ5i4lGlvE2vo&;YlJwws(NUOVXaM%a}~Am*`7B@T$QS
ziWdSb%j@qcJ2jlVFHAJtWf;Du|5p?KL?GX|}}@KLkU
z>Is>sn#pZ5n(!P`gPnvU|>bc4&RuK#iG`l
ziS|q96zNc1PpB1^Z6&mFj;F3SDpfpKG4XFkXp>*3F}Qj7;q
zYSmP*`i6e1%KWK@E}JK4Xc>1=_D-cb75F*eP?~E=!L~R;s|T+%VB9oH%W$y@
zQbzhBw^AtH`hs_;0{LYM$A|x&*&9qC_T)UCrQN7RlJ$`LGhMT=H;a9Lv(J=xLZb9V
zO%^!@nFT`PK%dR^eoDc6A~};G-m{)VIwl;wR9;h`!55k8OD7vs1hgz}nRPkJXUn9v$x-ygsT$JLdzYP&?XJZuE!W_1xL#Nff0yT6_2Jp|Nfuqw$
zZ*hm65r^hLt?KXNEtBBOwB`X$6X)UhK%{S3jn*EU
z1qzWqM&tZaqS628&OeG^BnGea`DL|KJ9KVDV#ub}#o?wAT%lrG`6-M%cQ|i8*q3gr
z%9C#yrh6Dkx5I2pcf!GEiIOb<
zT*JIYV5{R3>vD%iRBrTb1J~YJ$(yES-O)Ld=NrGE4J9Ww&%bn}f&Pc<-kL@NLMBbV
z{xN0@=7{5SX&MZIktDb?KVg#XK?Qwyx4JT6Y515hMu?j99H?6F?RIg@^w9kthlBJG)xH({~
zm(PeCIQ9Bh#KFy%YBkCAMSDftjm=R4lZjQ|inz88_y(revh#R16yyUcYiqu?91WW_3|1;aZ@LI3Cr}j&q6er|du{cho=bMHUq_H2A;fl`n^{={Duo2tB~kj-nxr5smh$B35Y8Jeu0Wv?_U
z7(BO>`^ee%L|wUlc4oxp-~FoEGJ^F_nZ1sU
+
-
-
-
-
Date: Sat, 25 Nov 2023 10:27:36 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=94=B6=E9=93=B6=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
fuintAdmin/src/api/staff/user/sysconfig.js | 11 +-
fuintAdmin/src/views/member/index.vue | 2 +-
fuintAdmin/src/views/userGrade/index.vue | 25 +-
.../service/impl/OilConfigServiceImpl.java | 9 +-
.../com/fuint/api/fuyou/util/SchudelUtil.java | 17 -
.../controller/LJUserGradeController.java | 11 +
.../service/LJUserGradeService.java | 7 +
.../service/impl/LJUserGradeServiceImpl.java | 18 +-
.../controller/SysConfigController.java | 12 +
.../config/service/SysConfigService.java | 6 +
.../service/impl/SysConfigServiceImpl.java | 12 +
fuintCashierWeb/src/api/cashier/usergrade.js | 8 +
.../views/cashier/NewComponents/homeindex.vue | 406 +++++++++---------
13 files changed, 314 insertions(+), 230 deletions(-)
delete mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/util/SchudelUtil.java
diff --git a/fuintAdmin/src/api/staff/user/sysconfig.js b/fuintAdmin/src/api/staff/user/sysconfig.js
index 3bafbbf6e..cdc5147d5 100644
--- a/fuintAdmin/src/api/staff/user/sysconfig.js
+++ b/fuintAdmin/src/api/staff/user/sysconfig.js
@@ -1,9 +1,18 @@
import request from '@/utils/request'
-// 查询会员详细
+// 查询配置信息
export function getSysConfig(key) {
return request({
url: '/sysConfig/getByKey/' + key,
method: 'get'
})
}
+
+// 修改配置信息
+export function editSysConfig(data) {
+ return request({
+ url: '/sysConfig/updateValue',
+ method: 'put',
+ data: data
+ })
+}
diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue
index f16571fa3..7bcc34370 100644
--- a/fuintAdmin/src/views/member/index.vue
+++ b/fuintAdmin/src/views/member/index.vue
@@ -4,7 +4,7 @@
-
+
diff --git a/fuintAdmin/src/views/userGrade/index.vue b/fuintAdmin/src/views/userGrade/index.vue
index 420e1a7fb..85aa1c926 100644
--- a/fuintAdmin/src/views/userGrade/index.vue
+++ b/fuintAdmin/src/views/userGrade/index.vue
@@ -448,7 +448,7 @@ import {
updateUserGrade
} from "@/api/staff/user/usergrade";
import {getChainStoreConfig, updateChainStoreConfig} from "@/api/staff/user/chainstoreconfig";
-import {getSysConfig} from "@/api/staff/user/sysconfig";
+import {editSysConfig, getSysConfig} from "@/api/staff/user/sysconfig";
export default {
name: "UserGradeIndex",
dicts: ['yhlx','zhzt','yhhdz'],
@@ -511,6 +511,11 @@ export default {
catchTypeList: [],
// 是否显示弹出层
open: false,
+ // 等级开启信息
+ map:{
+ keyStr:"is_enable_level",
+ valueStr:""
+ },
// 默认排序
defaultSort: {prop: 'createTime', order: 'descending'},
// 表单参数
@@ -583,14 +588,20 @@ export default {
});
},
editLevel1(){
- this.level1 = false;
- this.level2 = true;
- this.$modal.msgSuccess("等级状态更新成功");
+ this.map.valueStr = "yes"
+ editSysConfig(this.map).then(res => {
+ this.level1 = false;
+ this.level2 = true;
+ this.$modal.msgSuccess("等级状态更新成功");
+ })
},
editLevel2(){
- this.level1 = true;
- this.level2 = false;
- this.$modal.msgSuccess("等级状态更新成功");
+ this.map.valueStr = "no"
+ editSysConfig(this.map).then(res => {
+ this.level1 = true;
+ this.level2 = false;
+ this.$modal.msgSuccess("等级状态更新成功");
+ })
},
addGasOline(){
let temp= {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java
index fa74b1b2b..51ec8062d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/OilConfigServiceImpl.java
@@ -78,7 +78,14 @@ public class OilConfigServiceImpl extends ServiceImpl {
*/
public LJUserGrade selectUserGradeById(int id);
+ /**
+ * 根据id查询会员等级信息是否可使用
+ * @param id
+ * @return
+ */
+ public LJUserGrade selectUserGradeByIdIsUse(int id);
+
/**
* 根据会员等级名称查询会员等级信息
* @param name
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java
index e616e2eec..7b227bc88 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java
@@ -12,6 +12,8 @@ import com.fuint.business.userManager.service.LJUserGradeService;
import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.StringUtils;
import com.fuint.common.util.TokenUtil;
+import com.fuint.system.config.service.SysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
@@ -41,6 +43,18 @@ public class LJUserGradeServiceImpl extends ServiceImpl {
void saveVo(SysConfig sysConfig);
void updateByIdVo(SysConfig sysConfig);
+
+ /**
+ * 根据key修改配置信息
+ * @param sysConfig
+ */
+ void updateSysConfig(SysConfig sysConfig);
void removeByIdVo(Long id);
String getValueByKey(String keyStr);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/config/service/impl/SysConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/config/service/impl/SysConfigServiceImpl.java
index 6244c0387..c84f882ef 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/config/service/impl/SysConfigServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/config/service/impl/SysConfigServiceImpl.java
@@ -1,6 +1,7 @@
package com.fuint.system.config.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.common.util.RedisUtil;
import com.fuint.system.config.mapper.SysConfigMapper;
@@ -34,6 +35,17 @@ public class SysConfigServiceImpl extends ServiceImpl();
+ queryWrapper.eq("key_str",sysConfig.getKeyStr());
+ SysConfig sysConfig1 = baseMapper.selectOne(queryWrapper);
+ if (ObjectUtils.isNotEmpty(sysConfig1)){
+ sysConfig1.setValueStr(sysConfig.getValueStr());
+ baseMapper.updateById(sysConfig1);
+ }
+ }
+
@Override
public void removeByIdVo(Long id) {
SysConfig sysConfig = this.getById(id);
diff --git a/fuintCashierWeb/src/api/cashier/usergrade.js b/fuintCashierWeb/src/api/cashier/usergrade.js
index 7eeae693a..b2147500a 100644
--- a/fuintCashierWeb/src/api/cashier/usergrade.js
+++ b/fuintCashierWeb/src/api/cashier/usergrade.js
@@ -17,6 +17,14 @@ export function getUserGrade(id) {
})
}
+// 查询会员等级详细是否能使用
+export function userGradeInfo(id) {
+ return request({
+ url: '/business/userManager/userGrade/isUse/' + id,
+ method: 'get'
+ })
+}
+
// 根据会员等级名称查询会员等级信息
export function queryUserGrade(data) {
return request({
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index 822cb89d8..145eae82d 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -782,7 +782,7 @@
import {getUserVoMobile, getUserVoName} from "@/api/cashier/user";
import {queryStaffs, staffInfo} from "@/api/cashier/staff";
import {addLJGoods, goodsOrder, oilOrder} from "@/api/cashier/oilorder";
- import {getUserGrade, listUserGrade} from "@/api/cashier/usergrade";
+ import {getUserGrade, listUserGrade, userGradeInfo} from "@/api/cashier/usergrade";
import {getOilGun} from "@/api/cashier/oilGuns";
import {listCardFavorableRecord} from "@/api/cashier/cardfavorablerecord";
import {getOilNumberById, oilNumberList} from "@/api/cashier/oilnumber";
@@ -1421,228 +1421,230 @@
this.gradeDiscount = [];
getSysConfig('is_enable_level').then(res => {
if (res.data=="yes") {
- getUserGrade(id).then(response => {
+ userGradeInfo(id).then(response => {
let gasolineDiscount = 0;
let dieselDiscount = 0;
let naturalGasDiscount = 0;
_this.gradeDiscount = [];
- _this.oilOrder.forEach(item => {
- let discount = {type: "", full: 0, reduce: 0, liters: 0}
- if (item.type == "汽油") {
- let gasolineRule = JSON.parse(response.data.gasolineRule);
- if (response.data.preferential == '自定义优惠' && response.data.status == 'qy') {
- if (response.data.gasolineDiscount == "满减优惠") {
- let oilDiscount = 0;
- discount.type = "满减优惠"
- for (let i = 1; i <= gasolineRule.length; i++) {
- // 将满减条件加入等级优惠列表
- if (gasolineRule.length > 1) {
- if (item.amount >= gasolineRule[gasolineRule.length - 1].gasolineRule1) {
- discount.full = gasolineRule[gasolineRule.length - 1].gasolineRule1
- oilDiscount = gasolineRule[gasolineRule.length - 1].gasolineRule2
- discount.reduce = gasolineRule[gasolineRule.length - 1].gasolineRule2
- break;
- }
- if (item.amount >= gasolineRule[i - 1].gasolineRule1 && item.amount < gasolineRule[i].gasolineRule1) {
- discount.full = gasolineRule[i - 1].gasolineRule1
- oilDiscount = gasolineRule[i - 1].gasolineRule2
- discount.reduce = gasolineRule[i - 1].gasolineRule2
- }
- } else {
- if (item.amount >= gasolineRule[i - 1].gasolineRule1) {
- discount.full = gasolineRule[i - 1].gasolineRule1
- oilDiscount = gasolineRule[i - 1].gasolineRule2
- discount.reduce = gasolineRule[i - 1].gasolineRule2
+ if (response.data!=null) {
+ _this.oilOrder.forEach(item => {
+ let discount = {type: "", full: 0, reduce: 0, liters: 0}
+ if (item.type == "汽油") {
+ let gasolineRule = JSON.parse(response.data.gasolineRule);
+ if (response.data.preferential == '自定义优惠' && response.data.status == 'qy') {
+ if (response.data.gasolineDiscount == "满减优惠") {
+ let oilDiscount = 0;
+ discount.type = "满减优惠"
+ for (let i = 1; i <= gasolineRule.length; i++) {
+ // 将满减条件加入等级优惠列表
+ if (gasolineRule.length > 1) {
+ if (item.amount >= gasolineRule[gasolineRule.length - 1].gasolineRule1) {
+ discount.full = gasolineRule[gasolineRule.length - 1].gasolineRule1
+ oilDiscount = gasolineRule[gasolineRule.length - 1].gasolineRule2
+ discount.reduce = gasolineRule[gasolineRule.length - 1].gasolineRule2
+ break;
+ }
+ if (item.amount >= gasolineRule[i - 1].gasolineRule1 && item.amount < gasolineRule[i].gasolineRule1) {
+ discount.full = gasolineRule[i - 1].gasolineRule1
+ oilDiscount = gasolineRule[i - 1].gasolineRule2
+ discount.reduce = gasolineRule[i - 1].gasolineRule2
+ }
+ } else {
+ if (item.amount >= gasolineRule[i - 1].gasolineRule1) {
+ discount.full = gasolineRule[i - 1].gasolineRule1
+ oilDiscount = gasolineRule[i - 1].gasolineRule2
+ discount.reduce = gasolineRule[i - 1].gasolineRule2
+ }
}
}
- }
- if (discount.reduce != 0) {
- _this.gradeDiscount.push(discount)
- _this.checkedCities2.push('满减优惠')
- }
- gasolineDiscount += +oilDiscount
- } else if (response.data.gasolineDiscount == "每升优惠") {
- discount.type = "每升优惠"
- let oilDiscount = 0;
- for (let i = 1; i <= gasolineRule.length; i++) {
- // 将满减条件加入等级优惠列表
- if (gasolineRule.length > 1) {
- if (item.amount >= gasolineRule[gasolineRule.length - 1].gasolineRule1) {
- discount.full = gasolineRule[gasolineRule.length - 1].gasolineRule1
- oilDiscount = (item.liters * gasolineRule[gasolineRule.length - 1].gasolineRule3).toFixed(2);
- discount.reduce = (item.liters * gasolineRule[gasolineRule.length - 1].gasolineRule3).toFixed(2);
- discount.liters = gasolineRule[i - 1].gasolineRule3
- break;
- }
- if (item.amount >= gasolineRule[i - 1].gasolineRule1 && item.amount < gasolineRule[i].gasolineRule1) {
- discount.full = gasolineRule[i - 1].gasolineRule1
- oilDiscount = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
- discount.reduce = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
- discount.liters = gasolineRule[i - 1].gasolineRule3
- }
- } else {
- if (item.amount >= gasolineRule[i - 1].gasolineRule1) {
- discount.full = gasolineRule[i - 1].gasolineRule1
- oilDiscount = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
- discount.reduce = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
- discount.liters = gasolineRule[i - 1].gasolineRule3
- }
+ if (discount.reduce != 0) {
+ _this.gradeDiscount.push(discount)
+ _this.checkedCities2.push('满减优惠')
}
- }
- if (discount.reduce != 0) {
- _this.gradeDiscount.push(discount)
- _this.checkedCities2.push('每升优惠')
- }
- gasolineDiscount += +oilDiscount
- } else {
- gasolineDiscount = 0;
- }
- }
- }
- if (item.type == "柴油") {
- let dieselRule = JSON.parse(response.data.dieselRule);
- if (response.data.preferential == '自定义优惠' && response.data.status == 'qy') {
- if (response.data.dieselDiscount == "满减优惠") {
- let oilDiscount = 0;
- discount.type = "满减优惠"
- for (let i = 1; i <= dieselRule.length; i++) {
- // 将满减条件加入等级优惠列表
- if (dieselRule.length > 1) {
- if (item.amount >= dieselRule[dieselRule.length - 1].dieselRule1) {
- discount.full = dieselRule[dieselRule.length - 1].dieselRule1
- oilDiscount = dieselRule[dieselRule.length - 1].dieselRule2
- discount.reduce = dieselRule[dieselRule.length - 1].dieselRule2
- break;
- }
- if (item.amount >= dieselRule[i - 1].dieselRule1 && item.amount < dieselRule[i].dieselRule1) {
- discount.full = dieselRule[i - 1].dieselRule1
- oilDiscount = dieselRule[i - 1].dieselRule2
- discount.reduce = dieselRule[i - 1].dieselRule2
- }
- } else {
- discount.full = dieselRule[i - 1].dieselRule1
- if (item.amount >= dieselRule[i - 1].dieselRule1) {
- oilDiscount = dieselRule[i - 1].dieselRule2
- discount.reduce = dieselRule[i - 1].dieselRule2
- }
- }
- }
- if (discount.reduce != 0) {
- _this.gradeDiscount.push(discount)
- _this.checkedCities2.push('满减优惠')
- }
- dieselDiscount += +oilDiscount
- } else if (response.data.dieselDiscount == "每升优惠") {
- let oilDiscount = 0;
- for (let i = 1; i <= dieselRule.length; i++) {
+ gasolineDiscount += +oilDiscount
+ } else if (response.data.gasolineDiscount == "每升优惠") {
discount.type = "每升优惠"
- // 将满减条件加入等级优惠列表
- if (dieselRule.length > 1) {
- if (item.amount >= dieselRule[dieselRule.length - 1].dieselRule1) {
- discount.full = dieselRule[dieselRule.length - 1].dieselRule1
- oilDiscount = (item.liters * dieselRule[dieselRule.length - 1].dieselRule3).toFixed(2);
- discount.reduce = (item.liters * dieselRule[dieselRule.length - 1].dieselRule3).toFixed(2);
- discount.liters = dieselRule[dieselRule.length - 1].dieselRule3
- break;
+ let oilDiscount = 0;
+ for (let i = 1; i <= gasolineRule.length; i++) {
+ // 将满减条件加入等级优惠列表
+ if (gasolineRule.length > 1) {
+ if (item.amount >= gasolineRule[gasolineRule.length - 1].gasolineRule1) {
+ discount.full = gasolineRule[gasolineRule.length - 1].gasolineRule1
+ oilDiscount = (item.liters * gasolineRule[gasolineRule.length - 1].gasolineRule3).toFixed(2);
+ discount.reduce = (item.liters * gasolineRule[gasolineRule.length - 1].gasolineRule3).toFixed(2);
+ discount.liters = gasolineRule[i - 1].gasolineRule3
+ break;
+ }
+ if (item.amount >= gasolineRule[i - 1].gasolineRule1 && item.amount < gasolineRule[i].gasolineRule1) {
+ discount.full = gasolineRule[i - 1].gasolineRule1
+ oilDiscount = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
+ discount.reduce = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
+ discount.liters = gasolineRule[i - 1].gasolineRule3
+ }
+ } else {
+ if (item.amount >= gasolineRule[i - 1].gasolineRule1) {
+ discount.full = gasolineRule[i - 1].gasolineRule1
+ oilDiscount = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
+ discount.reduce = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
+ discount.liters = gasolineRule[i - 1].gasolineRule3
+ }
}
- if (item.amount >= dieselRule[i - 1].dieselRule1 && item.amount < dieselRule[i].dieselRule1) {
+ }
+ if (discount.reduce != 0) {
+ _this.gradeDiscount.push(discount)
+ _this.checkedCities2.push('每升优惠')
+ }
+ gasolineDiscount += +oilDiscount
+ } else {
+ gasolineDiscount = 0;
+ }
+ }
+ }
+ if (item.type == "柴油") {
+ let dieselRule = JSON.parse(response.data.dieselRule);
+ if (response.data.preferential == '自定义优惠' && response.data.status == 'qy') {
+ if (response.data.dieselDiscount == "满减优惠") {
+ let oilDiscount = 0;
+ discount.type = "满减优惠"
+ for (let i = 1; i <= dieselRule.length; i++) {
+ // 将满减条件加入等级优惠列表
+ if (dieselRule.length > 1) {
+ if (item.amount >= dieselRule[dieselRule.length - 1].dieselRule1) {
+ discount.full = dieselRule[dieselRule.length - 1].dieselRule1
+ oilDiscount = dieselRule[dieselRule.length - 1].dieselRule2
+ discount.reduce = dieselRule[dieselRule.length - 1].dieselRule2
+ break;
+ }
+ if (item.amount >= dieselRule[i - 1].dieselRule1 && item.amount < dieselRule[i].dieselRule1) {
+ discount.full = dieselRule[i - 1].dieselRule1
+ oilDiscount = dieselRule[i - 1].dieselRule2
+ discount.reduce = dieselRule[i - 1].dieselRule2
+ }
+ } else {
discount.full = dieselRule[i - 1].dieselRule1
- oilDiscount = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
- discount.reduce = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
- discount.liters = dieselRule[i - 1].dieselRule3
- }
- } else {
- discount.full = dieselRule[i - 1].dieselRule1
- if (item.amount >= dieselRule[i - 1].dieselRule1) {
- oilDiscount = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
- discount.reduce = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
- discount.liters = dieselRule[i - 1].dieselRule3
+ if (item.amount >= dieselRule[i - 1].dieselRule1) {
+ oilDiscount = dieselRule[i - 1].dieselRule2
+ discount.reduce = dieselRule[i - 1].dieselRule2
+ }
}
}
+ if (discount.reduce != 0) {
+ _this.gradeDiscount.push(discount)
+ _this.checkedCities2.push('满减优惠')
+ }
+ dieselDiscount += +oilDiscount
+ } else if (response.data.dieselDiscount == "每升优惠") {
+ let oilDiscount = 0;
+ for (let i = 1; i <= dieselRule.length; i++) {
+ discount.type = "每升优惠"
+ // 将满减条件加入等级优惠列表
+ if (dieselRule.length > 1) {
+ if (item.amount >= dieselRule[dieselRule.length - 1].dieselRule1) {
+ discount.full = dieselRule[dieselRule.length - 1].dieselRule1
+ oilDiscount = (item.liters * dieselRule[dieselRule.length - 1].dieselRule3).toFixed(2);
+ discount.reduce = (item.liters * dieselRule[dieselRule.length - 1].dieselRule3).toFixed(2);
+ discount.liters = dieselRule[dieselRule.length - 1].dieselRule3
+ break;
+ }
+ if (item.amount >= dieselRule[i - 1].dieselRule1 && item.amount < dieselRule[i].dieselRule1) {
+ discount.full = dieselRule[i - 1].dieselRule1
+ oilDiscount = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
+ discount.reduce = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
+ discount.liters = dieselRule[i - 1].dieselRule3
+ }
+ } else {
+ discount.full = dieselRule[i - 1].dieselRule1
+ if (item.amount >= dieselRule[i - 1].dieselRule1) {
+ oilDiscount = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
+ discount.reduce = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
+ discount.liters = dieselRule[i - 1].dieselRule3
+ }
+ }
+ }
+ if (discount.reduce != 0) {
+ _this.gradeDiscount.push(discount)
+ _this.checkedCities2.push('每升优惠')
+ }
+ dieselDiscount += +oilDiscount
+ } else {
+ dieselDiscount = 0;
}
- if (discount.reduce != 0) {
- _this.gradeDiscount.push(discount)
- _this.checkedCities2.push('每升优惠')
- }
- dieselDiscount += +oilDiscount
- } else {
- dieselDiscount = 0;
}
}
- }
- if (item.type == "天然气") {
- let naturalGasRule = JSON.parse(response.data.naturalGasRule);
- if (response.data.preferential == '自定义优惠' && response.data.status == 'qy') {
- if (response.data.naturalGasDiscount == "满减优惠") {
- let oilDiscount = 0;
- discount.type = "满减优惠"
- for (let i = 1; i <= naturalGasRule.length; i++) {
- // 将满减条件加入等级优惠列表
- if (naturalGasRule.length > 1) {
- if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGasRule1) {
- discount.full = naturalGasRule[naturalGasRule.length - 1].naturalGasRule1
- oilDiscount = naturalGasRule[naturalGasRule.length - 1].naturalGasRule2;
- discount.reduce = naturalGasRule[naturalGasRule.length - 1].naturalGasRule2
- break;
- }
- if (item.amount >= naturalGasRule[i - 1].naturalGasRule1 && item.amount < naturalGasRule[i].naturalGasRule1) {
- discount.full = naturalGasRule[i - 1].naturalGasRule1
- oilDiscount = naturalGasRule[i - 1].naturalGasRule2
- discount.reduce = naturalGasRule[i - 1].naturalGasRule2
- }
- } else {
- if (item.amount >= naturalGasRule[i - 1].naturalGasRule1) {
- discount.full = naturalGasRule[i - 1].naturalGasRule1
- oilDiscount = naturalGasRule[i - 1].naturalGasRule2
- discount.reduce = naturalGasRule[i - 1].naturalGasRule2
+ if (item.type == "天然气") {
+ let naturalGasRule = JSON.parse(response.data.naturalGasRule);
+ if (response.data.preferential == '自定义优惠' && response.data.status == 'qy') {
+ if (response.data.naturalGasDiscount == "满减优惠") {
+ let oilDiscount = 0;
+ discount.type = "满减优惠"
+ for (let i = 1; i <= naturalGasRule.length; i++) {
+ // 将满减条件加入等级优惠列表
+ if (naturalGasRule.length > 1) {
+ if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGasRule1) {
+ discount.full = naturalGasRule[naturalGasRule.length - 1].naturalGasRule1
+ oilDiscount = naturalGasRule[naturalGasRule.length - 1].naturalGasRule2;
+ discount.reduce = naturalGasRule[naturalGasRule.length - 1].naturalGasRule2
+ break;
+ }
+ if (item.amount >= naturalGasRule[i - 1].naturalGasRule1 && item.amount < naturalGasRule[i].naturalGasRule1) {
+ discount.full = naturalGasRule[i - 1].naturalGasRule1
+ oilDiscount = naturalGasRule[i - 1].naturalGasRule2
+ discount.reduce = naturalGasRule[i - 1].naturalGasRule2
+ }
+ } else {
+ if (item.amount >= naturalGasRule[i - 1].naturalGasRule1) {
+ discount.full = naturalGasRule[i - 1].naturalGasRule1
+ oilDiscount = naturalGasRule[i - 1].naturalGasRule2
+ discount.reduce = naturalGasRule[i - 1].naturalGasRule2
+ }
}
}
- }
- if (discount.reduce != 0) {
- _this.gradeDiscount.push(discount)
- _this.checkedCities2.push('满减优惠')
- }
- naturalGasDiscount += +oilDiscount
- } else if (response.data.naturalGasDiscount == "每单位优惠") {
- let oilDiscount = 0;
- discount.type = "每单位优惠"
- for (let i = 1; i <= naturalGasRule.length; i++) {
- // 将满减条件加入等级优惠列表
- if (naturalGasRule.length > 1) {
- if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGasRule1) {
- discount.full = naturalGasRule[naturalGasRule.length - 1].naturalGasRule1
- oilDiscount = (item.liters * naturalGasRule[gasolineRule.length - 1].naturalGasRule3).toFixed(2)
- discount.reduce = (item.liters * naturalGasRule[gasolineRule.length - 1].naturalGasRule3).toFixed(2)
- discount.liters = naturalGasRule[naturalGasRule.length - 1].naturalGasRule3
- break;
- }
- if (item.amount >= naturalGasRule[i - 1].naturalGasRule1 && item.amount < naturalGasRule[i].naturalGasRule1) {
- discount.full = naturalGasRule[i - 1].naturalGasRule1
- oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
- discount.reduce = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
- discount.liters = naturalGasRule[i - 1].naturalGasRule3
- }
- } else {
- if (item.amount >= naturalGasRule[i - 1].naturalGasRule1) {
- discount.full = naturalGasRule[i - 1].naturalGasRule1
- oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
- discount.reduce = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
- discount.liters = naturalGasRule[i - 1].naturalGasRule3
+ if (discount.reduce != 0) {
+ _this.gradeDiscount.push(discount)
+ _this.checkedCities2.push('满减优惠')
+ }
+ naturalGasDiscount += +oilDiscount
+ } else if (response.data.naturalGasDiscount == "每单位优惠") {
+ let oilDiscount = 0;
+ discount.type = "每单位优惠"
+ for (let i = 1; i <= naturalGasRule.length; i++) {
+ // 将满减条件加入等级优惠列表
+ if (naturalGasRule.length > 1) {
+ if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGasRule1) {
+ discount.full = naturalGasRule[naturalGasRule.length - 1].naturalGasRule1
+ oilDiscount = (item.liters * naturalGasRule[gasolineRule.length - 1].naturalGasRule3).toFixed(2)
+ discount.reduce = (item.liters * naturalGasRule[gasolineRule.length - 1].naturalGasRule3).toFixed(2)
+ discount.liters = naturalGasRule[naturalGasRule.length - 1].naturalGasRule3
+ break;
+ }
+ if (item.amount >= naturalGasRule[i - 1].naturalGasRule1 && item.amount < naturalGasRule[i].naturalGasRule1) {
+ discount.full = naturalGasRule[i - 1].naturalGasRule1
+ oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
+ discount.reduce = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
+ discount.liters = naturalGasRule[i - 1].naturalGasRule3
+ }
+ } else {
+ if (item.amount >= naturalGasRule[i - 1].naturalGasRule1) {
+ discount.full = naturalGasRule[i - 1].naturalGasRule1
+ oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
+ discount.reduce = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
+ discount.liters = naturalGasRule[i - 1].naturalGasRule3
+ }
}
}
+ if (discount.reduce != 0) {
+ _this.gradeDiscount.push(discount)
+ _this.checkedCities2.push('每单位优惠')
+ }
+ naturalGasDiscount += +oilDiscount
+ } else {
+ naturalGasDiscount = 0;
}
- if (discount.reduce != 0) {
- _this.gradeDiscount.push(discount)
- _this.checkedCities2.push('每单位优惠')
- }
- naturalGasDiscount += +oilDiscount
- } else {
- naturalGasDiscount = 0;
}
}
- }
- })
-
+ })
+ }
+ console.log(response)
_this.oilDiscount = gasolineDiscount + dieselDiscount + naturalGasDiscount
_this.checkAll2 = true;
_this.isExclusion();
@@ -1682,7 +1684,7 @@
_this.couponIds = response.data
if (response.data.length>0){
response.data.forEach(item => {
- _this.useCouponIds.push(item.id)
+ _this.useCouponIds = item.id
let discount = {type:item.type,discountType:item.discountType,name:item.name,oilName:item1.oilName,full:0,reduce:0,discount:0}
discount.full = item.satisfiedAmount
if (item.type==0){
+