1、修复订单查询的bug

2、修复事件规则的缓存更新bug

citu-framework/citu-spring-boot-starter-security/src/main/java/com/citu/framework/security/core/util/SecurityFrameworkUtils.java

@@ -147,6 +147,23 @@ public class SecurityFrameworkUtils {
         return MapUtil.get(loginUser.getInfo(), LoginUser.INFO_KEY_DATA_ID, type);
     }
 
+    /**
+     * 获得当前用户的数据编号，从上下文中
+     *
+     * @return 部门编号
+     */
+    @Nullable
+    public static <T> T getLoginUserDataId2(Class<T> type) {
+        LoginUser loginUser = getLoginUser();
+        if (null == loginUser
+                || CollUtil.isEmpty(loginUser.getInfo())
+                || null == loginUser.getInfo()
+                || !loginUser.getInfo().containsKey(LoginUser.INFO_KEY_DATA_ID)) {
+           return null;
+        }
+        return MapUtil.get(loginUser.getInfo(), LoginUser.INFO_KEY_DATA_ID, type);
+    }
+
     /**
      * 设置当前用户
      *

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/controller/admin/currency/PayCurrencyRechargeController.java

@@ -1,21 +1,13 @@
 package com.citu.module.pay.controller.admin.currency;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import com.citu.framework.common.enums.UserTypeEnum;
 import com.citu.framework.common.pojo.CommonResult;
-import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.pay.api.notify.dto.PayOrderNotifyReqDTO;
 import com.citu.module.pay.api.notify.dto.PayRefundNotifyReqDTO;
 import com.citu.module.pay.controller.admin.currency.vo.recharge.PayCurrencyRechargePageReqVO;
 import com.citu.module.pay.controller.admin.currency.vo.recharge.PayCurrencyRechargeRespVO;
-import com.citu.module.pay.controller.admin.order.vo.PayOrderPageItemRespVO;
-import com.citu.module.pay.controller.admin.order.vo.PayOrderPageReqVO;
-import com.citu.module.pay.controller.app.currency.vo.recharge.AppPayCurrencyRechargeRespVO;
 import com.citu.module.pay.convert.currency.PayCurrencyRechargeConvert;
-import com.citu.module.pay.convert.order.PayOrderConvert;
-import com.citu.module.pay.dal.dataobject.app.PayAppDO;
 import com.citu.module.pay.dal.dataobject.currency.PayCurrencyRechargeDO;
 import com.citu.module.pay.dal.dataobject.order.PayOrderDO;
 import com.citu.module.pay.service.currency.PayCurrencyRechargeService;
@@ -31,15 +23,11 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.annotation.security.PermitAll;
 import javax.validation.Valid;
-
 import java.util.List;
-import java.util.Map;
 
 import static com.citu.framework.common.pojo.CommonResult.success;
 import static com.citu.framework.common.util.collection.CollectionUtils.convertList;
 import static com.citu.framework.common.util.servlet.ServletUtils.getClientIP;
-import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserDataId;
-import static com.citu.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
 
 @Tag(name = "管理后台 - 货币账户充值")
 @RestController

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/controller/app/currency/AppPayCurrencyRechargeController.java

@@ -1,12 +1,9 @@
 package com.citu.module.pay.controller.app.currency;
 
 import cn.hutool.core.collection.CollUtil;
-import com.citu.framework.common.enums.UserTypeEnum;
 import com.citu.framework.common.pojo.CommonResult;
-import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.pay.controller.admin.currency.vo.recharge.PayCurrencyRechargePageReqVO;
-import com.citu.module.pay.controller.admin.currency.vo.recharge.PayCurrencyRechargeRespVO;
 import com.citu.module.pay.controller.app.currency.vo.recharge.AppPayCurrencyRechargeCreateReqVO;
 import com.citu.module.pay.controller.app.currency.vo.recharge.AppPayCurrencyRechargeCreateRespVO;
 import com.citu.module.pay.controller.app.currency.vo.recharge.AppPayCurrencyRechargeRespVO;
@@ -18,7 +15,6 @@ import com.citu.module.pay.service.order.PayOrderService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -29,7 +25,7 @@ import java.util.List;
 import static com.citu.framework.common.pojo.CommonResult.success;
 import static com.citu.framework.common.util.collection.CollectionUtils.convertList;
 import static com.citu.framework.common.util.servlet.ServletUtils.getClientIP;
-import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserDataId;
+import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserDataId2;
 import static com.citu.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
 import static com.citu.framework.web.core.util.WebFrameworkUtils.getLoginUserType;
 
@@ -50,7 +46,7 @@ public class AppPayCurrencyRechargeController {
     public CommonResult<AppPayCurrencyRechargeCreateRespVO> createCurrencyRecharge(
             @Valid @RequestBody AppPayCurrencyRechargeCreateReqVO reqVO) {
         PayCurrencyRechargeDO currencyRecharge = currencyRechargeService.createCurrencyRecharge(
-                getLoginUserDataId(Long.class), getLoginUserId(), getLoginUserType(), getClientIP(), reqVO);
+                getLoginUserDataId2(Long.class), getLoginUserId(), getLoginUserType(), getClientIP(), reqVO);
         return success(PayCurrencyRechargeConvert.INSTANCE.convert(currencyRecharge));
     }
 
@@ -58,8 +54,11 @@ public class AppPayCurrencyRechargeController {
     @Operation(summary = "获得货币账户充值记录分页")
     public CommonResult<PageResult<AppPayCurrencyRechargeRespVO>> getCurrencyRechargePage(
             @Valid PayCurrencyRechargePageReqVO pageReqVO) {
-        PageResult<PayCurrencyRechargeDO> pageResult = currencyRechargeService
-                .getCurrencyRechargePackagePage(pageReqVO);
+        PageResult<PayCurrencyRechargeDO> pageResult = currencyRechargeService.getCurrencyRechargePackagePage(
+                        getLoginUserDataId2(Long.class),
+                        getLoginUserId(),
+                        getLoginUserType(),
+                        pageReqVO);
         if (CollUtil.isEmpty(pageResult.getList())) {
             return success(PageResult.empty(pageResult.getTotal()));
         }

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/service/currency/PayCurrencyRechargeService.java

@@ -40,6 +40,20 @@ public interface PayCurrencyRechargeService {
                                                                      PageParam pageReqVO, Boolean payStatus);
 
 
+    /**
+     * 获得货币账户充值记录分页
+     *
+     * @param dataId    绑定的数据编号
+     * @param userId    用户编号
+     * @param userType  用户类型
+     * @param reqVO    查询条件
+     * @return 货币账户充值记录分页
+     */
+    PageResult<PayCurrencyRechargeDO> getCurrencyRechargePackagePage(Long dataId,
+                                                                     Long userId,
+                                                                     Integer userType,
+                                                                     PayCurrencyRechargePageReqVO reqVO);
+
     /**
      * 获得货币账户充值记录分页
      *

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/service/currency/PayCurrencyRechargeServiceImpl.java

@@ -135,6 +135,16 @@ public class PayCurrencyRechargeServiceImpl implements PayCurrencyRechargeServic
         return currencyRechargeMapper.selectPage(pageReqVO, currency.getId(), payStatus);
     }
 
+    @Override
+    public PageResult<PayCurrencyRechargeDO> getCurrencyRechargePackagePage(Long dataId,
+                                                                            Long userId,
+                                                                            Integer userType,
+                                                                            PayCurrencyRechargePageReqVO reqVO) {
+        PayCurrencyDO currency = payCurrencyService.getOrCreateCurrency(dataId, userId, userType);
+        reqVO.setCurrencyId(currency.getId());
+        return currencyRechargeMapper.selectPage(reqVO);
+    }
+
     @Override
     public PageResult<PayCurrencyRechargeDO> getCurrencyRechargePackagePage(PayCurrencyRechargePageReqVO reqVO) {
         return currencyRechargeMapper.selectPage(reqVO);

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/service/config/PointRuleConfigServiceImpl.java

@@ -38,7 +38,7 @@ public class PointRuleConfigServiceImpl implements PointRuleConfigService {
     @DSTransactional
     @Caching(evict = {
             @CacheEvict(value = RedisKeyConstants.POINT_RULE_CONFIG, key = "#updateReqVO.url"),
-            @CacheEvict(value = RedisKeyConstants.POINT_RULE_CONFIG_LIST)
+            @CacheEvict(value = RedisKeyConstants.POINT_RULE_CONFIG_LIST, allEntries = true)
     })
     public Long createPointRuleConfig(PointRuleConfigSaveReqVO createReqVO) {
         // 插入
@@ -57,7 +57,7 @@ public class PointRuleConfigServiceImpl implements PointRuleConfigService {
     @DSTransactional
     @Caching(evict = {
             @CacheEvict(value = RedisKeyConstants.POINT_RULE_CONFIG, key = "#updateReqVO.url"),
-            @CacheEvict(value = RedisKeyConstants.POINT_RULE_CONFIG_LIST)
+            @CacheEvict(value = RedisKeyConstants.POINT_RULE_CONFIG_LIST, allEntries = true)
     })
     public void updatePointRuleConfig(PointRuleConfigSaveReqVO updateReqVO) {
         // 校验存在
@@ -76,7 +76,7 @@ public class PointRuleConfigServiceImpl implements PointRuleConfigService {
     @DSTransactional
     @Caching(evict = {
             @CacheEvict(value = RedisKeyConstants.POINT_RULE_CONFIG, key = "#id"),
-            @CacheEvict(value = RedisKeyConstants.POINT_RULE_CONFIG_LIST)
+            @CacheEvict(value = RedisKeyConstants.POINT_RULE_CONFIG_LIST, allEntries = true)
     })
     public void deletePointRuleConfig(Long id) {
         // 校验存在
@@ -129,7 +129,7 @@ public class PointRuleConfigServiceImpl implements PointRuleConfigService {
     @DSTransactional
     @Caching(evict = {
             @CacheEvict(value = RedisKeyConstants.POINT_RULE_CONFIG, allEntries = true),
-            @CacheEvict(value = RedisKeyConstants.POINT_RULE_CONFIG_LIST)
+            @CacheEvict(value = RedisKeyConstants.POINT_RULE_CONFIG_LIST, allEntries = true)
     })
     public boolean enable(List<Long> ids) {
         for (Long id : ids) {
@@ -147,7 +147,7 @@ public class PointRuleConfigServiceImpl implements PointRuleConfigService {
     @DSTransactional
     @Caching(evict = {
             @CacheEvict(value = RedisKeyConstants.POINT_RULE_CONFIG, allEntries = true),
-            @CacheEvict(value = RedisKeyConstants.POINT_RULE_CONFIG_LIST)
+            @CacheEvict(value = RedisKeyConstants.POINT_RULE_CONFIG_LIST, allEntries = true)
     })
     public boolean disable(List<Long> ids) {
         for (Long id : ids) {

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/order/TradeOrderServiceImpl.java

@@ -336,7 +336,8 @@ public class TradeOrderServiceImpl implements TradeOrderService {
     @Override
     public PageResult<AppRecruitTradeOrderRespVO> page(AppRecruitTradeOrderPageReqVO reqVO) {
         reqVO.setUserType(MdeUserTypeEnum.ENTERPRISE_USER.getType());
-        reqVO.setUserId(LoginUserContext.getEnterpriseId());
+        reqVO.setEnterpriseId(LoginUserContext.getEnterpriseId());
+        reqVO.setUserId(LoginUserContext.getUserId());
         return tradeOrderMapper.page(reqVO);
     }