From 1f2646bdfcf72adf6677abc98a74afd11b439fea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Mon, 18 Mar 2024 14:56:57 +0800
Subject: [PATCH 1/8] bug
---
.../service/impl/CardFuelRecordServiceImpl.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
index d84e1860c..c5a11a8a4 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
@@ -659,6 +659,20 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
oilBalanceChangeService.save(oilBalanceChange);
//员工提成
staffCommissionService.countStaffCommission(cardFuleOrders.getStaffId(),cardFuleOrders.getStoreId(),cardFuleOrders.getAmount(),cardFuleOrders.getPayAmount(),"4",cardFuleOrders.getOrderNo());
+
+ //积分表变动
+ if (ObjectUtils.isNotEmpty(userBalance) && ObjectUtils.isNotEmpty(userBalance.getPoints()) && ObjectUtils.isNotEmpty(cardFuleOrders.getPoints())) {
+ IntegralDetail integralDetail = new IntegralDetail();
+ integralDetail.setStoreId(cardFuleOrders.getStoreId());
+ integralDetail.setChainStoreId(cardFuleOrders.getChainStoreId());
+ integralDetail.setPointsChange(Double.valueOf(cardFuleOrders.getPoints()));
+ integralDetail.setCurrentPoints(userBalance.getPoints() + cardFuleOrders.getPoints());
+ integralDetail.setChangeType("1");
+ integralDetail.setChangeReason("囤油卡充值");
+ integralDetail.setUserId(cardFuleOrders.getMtUserId());
+ IntegralDetail integralDetail1 = integralDetailService.insert2(integralDetail);
+ }
+
//生成充值记录
cardFuelRecord.setMtUserId(cardFuleOrders.getMtUserId());
cardFuelRecord.setName(cardFuleOrders.getName());
From 613995dd4e6da525f459f5f46d998ac565b0d684 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Mon, 18 Mar 2024 15:26:11 +0800
Subject: [PATCH 2/8] bug
---
.../views/staffCommission/staffCommission.vue | 16 ++++++++--------
.../impl/CommissionRecordServiceImpl.java | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/fuintAdmin/src/views/staffCommission/staffCommission.vue b/fuintAdmin/src/views/staffCommission/staffCommission.vue
index c861cb3f6..41ddac50c 100644
--- a/fuintAdmin/src/views/staffCommission/staffCommission.vue
+++ b/fuintAdmin/src/views/staffCommission/staffCommission.vue
@@ -82,7 +82,7 @@
- {{ scope.row.oilCardRecharge || 0 }}
+ {{ scope.row.oilStorageRecharge || 0 }}
@@ -315,7 +315,7 @@
-
-
-
+
+
+
@@ -384,9 +384,9 @@
油品订单提成
商品订单提成
储值卡充值提成
- 油品退款
- 商品退款
- 囤油卡充值提成
+
+
+ 囤油卡充值提成
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/CommissionRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/CommissionRecordServiceImpl.java
index d14f124cf..404f40748 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/CommissionRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/commission/service/impl/CommissionRecordServiceImpl.java
@@ -89,7 +89,7 @@ public class CommissionRecordServiceImpl implements CommissionRecordService {
staffPercentageVo.setGoodsCommission(commissionRecordMapper.selectAllCommissIon(commissionRecord));
commissionRecord.setType("3");
staffPercentageVo.setOilCardRecharge(commissionRecordMapper.selectAllCommissIon(commissionRecord));
- commissionRecord.setType("6");
+ commissionRecord.setType("4");
staffPercentageVo.setOilStorageRecharge(commissionRecordMapper.selectAllCommissIon(commissionRecord));
list.add(staffPercentageVo);
}
From c4dda44f1523db6478b1d18eb06d02db4a8d39fe Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Mon, 18 Mar 2024 16:30:21 +0800
Subject: [PATCH 3/8] bug
---
.../service/impl/AccountServiceImpl.java | 23 ++++++++++++++-----
.../role/service/impl/DutyServiceImpl.java | 20 ++++++++++++++++
.../main/resources/mapper/TAccountMapper.xml | 8 ++++++-
3 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
index 3e72896e5..cbe8de7b1 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
@@ -234,9 +234,7 @@ public class AccountServiceImpl extends ServiceImpl im
String staffId = param.get("staffId") == null ? "0" : param.get("staffId").toString();
String deptId = param.get("deptId") == null ? "0" : param.get("deptId").toString();
- ChainStoreInfo chainStoreInfo = chainStoreInfoService.selectChainStoreByDeptId(Long.valueOf(deptId));
- if (ObjectUtil.isNotEmpty(chainStoreInfo) && ObjectUtil.isNotEmpty(chainStoreInfo.getId()))
- merchantId = String.valueOf(chainStoreInfo.getId());
+
// 获取角色code
String code = param.get("code") == null ? "0" : param.get("code").toString();
@@ -257,6 +255,12 @@ public class AccountServiceImpl extends ServiceImpl im
mtStore = mtStoreMapper.selectOne(lambdaQueryWrapper);
}
+ if ("2".equals(deptType)) {
+ // 查出storeId
+ ChainStoreInfo chainStoreInfo = chainStoreInfoService.selectChainStoreByDeptId(Long.valueOf(deptId));
+ if (ObjectUtil.isNotEmpty(chainStoreInfo) && ObjectUtil.isNotEmpty(chainStoreInfo.getId()))
+ merchantId = String.valueOf(chainStoreInfo.getId());
+ }
AccountInfo accountInfo = getAccountByName(accountName);
if (accountInfo != null) {
@@ -283,6 +287,7 @@ public class AccountServiceImpl extends ServiceImpl im
tAccount.setLocked(0);
if (ObjectUtil.isEmpty(mtStore)) mtStore.setId(0);
tAccount.setStoreId(mtStore.getId());
+ merchantId = ObjectUtil.isNotEmpty(mtStore) ? String.valueOf(mtStore.getChainStoreId()) : merchantId;
tAccount.setMerchantId(Integer.parseInt(merchantId));
tAccount.setStaffId(Integer.parseInt(staffId));
tAccount.setDeptId(Long.parseLong(deptId));
@@ -373,9 +378,15 @@ public class AccountServiceImpl extends ServiceImpl im
tAccount.setStaffId(Integer.parseInt(staffId));
}
- ChainStoreInfo chainStoreInfo = chainStoreInfoService.selectChainStoreByDeptId(tAccount.getDeptId());
- if (ObjectUtil.isNotEmpty(chainStoreInfo) && ObjectUtil.isNotEmpty(chainStoreInfo.getId()))
- merchantId = String.valueOf(chainStoreInfo.getId());
+ if (param.get("deptType").equals("3")) {
+ MtStore store = mtStoreMapper.selectById(Integer.valueOf(param.get("storeId").toString()));
+ if (ObjectUtil.isNotEmpty(store)) merchantId = String.valueOf(store.getChainStoreId());
+ }
+ if (param.get("deptType").equals("2")){
+ ChainStoreInfo chainStoreInfo = chainStoreInfoService.selectChainStoreByDeptId(tAccount.getDeptId());
+ if (ObjectUtil.isNotEmpty(chainStoreInfo) && ObjectUtil.isNotEmpty(chainStoreInfo.getId()))
+ merchantId = String.valueOf(chainStoreInfo.getId());
+ }
if (StringUtil.isNotEmpty(merchantId)) {
tAccount.setMerchantId(Integer.parseInt(merchantId));
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/service/impl/DutyServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/service/impl/DutyServiceImpl.java
index 7e903f9bd..098e6d1fd 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/service/impl/DutyServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/service/impl/DutyServiceImpl.java
@@ -4,7 +4,11 @@ import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuint.common.dto.AccountInfo;
import com.fuint.common.enums.StatusEnum;
+import com.fuint.common.service.AccountService;
+import com.fuint.common.util.TokenUtil;
+import com.fuint.repository.model.TAccount;
import com.fuint.system.role.service.DutyService;
import com.fuint.framework.annoation.OperationServiceLog;
import com.fuint.framework.exception.BusinessCheckException;
@@ -23,6 +27,7 @@ import com.fuint.utils.StringUtil;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import org.apache.commons.lang.StringUtils;
+import org.springframework.context.annotation.Lazy;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
import org.springframework.stereotype.Service;
@@ -47,6 +52,10 @@ public class DutyServiceImpl extends ServiceImpl implements
@Resource
private TDutySourceMapper tDutySourceMapper;
+ @Resource
+ @Lazy
+ private AccountService accountService;
+
@Override
public List getAvailableRoles(Integer merchantId) {
List result = tDutyMapper.findByStatus(merchantId, StatusEnum.ENABLED.getKey());
@@ -145,12 +154,18 @@ public class DutyServiceImpl extends ServiceImpl implements
existsDuty.setDutyName(tduty.getDutyName());
existsDuty.setStatus(tduty.getStatus());
+ AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+ TAccount byId = accountService.getById(nowAccountInfo.getId());
+ Integer chainStoreId = null;
+ if (ObjectUtil.isNotEmpty(byId)) chainStoreId = byId.getMerchantId();
+
if (sources != null && sources.size() > 0) {
tDutySourceMapper.deleteSourcesByDutyId(tduty.getDutyId());
for (TSource tSource : sources) {
TDutySource dutySource = new TDutySource();
dutySource.setDutyId(tduty.getDutyId());
dutySource.setSourceId(tSource.getSourceId());
+ dutySource.setChainStoreId(chainStoreId);
tDutySourceMapper.insert(dutySource);
}
}
@@ -195,11 +210,16 @@ public class DutyServiceImpl extends ServiceImpl implements
throw new BusinessCheckException("角色名称已经存在.");
}
this.tDutyMapper.insert(duty);
+ AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+ TAccount byId = accountService.getById(nowAccountInfo.getId());
+ Integer chainStoreId = null;
+ if (ObjectUtil.isNotEmpty(byId)) chainStoreId = byId.getMerchantId();
if (sources != null && sources.size() > 0) {
for (TSource tSource : sources) {
TDutySource dutySource = new TDutySource();
dutySource.setDutyId(duty.getDutyId());
dutySource.setSourceId(tSource.getSourceId());
+ dutySource.setChainStoreId(chainStoreId);
tDutySourceMapper.insert(dutySource);
}
}
diff --git a/fuintBackend/fuint-repository/src/main/resources/mapper/TAccountMapper.xml b/fuintBackend/fuint-repository/src/main/resources/mapper/TAccountMapper.xml
index b29595e1f..a25239ac7 100644
--- a/fuintBackend/fuint-repository/src/main/resources/mapper/TAccountMapper.xml
+++ b/fuintBackend/fuint-repository/src/main/resources/mapper/TAccountMapper.xml
@@ -34,8 +34,14 @@
left join t_duty td ON ta.role_ids = td.duty_id
where account_status != -1
+
+ AND ta.account_name like concat('%',#{accountInfo.accountName},'%')
+
+
+ AND ta.account_status = #{accountInfo.accountStatus}
+
- AND ta.real_name = like concat('%',#{accountInfo.realName},'%')
+ AND ta.real_name like concat('%',#{accountInfo.realName},'%')
AND (ta.dept_id = #{accountInfo.deptId} or FIND_IN_SET(#{accountInfo.deptId}, sd.ancestors))
From c25d20b87bf8a09844a0cbbe27c11fda45acf066 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Mon, 18 Mar 2024 17:40:39 +0800
Subject: [PATCH 4/8] bug
---
fuintAdmin_zt/src/views/system/role/index.vue | 13 +++++++++----
.../com/fuint/common/enums/AdminRoleEnum.java | 3 ++-
.../fuint/common/service/SourceService.java | 7 +++++++
.../common/service/impl/SourceServiceImpl.java | 11 ++++++++++-
.../role/controller/BackendDutyController.java | 1 +
.../role/service/impl/DutyServiceImpl.java | 12 +++++++++++-
.../pagination/PaginationRequest.java | 7 +++++++
.../fuint/repository/mapper/TSourceMapper.java | 2 ++
.../main/resources/mapper/TSourceMapper.xml | 18 +++++++++++++++++-
9 files changed, 66 insertions(+), 8 deletions(-)
diff --git a/fuintAdmin_zt/src/views/system/role/index.vue b/fuintAdmin_zt/src/views/system/role/index.vue
index 7de894c4d..2cb70f947 100644
--- a/fuintAdmin_zt/src/views/system/role/index.vue
+++ b/fuintAdmin_zt/src/views/system/role/index.vue
@@ -70,7 +70,11 @@
+
+ {{scope.row.status=='A'?'启用':'禁用'}}
+
-
+
-
-
+
+
-
+
启用
禁用
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/enums/AdminRoleEnum.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/enums/AdminRoleEnum.java
index 4351d59c7..48b684f7f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/enums/AdminRoleEnum.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/enums/AdminRoleEnum.java
@@ -9,7 +9,8 @@ package com.fuint.common.enums;
public enum AdminRoleEnum {
ADMIN("1", "超级管理员","admin"),
COMMON("2", "普通管理员","common"),
- USER("3", "用户角色","user");
+ USER("3", "用户角色","user"),
+ STAFF("4", "员工角色","staff");
private String key;
private String name;
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/SourceService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/SourceService.java
index 80b80845a..610b9ff2a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/SourceService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/SourceService.java
@@ -23,6 +23,13 @@ public interface SourceService extends IService {
*/
List getAvailableSources(Integer merchantId);
+ /**
+ * 获取有效的菜单集合
+ *
+ * @return
+ */
+ List getAvailableSources1(Integer merchantId);
+
/**
* 获取菜单的属性结构
*
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 a54e323d2..50391d08c 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
@@ -2,8 +2,10 @@ package com.fuint.common.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.common.domain.TreeSelect;
+import com.fuint.common.dto.AccountInfo;
import com.fuint.common.enums.StatusEnum;
import com.fuint.common.service.SourceService;
+import com.fuint.common.util.TokenUtil;
import com.fuint.common.vo.MetaVo;
import com.fuint.common.vo.RouterVo;
import com.fuint.framework.annoation.OperationServiceLog;
@@ -42,6 +44,11 @@ public class SourceServiceImpl extends ServiceImpl imple
return tSourceMapper.findByStatus(merchantId, StatusEnum.ENABLED.getKey());
}
+ @Override
+ public List getAvailableSources1(Integer merchantId) {
+ return tSourceMapper.findByStatus1(merchantId, StatusEnum.ENABLED.getKey());
+ }
+
/**
* 获取菜单的属性结构
*
@@ -49,7 +56,9 @@ public class SourceServiceImpl extends ServiceImpl imple
*/
@Override
public List getSourceTree(Integer merchantId) {
+ AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
List tSources = getAvailableSources(merchantId);
+ if (nowAccountInfo.getRoleIds().equals("14")) tSources = getAvailableSources1(1);
List trees = new ArrayList<>();
if (tSources != null && tSources.size() > 0) {
TreeNode sourceTreeNode = null;
@@ -100,7 +109,7 @@ public class SourceServiceImpl extends ServiceImpl imple
@Override
public List getMenuListByUserId(Integer merchantId, Integer accountId) {
if (merchantId == null) {
- merchantId = 0;
+ merchantId = 1;
}
List sourceList = tSourceMapper.findSourcesByAccountId(merchantId, accountId);
return delRepeated(sourceList);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/controller/BackendDutyController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/controller/BackendDutyController.java
index aeef00c57..1a65deb25 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/controller/BackendDutyController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/controller/BackendDutyController.java
@@ -86,6 +86,7 @@ public class BackendDutyController extends BaseController {
}
paginationRequest.setSearchParams(searchParams);
+ paginationRequest.setRoleIds(accountInfo.getRoleIds());
PaginationResponse paginationResponse = tDutyService.findDutiesByPagination(paginationRequest);
List content = new ArrayList<>();
if (paginationResponse.getContent().size() > 0) {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/service/impl/DutyServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/service/impl/DutyServiceImpl.java
index 098e6d1fd..3dc3bd8bf 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/service/impl/DutyServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/service/impl/DutyServiceImpl.java
@@ -252,7 +252,17 @@ public class DutyServiceImpl extends ServiceImpl implements
}
lambdaQueryWrapper.orderByDesc(TDuty::getDutyId);
- List dataList = tDutyMapper.selectList(lambdaQueryWrapper);
+ List dataList1 = tDutyMapper.selectList(lambdaQueryWrapper);
+ List dataList = new ArrayList<>();
+ if (paginationRequest.getRoleIds().equals("14")){
+ for (TDuty tDuty : dataList1) {
+ if (tDuty.getDutyId()==12) dataList.add(tDuty);
+ if (tDuty.getDutyId()==15) dataList.add(tDuty);
+ if (tDuty.getDutyId()==16) dataList.add(tDuty);
+ }
+ }else {
+ dataList = dataList1;
+ }
PageRequest pageRequest = PageRequest.of(paginationRequest.getCurrentPage(), paginationRequest.getPageSize());
PageImpl pageImpl = new PageImpl(dataList, pageRequest, pageHelper.getTotal());
diff --git a/fuintBackend/fuint-framework/src/main/java/com/fuint/framework/pagination/PaginationRequest.java b/fuintBackend/fuint-framework/src/main/java/com/fuint/framework/pagination/PaginationRequest.java
index 65161724a..a01996266 100644
--- a/fuintBackend/fuint-framework/src/main/java/com/fuint/framework/pagination/PaginationRequest.java
+++ b/fuintBackend/fuint-framework/src/main/java/com/fuint/framework/pagination/PaginationRequest.java
@@ -1,5 +1,7 @@
package com.fuint.framework.pagination;
+import lombok.Data;
+
import java.io.Serializable;
import java.util.Map;
@@ -9,6 +11,7 @@ import java.util.Map;
* Created by FSQ
* CopyRight https://www.fuint.cn
*/
+@Data
public class PaginationRequest implements Serializable {
/** */
@@ -33,6 +36,10 @@ public class PaginationRequest implements Serializable {
* 分页查询参数
*/
private Map searchParams;
+ /**
+ * 角色id
+ */
+ private String roleIds;
public int getCurrentPage() {
return currentPage;
diff --git a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/TSourceMapper.java b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/TSourceMapper.java
index 3216d8799..bcfdcf77c 100644
--- a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/TSourceMapper.java
+++ b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/TSourceMapper.java
@@ -19,4 +19,6 @@ public interface TSourceMapper extends BaseMapper {
List findByStatus(@Param("merchantId") Integer merchantId, @Param("status") String status);
+ List findByStatus1(@Param("merchantId") Integer merchantId, @Param("status") String status);
+
}
diff --git a/fuintBackend/fuint-repository/src/main/resources/mapper/TSourceMapper.xml b/fuintBackend/fuint-repository/src/main/resources/mapper/TSourceMapper.xml
index ad9969ca6..f6438c152 100644
--- a/fuintBackend/fuint-repository/src/main/resources/mapper/TSourceMapper.xml
+++ b/fuintBackend/fuint-repository/src/main/resources/mapper/TSourceMapper.xml
@@ -2,7 +2,15 @@
order by source_style asc
+
From 55be54b4add15187083ca5da244200684f3a9685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Tue, 19 Mar 2024 09:38:34 +0800
Subject: [PATCH 5/8] bug
---
.../api/fuyou/controller/FyPayController.java | 6 +++---
.../controller/IntegralOrdersController.java | 4 ++--
.../integral/service/IntegralOrdersService.java | 4 ++--
.../service/impl/IntegralOrdersServiceImpl.java | 4 ++--
.../service/ActiveExchangeService.java | 2 +-
.../service/impl/ActiveExchangeServiceImpl.java | 2 +-
.../ActiveRecommendRecordsController.java | 2 +-
.../service/ActiveRecommendRecordsService.java | 2 +-
.../impl/ActiveRecommendRecordsServiceImpl.java | 2 +-
.../controller/CardFavorableRecordController.java | 4 ++--
.../cardFavorable/entity/CardFavorableRecord.java | 6 ++++++
.../service/CardFavorableRecordService.java | 6 +++---
.../impl/CardFavorableRecordServiceImpl.java | 15 ++++++++++++---
.../cardFavorable/vo/CardFavorableRecordVO.java | 6 ------
.../controller/CardValueRecordController.java | 4 ++--
.../cardValue/service/CardValueRecordService.java | 6 +++---
.../service/impl/CardValueRecordServiceImpl.java | 8 +++++---
.../order/controller/OilOrderController.java | 6 +++---
.../business/order/service/OilOrderService.java | 8 ++++----
.../order/service/impl/OilOrderServiceImpl.java | 8 ++++----
.../system/dept/controller/SysDeptController.java | 2 +-
21 files changed, 59 insertions(+), 48 deletions(-)
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/FyPayController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/FyPayController.java
index 676da0225..66100f40b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/FyPayController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/FyPayController.java
@@ -57,7 +57,7 @@ public class FyPayController {
// 接收支付平台异步通知的接口
@PostMapping("/notify")
- public String notifyUrl(HttpServletRequest request,HttpServletResponse response) throws UnsupportedEncodingException, JsonProcessingException {
+ public String notifyUrl(HttpServletRequest request,HttpServletResponse response) throws Exception {
System.out.println("----------------收到支付回调--------"+request.getParameter("req"));
String notifyData = request.getParameter("req");
String decode = URLDecoder.decode(notifyData, Const.charset);
@@ -96,7 +96,7 @@ public class FyPayController {
return "0";
}
}
- public void updateOrderStatus(String orderNo,String type) throws JsonProcessingException {
+ public void updateOrderStatus(String orderNo,String type) throws Exception {
if ("1".equals(type)) {
orderService.updateOrderStatus(orderNo,"paid");
}else if ("4".equals(type)) {
@@ -109,4 +109,4 @@ public class FyPayController {
cardFuelRecordService.fuleRechargeFinallDeal(orderNo);
}
}
-}
\ No newline at end of file
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java
index 03ea1b47e..cfa082b42 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java
@@ -152,13 +152,13 @@ public class IntegralOrdersController extends BaseController {
* @return
*/
@GetMapping("checkTheStatusOfYourPaymentByIntegral")
- public ResponseObject checkTheStatusOfYourPaymentByIntegral(@Param("orderNumber") String orderNumber) {
+ public ResponseObject checkTheStatusOfYourPaymentByIntegral(@Param("orderNumber") String orderNumber) throws Exception {
return getSuccessResult(this.integralOrdersService.checkTheStatusOfYourPaymentByIntegral(orderNumber));
}
@PostMapping("integralOrdersProcessingUni")
- public ResponseObject integralOrdersProcessingUni(@RequestBody IntegralOrdersRequest integralOrdersList) {
+ public ResponseObject integralOrdersProcessingUni(@RequestBody IntegralOrdersRequest integralOrdersList) throws Exception {
return getSuccessResult(this.integralOrdersService.integralOrdersProcessingUni(integralOrdersList));
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java
index 88334ab34..c332a680d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java
@@ -70,12 +70,12 @@ public interface IntegralOrdersService {
IntegralOrders integralOrdersProcessing(IntegralOrdersRequest integralOrdersList);
- IntegralOrders checkTheStatusOfYourPaymentByIntegral(String orderNO);
+ IntegralOrders checkTheStatusOfYourPaymentByIntegral(String orderNO) throws Exception;
int editPayStatus(String orderNumber, String payStates,Integer storeId);
- Map integralOrdersProcessingUni(IntegralOrdersRequest integralOrdersList);
+ Map integralOrdersProcessingUni(IntegralOrdersRequest integralOrdersList) throws Exception;
/**
* 查询是否领取到同一件商品领取了几件
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
index a78786162..e5fe2c10d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
@@ -308,7 +308,7 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
private RedisLock redisLock;
@Override
@Transactional
- public IntegralOrders checkTheStatusOfYourPaymentByIntegral(String orderNo) {
+ public IntegralOrders checkTheStatusOfYourPaymentByIntegral(String orderNo) throws Exception {
// AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
// 查询订单信息
@@ -439,7 +439,7 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
@Override
- public Map integralOrdersProcessingUni(IntegralOrdersRequest integralOrdersList) {
+ public Map integralOrdersProcessingUni(IntegralOrdersRequest integralOrdersList) throws Exception {
double epsilon = 1e-10; // 阈值
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/ActiveExchangeService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/ActiveExchangeService.java
index 7112ef183..7103fdbf5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/ActiveExchangeService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/ActiveExchangeService.java
@@ -61,5 +61,5 @@ public interface ActiveExchangeService {
* 消费有礼后续处理
* @param paymentActiveDTO
*/
- void activeConsumption(PaymentActiveDTO paymentActiveDTO);
+ void activeConsumption(PaymentActiveDTO paymentActiveDTO) throws Exception;
}
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 59839e0dc..a607fa7d7 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
@@ -983,7 +983,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
}
@Override
- public void activeConsumption (PaymentActiveDTO paymentActiveDTO){
+ public void activeConsumption (PaymentActiveDTO paymentActiveDTO) throws Exception {
//消费有礼
ArrayList activeConsumptionVOS1 = new ArrayList<>();
List activeConsumptionVOS = oilOrderMapper.selectActiveConsumption(paymentActiveDTO.getStoreId(), paymentActiveDTO.getAmount());
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/controller/ActiveRecommendRecordsController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/controller/ActiveRecommendRecordsController.java
index a6af53691..cdfd4ab02 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/controller/ActiveRecommendRecordsController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/controller/ActiveRecommendRecordsController.java
@@ -71,7 +71,7 @@ public class ActiveRecommendRecordsController extends BaseController {
* @return 新增结果
*/
@PostMapping
- public ResponseObject insert(@RequestBody ActiveRecommendRecordsDTO activeRecommendRecordsDTO) {
+ public ResponseObject insert(@RequestBody ActiveRecommendRecordsDTO activeRecommendRecordsDTO) throws Exception {
return getSuccessResult(this.activeRecommendRecordsService.add(activeRecommendRecordsDTO));
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/ActiveRecommendRecordsService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/ActiveRecommendRecordsService.java
index e03671f15..c4963d539 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/ActiveRecommendRecordsService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/ActiveRecommendRecordsService.java
@@ -33,6 +33,6 @@ public interface ActiveRecommendRecordsService extends IService {
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
+ //优惠金额
+ private Double discountAmount;
+ //满足金额
+ private Double satisfiedAmount;
+ //折扣抵消
+ private Double discountOffset;
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java
index ac50d7707..a2c0d388a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java
@@ -59,21 +59,21 @@ public interface CardFavorableRecordService extends IService queryWrapper = new LambdaQueryWrapper<>();
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/vo/CardFavorableRecordVO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/vo/CardFavorableRecordVO.java
index ac2635e2d..fa37a9f21 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/vo/CardFavorableRecordVO.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/vo/CardFavorableRecordVO.java
@@ -18,10 +18,6 @@ public class CardFavorableRecordVO extends CardFavorableRecord {
* 满减金额
*/
private double fullDeduction;
- /**
- * 优惠金额
- */
- private double discountAmount;
/**
* 优惠折扣
*/
@@ -43,8 +39,6 @@ public class CardFavorableRecordVO extends CardFavorableRecord {
private String oilName;
//优惠类型 0：满减券 1：折扣券
private String discountType;
- //满足金额
- private double satisfiedAmount;
//优惠券描述信息
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java
index c3d526fc8..e9fd63fb7 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java
@@ -141,7 +141,7 @@ public class CardValueRecordController extends BaseController {
* @return
*/
@GetMapping("checkTheStatusOfYourPayment")
- public ResponseObject checkTheStatusOfYourPayment(Integer id) {
+ public ResponseObject checkTheStatusOfYourPayment(Integer id) throws Exception {
return getSuccessResult(this.cardValueRecordService.checkTheStatusOfYourPayment(id));
}
@@ -196,7 +196,7 @@ public class CardValueRecordController extends BaseController {
* @return
*/
@GetMapping("/testCharge/{orderNo}")
- public void testCharge(@PathVariable String orderNo) {
+ public void testCharge(@PathVariable String orderNo) throws Exception {
this.cardValueRecordService.rechargeFinallDeal(orderNo);
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java
index af9bb3959..ffa32cdce 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java
@@ -49,7 +49,7 @@ public interface CardValueRecordService extends IService {
CardValueRecordDTO prepaidCardTopUp(CardValueRecordDTO cardValueRecordDTO);
- CardValueRecord checkTheStatusOfYourPayment(Integer id);
+ CardValueRecord checkTheStatusOfYourPayment(Integer id) throws Exception;
boolean editPayStatus(@Param("id") Integer id,@Param("payStates") String payStates);
@@ -60,7 +60,7 @@ public interface CardValueRecordService extends IService {
IPage selectAllRecord(@Param("page") Page page, CardValueRecordDTO cardValueRecord);
void export(HttpServletResponse response, CardValueRecord cardValueRecord);
- void rechargeFinallDeal(String orderNo);
+ void rechargeFinallDeal(String orderNo) throws Exception;
/**
* 修改订单状态信息
@@ -73,7 +73,7 @@ public interface CardValueRecordService extends IService {
* 会员等级优惠送券
* @param userId
*/
- void giveCoupon(Integer userId, Integer storeId, LJUserVo ljUserVos, LJStaff ljStaff);
+ void giveCoupon(Integer userId, Integer storeId, LJUserVo ljUserVos, LJStaff ljStaff) throws Exception;
/**
* 根据用户id查询当前的储值卡信息
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
index eebc2a63e..06a3c08ad 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
@@ -494,7 +494,7 @@ public class CardValueRecordServiceImpl extends ServiceImpl mtUserGradeChildren = userGradeChildService.selectListByUserId(userId,storeId);
if (CollectionUtils.isNotEmpty(mtUserGradeChildren)) {
for (MtUserGradeChild mtUserGradeChild : mtUserGradeChildren) {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java
index a16654b46..b07ec3e4a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java
@@ -98,7 +98,7 @@ public class OilOrderController extends BaseController {
* @return
*/
@PostMapping
- public ResponseObject add(@Validated @RequestBody Map map){
+ public ResponseObject add(@Validated @RequestBody Map map) throws Exception {
Map order = orderService.insertOilOrder(map);
return getSuccessResult(order);
}
@@ -120,7 +120,7 @@ public class OilOrderController extends BaseController {
* @return
*/
@PostMapping("/appletPay")
- public ResponseObject appletPay(@Validated @RequestBody Map map){
+ public ResponseObject appletPay(@Validated @RequestBody Map map) throws Exception {
return getSuccessResult(orderService.appletPay(map));
}
@@ -179,7 +179,7 @@ public class OilOrderController extends BaseController {
* @return
*/
@PostMapping("/orderStatus")
- public ResponseObject editStatus(@RequestBody Map map){
+ public ResponseObject editStatus(@RequestBody Map map) throws Exception {
String orderNo = map.get("orderNo");
String status = map.get("status");
return getSuccessResult(orderService.updateOrderStatus(orderNo,status));
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java
index a62034006..866aa5b09 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java
@@ -81,7 +81,7 @@ public interface OilOrderService extends IService {
* @param map
* @return
*/
- public Map insertOilOrder(Map map);
+ public Map insertOilOrder(Map map) throws Exception;
/**
* 消费有礼调用接口
@@ -93,7 +93,7 @@ public interface OilOrderService extends IService {
* @param orderAmount 订单金额
* @param oilId 油品id
*/
- void updateCardAndActiveById(Integer storeId,Integer userId,Integer activeId,Integer cardFavorableId,String type,Double orderAmount,Double payAmount,Integer oilId);
+ void updateCardAndActiveById(Integer storeId,Integer userId,Integer activeId,Integer cardFavorableId,String type,Double orderAmount,Double payAmount,Integer oilId) throws Exception;
/**
* 扫描小程序中二维码所处理的逻辑
@@ -112,7 +112,7 @@ public interface OilOrderService extends IService {
* 小程序订单支付
* @param map
*/
- public Map appletPay(Map map);
+ public Map appletPay(Map map) throws Exception;
/**
* 根据订单号修改订单支付状态
@@ -120,7 +120,7 @@ public interface OilOrderService extends IService {
* @param status
* @return
*/
- public int updateOrderStatus(String orderNo,String status);
+ public int updateOrderStatus(String orderNo,String status) throws Exception;
/**
* 添加油品跟踪信息
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
index d36bc67c3..db7be1759 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
@@ -243,7 +243,7 @@ public class OilOrderServiceImpl extends ServiceImpl i
}
@Override
- public Map insertOilOrder(Map map) {
+ public Map insertOilOrder(Map map) throws Exception {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
Integer storeId = nowAccountInfo.getStoreId();
// 油品订单信息
@@ -557,7 +557,7 @@ public class OilOrderServiceImpl extends ServiceImpl i
}
// 调用消费有礼接口
- public void updateCardAndActiveById(Integer storeId,Integer userId,Integer activeId,Integer cardFavorableId,String type,Double orderAmount,Double payAmount,Integer oilId){
+ public void updateCardAndActiveById(Integer storeId,Integer userId,Integer activeId,Integer cardFavorableId,String type,Double orderAmount,Double payAmount,Integer oilId) throws Exception {
if (ObjectUtil.isNotEmpty(userId)){
LJUserVo userVo = userService.queryUserById(userId, storeId);
PaymentActiveVO paymentActiveVO = new PaymentActiveVO();
@@ -1094,7 +1094,7 @@ public class OilOrderServiceImpl extends ServiceImpl i
}
@Override
- public Map appletPay(Map map) {
+ public Map appletPay(Map map) throws Exception {
String orderNo = map.get("orderNo");
// 支付金额
Double payAmount = Double.valueOf(map.get("payAmount"));
@@ -1307,7 +1307,7 @@ public class OilOrderServiceImpl extends ServiceImpl i
private CardValudChildrensService cardValudChildrensService;
@Override
- public int updateOrderStatus(String orderNo, String status) {
+ public int updateOrderStatus(String orderNo, String status) throws Exception {
int row = 0;
OilOrder oilOrder = this.selectOilOrderByOrderNo(orderNo);
Integer userId = oilOrder.getUserId();
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java
index 921526592..8a6a48f67 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java
@@ -29,7 +29,7 @@ import java.util.List;
/**
* 部门信息
- *
+ *
* @author ruoyi
*/
@RestController
From 6b7658eb898b3abeaf32273f0d0f8e15986ca2d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Tue, 19 Mar 2024 11:09:35 +0800
Subject: [PATCH 6/8] bug
---
.../fuint/business/order/controller/AllOrderInfoController.java | 2 +-
.../com/fuint/business/order/service/AllOrderInfoService.java | 2 +-
.../business/order/service/impl/AllOrderInfoServiceImpl.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
index abe68fe90..478638bcd 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
@@ -50,7 +50,7 @@ public class AllOrderInfoController extends BaseController {
* @return
*/
@PostMapping("/orderStatus")
- public ResponseObject editStatus(@RequestBody Map map){
+ public ResponseObject editStatus(@RequestBody Map map) throws Exception {
String orderNo = map.get("orderNo");
String status = map.get("status");
return getSuccessResult(allOrderInfoService.updateAllOrderInfoByOrderNo(orderNo,status));
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java
index c62a9f607..c0f3a2220 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java
@@ -52,7 +52,7 @@ public interface AllOrderInfoService {
* @param orderNo
* @return
*/
- public int updateAllOrderInfoByOrderNo(String orderNo,String status);
+ public int updateAllOrderInfoByOrderNo(String orderNo,String status) throws Exception;
public int refund(Map map);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
index 91e340cbf..9a20cb53b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
@@ -104,7 +104,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl
Date: Tue, 19 Mar 2024 15:35:46 +0800
Subject: [PATCH 7/8] bug
---
.../entity/CardFavorableRecord.java | 2 -
.../impl/CardFavorableRecordServiceImpl.java | 4 +-
.../impl/CardFavorableServiceImpl.java | 63 +++++++++++++++++--
3 files changed, 61 insertions(+), 8 deletions(-)
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/entity/CardFavorableRecord.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/entity/CardFavorableRecord.java
index df808db0f..ce12f792d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/entity/CardFavorableRecord.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/entity/CardFavorableRecord.java
@@ -62,7 +62,5 @@ public class CardFavorableRecord extends Model {
private Double discountAmount;
//满足金额
private Double satisfiedAmount;
- //折扣抵消
- private Double discountOffset;
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java
index 40b97b66b..af00732db 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java
@@ -245,11 +245,13 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl list = list(queryWrapper);
+ List list = cardFavorableRecordMapper.selectList(queryWrapper);
+ // List list = list(queryWrapper);
if (CollectionUtils.isEmpty(list) && CollectionUtils.isNotEmpty(list1) && list.size() list = cardFavorableRecordService.list(queryWrapper1);
- if (CollectionUtils.isNotEmpty(list)){
+ //只查询当天的数据
+ queryWrapper1.ge(CardFavorableRecord::getCreateTime, LocalDateTime.now().minusDays(1));
+ List list1= cardFavorableRecordService.list(queryWrapper1);
+ //所有领取列表的券ids
+ ArrayList carFavorbleRecordIds = new ArrayList<>();
+ //领取列表的券ids限领一张
+ ArrayList carFavorbleIds = new ArrayList<>();
+ ArrayList carFavorbleIds2 = new ArrayList<>();
+ //领取列表的券ids
+ ArrayList carFavorbleIds1 = new ArrayList<>();
+ for (CardFavorableRecord cardFavorableRecord : list) {
+ Integer cardFavorableId = cardFavorableRecord.getCardFavorableId();
+ carFavorbleRecordIds.add(cardFavorableId);
+ }
+ for (CardFavorable record : records) {
+ if (record.getClaimRule().equals("0")){
+ Integer id = record.getId();
+ carFavorbleIds.add(id);
+ }
+ }
+ //领取列表的券ids 减去 限领一张的
+ carFavorbleIds.removeAll(carFavorbleRecordIds);
+ for (Integer carFavorbleId : carFavorbleIds) {
+ CardFavorable one = getById(carFavorbleId);
+ cardFavorableArrayList.add(one);
+ }
+
+ for (CardFavorable record : records) {
+ if (record.getClaimRule().equals("1")){
+ Integer id = record.getId();
+ carFavorbleIds2.add(id);
+ }
+ }
+ //领取列表的券ids 减去 当前查询的券ids
+ carFavorbleIds2.removeAll(carFavorbleIds1);
+ for (Integer carFavorbleId : carFavorbleIds) {
+ CardFavorable one = getById(carFavorbleId);
+ cardFavorableArrayList.add(one);
+ }
+
+ //
+ //每人限领一张
+ /* if (CollectionUtils.isNotEmpty(list)){
for (CardFavorableRecord cardFavorableRecord : list) {
for (CardFavorable record : records) {
if(record.getClaimRule().equals("0") && !cardFavorableRecord.getCardFavorableId().equals(record.getId())){
CardFavorable one = getById(record.getId());
cardFavorableArrayList.add(one);
}
- if (record.getClaimRule().equals("1")){
- //查询当天有没有领取这张券
-
- }
}
}
}
+ //每人每日限领一张
+ if (CollectionUtils.isNotEmpty(list1)){
+ for (CardFavorableRecord cardFavorableRecord : list1) {
+ //
+ for (CardFavorable record : records) {
+ if(record.getClaimRule().equals("1") && !cardFavorableRecord.getCardFavorableId().equals(record.getId())){
+ CardFavorable one = getById(record.getId());
+ cardFavorableArrayList.add(one);
+ }
+ }
+ }
+ }*/
if (cardFavorableArrayList.size()>3){
List cardFavorables = cardFavorableArrayList.subList(0, 3);
page1.setRecords(cardFavorables);
+ }else {
+ page1.setRecords(cardFavorableArrayList);
}
return page1;
}
From 8b009c34d53e4ae37959a4e407cc698e108b62c2 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Wed, 20 Mar 2024 13:23:03 +0800
Subject: [PATCH 8/8] bug
---
fuintAdmin/src/api/duty/duty.js | 35 ++
fuintAdmin/src/api/system/menu.js | 5 +-
fuintAdmin/src/views/duty/index.vue | 361 +++++++++++++++++
fuintAdmin/src/views/staff/list.vue | 27 +-
.../views/staffCommission/staffCommission.vue | 31 +-
fuintAdmin/src/views/system/menu/index.vue | 7 +
fuintAdmin_zt/src/api/duty/duty.js | 35 ++
fuintAdmin_zt/src/api/system/menu.js | 5 +-
fuintAdmin_zt/src/views/Site/index.vue | 375 +++++++++++++++++-
.../src/views/components/Service/staff.vue | 31 +-
fuintAdmin_zt/src/views/system/menu/index.vue | 7 +
.../impl/MerchantConfigServiceImpl.java | 12 +-
.../impl/StaffCommissionServiceImpl.java | 2 +-
.../member/controller/LjDutyController.java | 33 +-
.../fuint/business/member/entity/LJStaff.java | 5 +
.../business/member/mapper/LJDutyMapper.java | 9 +
.../member/mapper/xml/LJDutyMapper.xml | 22 +
.../member/mapper/xml/LJStaffMapper.xml | 13 +-
.../member/service/ILJDutyService.java | 23 ++
.../service/impl/LJDutyServiceImpl.java | 52 +++
.../service/impl/AccountServiceImpl.java | 60 +--
.../service/impl/SourceServiceImpl.java | 7 +-
.../controller/BackendLoginController.java | 23 +-
.../controller/BackendSourceController.java | 7 +-
.../system/dept/service/ISysDeptService.java | 7 +
.../dept/service/impl/SysDeptServiceImpl.java | 14 +-
.../controller/BackendDutyController.java | 20 +-
.../com/fuint/system/role/entity/TDuty.java | 7 +-
.../system/role/mapper/xml/TDutyMapper.xml | 2 +-
.../role/service/impl/DutyServiceImpl.java | 22 +-
.../fuint/repository/model/TDutySource.java | 4 -
31 files changed, 1150 insertions(+), 113 deletions(-)
create mode 100644 fuintAdmin/src/api/duty/duty.js
create mode 100644 fuintAdmin/src/views/duty/index.vue
create mode 100644 fuintAdmin_zt/src/api/duty/duty.js
create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/xml/LJDutyMapper.xml
diff --git a/fuintAdmin/src/api/duty/duty.js b/fuintAdmin/src/api/duty/duty.js
new file mode 100644
index 000000000..a3ddc78e6
--- /dev/null
+++ b/fuintAdmin/src/api/duty/duty.js
@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+// 分页查询角色信息
+export function dutyList(query) {
+ return request({
+ url: '/business/member/duty',
+ method: 'get',
+ params: query
+ })
+}
+// 分页查询角色信息
+export function dutyLists(query) {
+ return request({
+ url: '/business/member/duty/dutys',
+ method: 'get',
+ params: query
+ })
+}
+
+// 根据id删除角色信息
+export function dutyDelete(id) {
+ return request({
+ url: '/business/member/duty/'+id,
+ method: 'delete',
+ })
+}
+
+// 根据id删除角色信息
+export function dutyEdit(data) {
+ return request({
+ url: '/business/member/duty',
+ method: 'put',
+ data: data
+ })
+}
diff --git a/fuintAdmin/src/api/system/menu.js b/fuintAdmin/src/api/system/menu.js
index 0c5dd3384..343d6ba8d 100644
--- a/fuintAdmin/src/api/system/menu.js
+++ b/fuintAdmin/src/api/system/menu.js
@@ -18,10 +18,11 @@ export function getMenu(menuId) {
}
// 查询菜单下拉树结构
-export function treeselect() {
+export function treeselect(params) {
return request({
url: 'backendApi/source/treeselect',
- method: 'get'
+ method: 'get',
+ params: params
})
}
diff --git a/fuintAdmin/src/views/duty/index.vue b/fuintAdmin/src/views/duty/index.vue
new file mode 100644
index 000000000..95934656b
--- /dev/null
+++ b/fuintAdmin/src/views/duty/index.vue
@@ -0,0 +1,361 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.description || "--"}}
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 启用
+ 禁用
+
+
+
+ 展开/折叠
+ 全选/全不选
+ 父子联动
+
+
+
+
+
+
+
+
+
请先为当前机构添加角色信息
@@ -533,6 +630,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 启用
+ 禁用
+
+
+
+ 展开/折叠
+ 全选/全不选
+ 父子联动
+
+
+
+
+
+
+
+
+
{
+ if (valid) {
+ if (this.form1.dutyId) {
+ this.form1.menuIds = this.getMenuAllCheckedKeys();
+ updateRole(this.form1).then(response => {
+ this.$modal.msgSuccess("修改成功");
+ this.openDuty = false;
+ this.getDutyList();
+ });
+ } else {
+ this.form1.storeId = this.queryParams1.storeId
+ this.form1.menuIds = this.getMenuAllCheckedKeys();
+ addRole(this.form1).then(response => {
+ this.$modal.msgSuccess("新增成功");
+ this.openDuty = false;
+ this.getDutyList();
+ });
+ }
+ }
+ });
+ },
+ // 所有菜单节点数据
+ getMenuAllCheckedKeys() {
+ // 目前被选中的菜单节点
+ let checkedKeys = this.$refs.menu.getCheckedKeys();
+ // 半选中的菜单节点
+ let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
+ checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
+ return checkedKeys;
+ },
+ // 树权限（展开/折叠）
+ handleCheckedTreeExpand(value, type) {
+ if (type == 'menu') {
+ let treeList = this.menuOptions;
+ for (let i = 0; i < treeList.length; i++) {
+ this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
+ }
+ }
+ },
+ // 树权限（全选/全不选）
+ handleCheckedTreeNodeAll(value, type) {
+ console.log(this.menuOptions)
+ if (type == 'menu') {
+ this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
+ }
+ },
+ // 树权限（父子联动）
+ handleCheckedTreeConnect(value, type) {
+ if (type == 'menu') {
+ this.form1.menuCheckStrictly = value ? true: false;
+ }
+ },
+ handleAdd1(){
+ this.reset1();
+ this.getMenuTreeselect(2);
+ this.form1.storeId = this.Thetree[0].id
+ this.openDuty = true;
+ this.title = "添加角色";
+ console.log(this.form1)
+ },
+ // 查询菜单树结构
+ getMenuTreeselect(merchantId) {
+ return menuTreeselect({merchantId:merchantId}).then(response => {
+ this.menuOptions = response.data;
+ return response
+ });
+ },
+ handleDelete1(row){
+ const roleIds = row.dutyName;
+ this.$modal.confirm('是否确认删除角色名为"' + roleIds + '"的信息？').then(function() {
+ return dutyDelete(row.dutyId);
+ }).then(() => {
+ this.getDutyList();
+ this.$modal.msgSuccess("删除成功");
+ }).catch(() => {});
+ },
+ handleUpdate1(data){
+ this.reset1();
+ let val = null;
+ if (data.dutyType == '3') val = 1;
+ if (data.dutyType == '4') val = 2;
+ const roleMenu = this.getMenuTreeselect(val);
+ const roleId = data.dutyId
+ getRole(roleId).then(response => {
+ this.form1.roleName = response.data.roleInfo.name;
+ this.form1.roleType = response.data.roleInfo.type;
+ this.form1.status = response.data.roleInfo.status;
+ this.form1.dutyId = response.data.roleInfo.id;
+ this.form1.description = response.data.roleInfo.description;
+ this.openDuty = true;
+ this.title = "修改角色";
+ let checkedKeys = response.data.checkedKeys
+
+ this.$nextTick(() => {
+ roleMenu.then(res => {
+ checkedKeys.forEach((v) => {
+ this.$nextTick(()=>{
+ this.$refs.menu.setChecked(v, true ,false);
+ })
+ })
+ });
+ });
+ });
+ },
+ handleStatusChangeDuty(data){
+ console.log(data)
+ dutyEdit(data).then(res => {
+ this.$message.success("修改成功")
+ this.getDutyList();
+ })
+ },
+ // 搜索角色信息
+ handleQuery1(){
+ this.queryParams1.page = 1;
+ this.getDutyList();
+ },
+ getDutyList(){
+ this.loading = true;
+ dutyList(this.queryParams1).then(res => {
+ this.dutyList = res.data.records;
+ this.total1 = res.data.total;
+ this.loading = false;
+ })
+ },
// 更改计费规则
async changeTheBillingRule(event) {
// 如果为修改时则进行提示
@@ -930,12 +1272,14 @@ export default {
// 点击树之后
this.queryParams.deptId = data.id
+ this.queryParams1.storeId = data.id
this.deptType = data.deptType
// 新增节点
this.appedit(data.id,data.label)
// 用户请求
// this.getList();
this.onlyGetUser()
+ this.getDutyList()
},
// 清除信息
@@ -1036,7 +1380,13 @@ export default {
// // this.$refs[formName].resetFields();
// },
handleClick(tab, event) {
-
+ console.log(this.activeName)
+ if (this.activeName=="list"){
+ this.onlyGetUser()
+ }
+ if (this.activeName=="duty"){
+ this.getDutyList()
+ }
},
//树形页操作
//新增树
@@ -1235,6 +1585,7 @@ export default {
if(this.Thetree.length>0 && !this.queryParams.deptId) {
this.queryParams.deptId = this.Thetree[0].id
this.form.deptType = this.Thetree[0].deptType
+ this.queryParams1.storeId = this.Thetree[0].id
console.log("this.Thetree",this.Thetree[0])
}
@@ -1408,6 +1759,12 @@ export default {
this.rolelist = res.data
})
},
+ // 获取角色信息
+ getRoleList1(storeId) {
+ dutyLists({storeId:storeId}).then(res => {
+ this.rolelist = res.data
+ })
+ },
/** 新增按钮操作 */
handleAdd() {
@@ -1420,7 +1777,8 @@ export default {
}else {
permissionType = 'system'
}
- this.getRoleList(permissionType);
+ // this.getRoleList(permissionType);
+ this.getRoleList1(this.queryParams1.storeId);
},
@@ -1452,7 +1810,8 @@ export default {
}else {
permissionType = 'system'
}
- this.getRoleList(permissionType);
+ // this.getRoleList(permissionType);
+ this.getRoleList1(row.deptId);
},
diff --git a/fuintAdmin_zt/src/views/components/Service/staff.vue b/fuintAdmin_zt/src/views/components/Service/staff.vue
index 94cd76dd5..8f6d3043b 100644
--- a/fuintAdmin_zt/src/views/components/Service/staff.vue
+++ b/fuintAdmin_zt/src/views/components/Service/staff.vue
@@ -59,11 +59,9 @@
-
+
- 油站站长
- 加油员
- 收银员
+ {{scope.row.dutyName || "--"}}
@@ -143,9 +141,12 @@
-
-
-
+
@@ -240,6 +241,7 @@