diff --git a/fuintAdmin/src/views/staffCommission/staffCommission.vue b/fuintAdmin/src/views/staffCommission/staffCommission.vue index 1fd975612..f9b93c223 100644 --- a/fuintAdmin/src/views/staffCommission/staffCommission.vue +++ b/fuintAdmin/src/views/staffCommission/staffCommission.vue @@ -286,7 +286,8 @@ - + @@ -730,9 +731,9 @@ export default { submitForm: function() { this.$refs["form"].validate(valid => { if (valid) { - if (/^\d+$/.test(this.form.royaltyRate)){ + // if (/^\d+$/.test(this.form.royaltyRate)){ this.form.royaltyRate = this.form.royaltyRate + this.select - } + // } this.form.staffRoleGroup = this.staffRoleGroup.toString() if (this.form.id) { updateCommission(this.form).then(response => { diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java index 9c79b982f..ecb5ca082 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java @@ -1,5 +1,6 @@ package com.fuint.business.marketingActivity.activeExchange.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -512,7 +513,8 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { } //折扣+优惠券 for (ActiveDiscountPayVO activeDiscountPayVO : activeDiscountVOList) { - if (!activeDiscountPayVO.getParticipationCondition().equals("1")){ + if (ObjectUtil.isNotEmpty(activeDiscountPayVO.getParticipationCondition()) + && !activeDiscountPayVO.getParticipationCondition().equals("1")){ for (CardFavorableRecordVO cardFavorableRecordVO : canUserCardFavorableList) { if(StringUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()) && cardFavorableRecordVO.getExclusiveFunction().equals("2") && StringUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()) && !cardFavorableRecordVO.getExclusiveFunction().equals("0")){ @@ -553,7 +555,8 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { } //满减+优惠券 for (ActiveDiscountPayVO activeDiscountPayVO : activeFuletVOList) { - if (!activeDiscountPayVO.getParticipationCondition().equals("1")){ + if (ObjectUtils.isNotEmpty(activeDiscountPayVO.getParticipationCondition()) + && !activeDiscountPayVO.getParticipationCondition().equals("1")){ for (CardFavorableRecordVO cardFavorableRecordVO : canUserCardFavorableList) { if(StringUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()) && ObjectUtils.isNotEmpty(cardFavorableRecordVO) && cardFavorableRecordVO.getType().equals("2") && !cardFavorableRecordVO.getExclusiveFunction().equals("0")){ ActiveDiscountPayVO activeDiscountPayVO1 = new ActiveDiscountPayVO(); diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index 7a25f5244..5f91d37b7 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -90,7 +90,7 @@
-￥{{ fullReduction.toFixed(2) }}
-
+
加油员
-
{{ staff.realName }}
+
{{ staff ? staff.realName : "--" }}
@@ -345,13 +345,16 @@ :visible.sync="dialogVisible" width="30%" :close-on-click-modal="false"> -
+
{{ item.realName }}
{{ item.mobile }}
+
+
+ 暂未配置加油员
关 闭 @@ -1626,7 +1629,7 @@ this.getOilName(); this.getGoods(); // this.getStaffList(); - this.getStaff(); + // this.getStaff(); this.getList(); this.getCouponList(); // this.getUnitList(); @@ -1760,7 +1763,8 @@ }, // 会员充值 async userRecharge() { - if (this.isSure){ + // if (this.isSure){ + if (this.member){ this.$message.error("请先选择会员") return; } @@ -2557,7 +2561,9 @@ this.map.consumeAmount = 0.0; this.map.refuelMoney = JSON.stringify(this.refuelMoney) this.map.couponId = this.useCouponIds - this.map.staffId = this.staff.id + if (this.staff){ + this.map.staffId = this.staff.id + } this.map.cardFavorableId = this.cardFavorableId this.map.recordId = this.recordId this.map.userId = this.member.id @@ -2855,6 +2861,7 @@ resetMember(){ this.member = {}; this.isMember = false; + this.isSure = false; this.map.payUser == ""; this.balance = 0; this.oilDiscount = 0; @@ -3569,7 +3576,7 @@ this.dialogVisiblej = true - this.getStaff() + // this.getStaff() }, // 重置油品订单 resetting(){ @@ -3826,6 +3833,7 @@ this.amount = 0 this.dialogVisibleamount = true; let result = false + this.isExistOilOrder = false; // 判断是否存在此油品的数据 this.oilOrder.forEach(item => { if (item.id==data.id){ @@ -3887,7 +3895,9 @@ this.updateRefuelMoney(); this.map.refuelMoney = JSON.stringify(this.refuelMoney) this.map.couponId = this.useCouponIds - this.map.staffId = this.staff.id + if (this.staff) { + this.map.staffId = this.staff.id + } this.map.cardFavorableId = this.cardFavorableId this.map.recordId = this.recordId this.map.userId = this.member.id @@ -3984,6 +3994,7 @@ _this.oilTotal = 0; _this.goodsTotal = 0; _this.isMember = false; + _this.isSure = false; _this.oilOrder = [] _this.goodsOrder = [] _this.amount = 0 diff --git a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue index 397f11e75..59a47ac4a 100644 --- a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue +++ b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue @@ -9,29 +9,31 @@ - + {{item.discountActiveDescribe || ''}} - + + 自定义金额 - + - + @@ -207,6 +209,7 @@ text: '', fringeBenefit: "", giftBalance: "", + balance: '', rechargeBalance: "", incomeLitres: "", lockupPrice: "", @@ -220,13 +223,10 @@ columns: [], actList: [], taplist: [{ - title: '储值充值' + title: '金额选项' }, { - title: '囤油充值' - }, - { - title: '礼品卡兑换' + title: '自定义金额' }, ], @@ -406,7 +406,7 @@ chainStoreId: this.chainStoreId, cardFavorableId: this.cardFavorableId, cardRecordId: this.cardRecordId, - rechargeBalance: this.rechargeBalance, + balance: this.balance, types: this.types }, @@ -542,13 +542,14 @@ this.actindex = index }, getindex(index) { - this.actinput = index - if (index == 0) { - this.getValueCars(); - } - if (index == 1) { - this.getFuelCars(); - } + // this.actinput = index + this.types = index + // if (index == 0) { + // this.getValueCars(); + // } + // if (index == 1) { + // this.getFuelCars(); + // } }, goback() { uni.navigateBack() @@ -692,7 +693,7 @@ } .box-tap { - width: 33%; + width: 50%; text-align: center; } @@ -841,5 +842,9 @@ margin: 10px auto; font-size: 14px; color: #f40000; + box-sizing: border-box; + padding: 5px; + border-radius: 6px; + background: #f4f5f6; } \ No newline at end of file