diff --git a/fuintAdmin_zt/src/views/components/Service/payment.vue b/fuintAdmin_zt/src/views/components/Service/payment.vue index 4540bc425..3bec8fb59 100644 --- a/fuintAdmin_zt/src/views/components/Service/payment.vue +++ b/fuintAdmin_zt/src/views/components/Service/payment.vue @@ -20,7 +20,7 @@ -
添加商户信息
+
添加商户信息
@@ -48,12 +48,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(item)" + v-hasPermi="['Merchant:edit']" >修改 删除
@@ -88,7 +90,8 @@
-
添加规则
+
添加规则
发布规则
@@ -102,8 +105,10 @@
%更换支付通道
- 编辑 - 删除 + 编辑 + 删除
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java index c98afe18a..501c3ec75 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java @@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import java.text.DecimalFormat; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -51,6 +52,7 @@ public class CreditUnitServiceImpl extends ServiceImpl hangBillVos = hangBillService.selectHangBillsByCreditUnit(hangBillVo); record.setHangBillTotal(hangBillVos.size()); + DecimalFormat df = new DecimalFormat("#.00"); Double hangBillAmount = 0.0; Integer returnTotal = 0; Double returnAmount = 0.0; @@ -66,11 +68,11 @@ public class CreditUnitServiceImpl extends ServiceImpl { */ List getAvailableSources(Integer merchantId); + /** + * 根据父级路径查询当前页中按钮权限 + * @param path + * @return + */ + List getButtonPermi(String path); + /** * 获取有效的菜单集合 * diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/SourceServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/SourceServiceImpl.java index cb734932f..9d3501b95 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/SourceServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/SourceServiceImpl.java @@ -1,6 +1,7 @@ package com.fuint.common.service.impl; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fuint.common.domain.TreeSelect; import com.fuint.common.dto.AccountInfo; @@ -45,6 +46,20 @@ public class SourceServiceImpl extends ServiceImpl imple return tSourceMapper.findByStatus(merchantId, StatusEnum.ENABLED.getKey()); } + @Override + public List getButtonPermi(String path) { + List byStatusButton = null; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("path",path); + queryWrapper.eq("status","A"); + queryWrapper.eq("is_menu","1"); + TSource tSource = baseMapper.selectOne(queryWrapper); + if (ObjectUtil.isNotEmpty(tSource)){ + byStatusButton = tSourceMapper.findByStatusButton(tSource.getSourceId(), StatusEnum.ENABLED.getKey()); + } + return byStatusButton; + } + @Override public List getAvailableSources1(Integer merchantId) { List byStatus1 = tSourceMapper.findByStatus1(merchantId, StatusEnum.ENABLED.getKey()); diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index 8f807572d..af51b36b3 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -199,9 +199,9 @@ :class="{ 'wrap-box2': 'oilCard' == payType }" > 囤油卡 --> -
- 储值卡 + 储值卡
{{ item.dictLabel }}
-
- 挂账 + 挂账