diff --git a/yqzjCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java b/yqzjCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java index f001c79..98bd40e 100644 --- a/yqzjCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java +++ b/yqzjCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java @@ -7,7 +7,6 @@ import com.iformall.common.ErrorCode; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.base.BaseCUserEntity; import com.iformall.exception.MallinkException; -import com.iformall.service.CUserTokenService; import com.iformall.utils.HashUtil; import com.iformall.utils.RedisLock; import lombok.extern.slf4j.Slf4j; @@ -50,8 +49,6 @@ public class RedisCacheAspect { @Autowired RedisLock redisLock; - @Autowired - private CUserTokenService cUserTokenService; @Pointcut("@annotation(com.iformall.annotation.RedisCache)") public void cacheAspect() { @@ -72,16 +69,7 @@ public class RedisCacheAspect { //throw new MallinkException(ErrorCode.NET_TOKEN_EMPTY.getCode(),"token为空["+token+"]"); } log.info("token>>>>>>>>>>>>>>>"+token); - String tenantId; - BaseCUserEntity cUser = null ; - if(StringUtils.isNotBlank(token)) { - cUser = cUserTokenService.getByToken(token); - } - if (Objects.isNull(cUser) || cUser.getExpireTime().getTime() < System.currentTimeMillis()) { - tenantId = "0"; - } else { - tenantId = cUser.getTenantId(); - } + String tenantId = "1"; // 请求参数 Object[] args = jp.getArgs(); diff --git a/yqzjCApi/src/main/java/com/iformall/controller/BaseController.java b/yqzjCApi/src/main/java/com/iformall/controller/BaseController.java index 7c55b49..3b5644c 100644 --- a/yqzjCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/yqzjCApi/src/main/java/com/iformall/controller/BaseController.java @@ -57,15 +57,10 @@ public class BaseController { @Autowired private WxCUserBasicChildService wxCUserBasicChildService; - @Autowired - private CUserTokenService cUserTokenService; @Autowired private WxScoreRulesService wxScoreRulesService; - @Autowired - private MemCouponFromDspService memCouponFromDspService; - @Autowired @Qualifier("objectCommonRedisTemplate") diff --git a/yqzjCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/yqzjCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index ee7463f..3ebabc7 100644 --- a/yqzjCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/yqzjCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -11,7 +11,6 @@ import com.iformall.domain.po.WxMall; import com.iformall.domain.po.base.BaseCUserEntity; import com.iformall.domain.po.base.TenantEntity; import com.iformall.exception.MallinkException; -import com.iformall.service.CUserTokenService; import com.iformall.service.WxMallService; import com.iformall.utils.Constant; import org.apache.commons.lang3.StringUtils; @@ -32,8 +31,6 @@ import javax.servlet.http.HttpServletResponse; @Component public class AuthorizationInterceptor extends HandlerInterceptorAdapter { - @Autowired - private CUserTokenService cUserTokenService; @Autowired private WxMallService wxMallService; diff --git a/yqzjCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java b/yqzjCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java index 7d7394a..0579543 100644 --- a/yqzjCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java +++ b/yqzjCApi/src/main/java/com/iformall/resolver/LoginUserHandlerMethodArgumentResolver.java @@ -3,7 +3,6 @@ package com.iformall.resolver; import com.iformall.annotation.LoginUser; import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.base.BaseCUserEntity; -import com.iformall.service.CUserTokenService; import com.iformall.utils.Constant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.MethodParameter; diff --git a/yqzjService/src/main/java/com/iformall/service/CUserTokenService.java b/yqzjService/src/main/java/com/iformall/service/CUserTokenService.java deleted file mode 100644 index 52930d4..0000000 --- a/yqzjService/src/main/java/com/iformall/service/CUserTokenService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.iformall.service; - -import com.iformall.domain.po.base.BaseCUserEntity; - -public interface CUserTokenService { - - /** - * 根据token获得实体 - * - * @param token - * @return - */ - BaseCUserEntity getByToken(String token); - - void removeTokenCache(String token); - - void updateTokenCache(String token,Object updateCuser); - - -} diff --git a/yqzjService/src/main/java/com/iformall/service/DataTowerService.java b/yqzjService/src/main/java/com/iformall/service/DataTowerService.java deleted file mode 100644 index ae6deb2..0000000 --- a/yqzjService/src/main/java/com/iformall/service/DataTowerService.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.iformall.service; - -import com.iformall.common.ResultData; -import com.iformall.domain.po.base.TenantEntity; - -import java.util.Map; - -public interface DataTowerService { - - Map queryRunningMobile(TenantEntity tenantEntity); - - Map queryRunningPotal(TenantEntity tenantEntity); - - /** - * 把这个接口拆开 - * @param - * @return - */ -// Map queryRunning(TenantEntity tenantEntity); - Map queryOccupancyRate(TenantEntity tenantInfo); - Map queryRentCollectionRate(TenantEntity tenantInfo); - Map queryDeclarationRate(TenantEntity tenantInfo); - - Map queryCar(TenantEntity tenantEntity); - - Map queryCustomer(TenantEntity tenantEntity); - - Map queryCustomerNewVersion(TenantEntity tenantEntity); - - ResultData queryCustomerData(TenantEntity tenantEntity, Map params); - - ResultData queryWiWideDataUrl(TenantEntity tenantInfo, String url, Map params); - - byte[] getWiWidePic(TenantEntity tenantInfo, String type, String id); - - - -} diff --git a/yqzjService/src/main/java/com/iformall/service/MemCouponFromDspService.java b/yqzjService/src/main/java/com/iformall/service/MemCouponFromDspService.java deleted file mode 100644 index 5148c23..0000000 --- a/yqzjService/src/main/java/com/iformall/service/MemCouponFromDspService.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.iformall.service; - -import com.github.pagehelper.PageInfo; -import com.iformall.domain.po.MemCouponFromDsp; -import com.iformall.domain.po.base.TenantEntity; - -import java.util.List; - -public interface MemCouponFromDspService { - - /** - * 根据实体查询分页列表 - * - * @param record - * @param pageIndex - * @param pageSize - * @return - */ - PageInfo listAsPage(MemCouponFromDsp record, Integer pageIndex, Integer pageSize); - - List getList(MemCouponFromDsp record); - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - MemCouponFromDsp getById(Long id); - - /** - * 保存或更新实体 - * - * @param record - */ - void saveOrUpdate(MemCouponFromDsp record); - - /** - * 根据Id删除实体 - * - * @param id - */ - void deleteById(Long id); - - /** - * countByInfo - * @param record - * @return - */ - Integer countByInfo(MemCouponFromDsp record); - - /** - * 注券 - * @param record - * @return - */ - Integer couponOrder(MemCouponFromDsp record); - - /** - * 注券 - * @param tenantEntity - * @param phone - * @return - */ - void couponOrderFromDsp(TenantEntity tenantEntity, String phone); - -} diff --git a/yqzjService/src/main/java/com/iformall/service/ProductOrderSharingService.java b/yqzjService/src/main/java/com/iformall/service/ProductOrderSharingService.java deleted file mode 100644 index e7f9800..0000000 --- a/yqzjService/src/main/java/com/iformall/service/ProductOrderSharingService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.iformall.service; - -import com.github.pagehelper.PageInfo; -import com.iformall.domain.po.ProductOrderSharing; - -import java.util.List; - -public interface ProductOrderSharingService { - - /** - * 根据实体查询分页列表 - * - * @param record - * @param pageIndex - * @param pageSize - * @return - */ - PageInfo listAsPage(ProductOrderSharing record, Integer pageIndex, Integer pageSize); - - List findList(ProductOrderSharing record); - - void sharingOrder(Long id); - - void handleSharingOrder(Long id); -} diff --git a/yqzjService/src/main/java/com/iformall/service/SchemeService.java b/yqzjService/src/main/java/com/iformall/service/SchemeService.java deleted file mode 100644 index bdc2891..0000000 --- a/yqzjService/src/main/java/com/iformall/service/SchemeService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.iformall.service; - -import com.iformall.common.ResultData; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.enums.EnumAppPlat; -import com.iformall.enums.EnumProject; -import com.iformall.exception.MallinkException; -import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.RequestBody; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Map; - -@Service -public interface SchemeService { - - /** - * 获取scheme码 - * @param project - * @param plat - * @param pageUrl - * @param sceneParam - * @return - */ - ResultData generateScheme(EnumProject project,EnumAppPlat plat,String pageUrl, String sceneParam,Long expireTime); - -} diff --git a/yqzjService/src/main/java/com/iformall/service/WxCVideoService.java b/yqzjService/src/main/java/com/iformall/service/WxCVideoService.java deleted file mode 100644 index 84674f8..0000000 --- a/yqzjService/src/main/java/com/iformall/service/WxCVideoService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.iformall.service; - -import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCVideoTable; - -import java.util.Map; - -public interface WxCVideoService { - - - Map getById(Long userId) throws Exception; - - WxCVideoTable selectOne(Long id, long resource_id); -} diff --git a/yqzjService/src/main/java/com/iformall/service/WxCVoiceService.java b/yqzjService/src/main/java/com/iformall/service/WxCVoiceService.java deleted file mode 100644 index 4c11bc3..0000000 --- a/yqzjService/src/main/java/com/iformall/service/WxCVoiceService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.iformall.service; - -import com.iformall.common.ResultData; -import com.iformall.domain.po.sm.VoiceInfo; -import com.iformall.sm.AiPreviewParam; - -import java.util.List; -import java.util.Map; - -public interface WxCVoiceService { - - Map getById(Long userId); - - List chooseType(Long id); - - Map voicePreview(Long voiceId, String voiceStyle, String text, Integer speed); - -} diff --git a/yqzjService/src/main/java/com/iformall/service/WxCardSpendService.java b/yqzjService/src/main/java/com/iformall/service/WxCardSpendService.java deleted file mode 100644 index 8e4303c..0000000 --- a/yqzjService/src/main/java/com/iformall/service/WxCardSpendService.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.iformall.service; - -import com.github.pagehelper.PageInfo; -import com.iformall.common.ResultData; -import com.iformall.domain.po.*; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.vo.PromotionCalc; -import com.iformall.domain.vo.WxCardSpendVo; -import com.iformall.enums.EnumPayWay; -import com.iformall.exception.MallinkException; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - -public interface WxCardSpendService { - - /** - * - */ - WxCouponMerchant checkMerchantInCoupon(WxCardInfo cardInfo, Long merchantId); - - /** - * 创建卡花费 - * - * @param record - * @param order - * @return - */ - ResultData createCardSpend(WxCardSpend record, WxOrder order, WxCouponMerchant couponMerchant,EnumPayWay payWay); - - /** - * 根据实体查询分页列表 - * - * @param record - * @param pageIndex - * @param pageSize - * @return - */ - PageInfo listAsPage(WxCardSpendVo record, Integer pageIndex, Integer pageSize); - - /** - * 根据实体SUM - * - * @param record - * @return - */ - List> sumCardSpendForMerchant(WxCardSpendVo record); - - /** - * 根据实体SUM - * - * @param record - * @return - */ - List> sumCardSpendForOwner(WxCardSpendVo record); - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - WxCardSpend getById(Long id); - - /** - * 保存或更新实体 - * - * @param record - */ - void saveOrUpdate(WxCardSpend record); - - /** - * 更新实体 - * - * @param record - */ - void update(WxCardSpend record); - - /** - * 卡完结 - * - * @param cardInfo - */ - int finishCard(WxCardInfo cardInfo); - - /** - * 根据Id删除实体 - * - * @param id - */ - void deleteById(Long id); - - /** - * cardPay分账 - * @param tenantEntity - * @param orderId - * @param cardSpendId - */ - void shareForCardPay(TenantEntity tenantEntity, Long cardId, Long orderId, Long cardSpendId,Integer payWay); - - /** - * cardPay交易流水导出 - */ - void exportData(WxCardSpendVo wxCardSpendVo, HttpServletRequest request, HttpServletResponse response); - - /** - * POS 卡支付相关接口 - */ - WxCardSpend cardSpendForPosPrePay(WxCardSpend record) throws MallinkException; - WxCardInfo cardSpendForPosPrePayCancel(WxCardInfo cardInfo, WxCardSpend record) throws MallinkException; - WxCardSpend cardSpendForPosPay(PromotionCalc scoreCreditCalc, WxCardSpend record, WxMerchant merchant, WxMerchantBUser buUser,Integer payWay) throws MallinkException; - - Integer sumRealPayment(WxCardSpendVo wxCardSpend); -} diff --git a/yqzjService/src/main/java/com/iformall/service/WxChartDataService.java b/yqzjService/src/main/java/com/iformall/service/WxChartDataService.java deleted file mode 100644 index 73fa738..0000000 --- a/yqzjService/src/main/java/com/iformall/service/WxChartDataService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.iformall.service; - -import com.iformall.common.ResultData; -import com.iformall.domain.po.WxChartDataEntity; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.enums.EnumChartType; - -import java.util.Map; - -public interface WxChartDataService { - - /** - * 获取昨日, - * 近一周 - * @param - * @return - */ - ResultData queryWeekCount(EnumChartType chartType, TenantEntity tenantEntity); - - /** - * 获取周统计, - * 月统计 - * @param - * @return - */ - ResultData queryMonthVos(EnumChartType chartType, TenantEntity tenantEntity); - - ResultData queryData(Map params); - -} diff --git a/yqzjService/src/main/java/com/iformall/service/WxCouponInjectService.java b/yqzjService/src/main/java/com/iformall/service/WxCouponInjectService.java deleted file mode 100644 index 60e8e43..0000000 --- a/yqzjService/src/main/java/com/iformall/service/WxCouponInjectService.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.iformall.service; - -import com.github.pagehelper.PageInfo; -import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCouponInject; - -public interface WxCouponInjectService { - - /** - * 根据实体查询分页列表 - * - * @param record - * @param offset - * @param limit - * @return - */ - PageInfo listAsPage(WxCouponInject record, Integer pageIndex, Integer pageSize); - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - WxCouponInject getById(Long id); - - /** - * 保存或更新实体 - * - * @param record - */ - void saveOrUpdate(WxCouponInject record); - - /** - * 根据Id删除实体 - * - * @param id - */ - void deleteById(Long id); - /** - * 精准投(立即投送处理) - * - * @param id - */ - ResultData add(WxCouponInject record); - - - - - - - - -} diff --git a/yqzjService/src/main/java/com/iformall/service/WxCouponSendService.java b/yqzjService/src/main/java/com/iformall/service/WxCouponSendService.java deleted file mode 100644 index 386316a..0000000 --- a/yqzjService/src/main/java/com/iformall/service/WxCouponSendService.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.iformall.service; - -import java.util.List; - -import com.github.pagehelper.PageInfo; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.po.WxCouponSend; -import com.iformall.domain.vo.WxCouponSendVo; -import com.iformall.enums.EnumCouponSendSendType; -import com.iformall.enums.EnumPayVersion; -import com.iformall.enums.EnumPayWay; - -public interface WxCouponSendService { - - /** - * 根据实体查询分页列表 - * - * @param record - * @param pageIndex - * @param pageSize - * @return - */ - PageInfo listAsPage(WxCouponSend record, Integer pageIndex, Integer pageSize); - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - WxCouponSend getById(Long id,String tenantId); - - /** - * 保存或更新实体 - * - * @param record - */ - void saveOrUpdate(WxCouponSend record); - - /** - * 更新为无效 - * @param record - */ - void updateInvalid(WxCouponSend record) ; - - /** - * 根据Id删除实体 - * - * @param id - */ - void deleteById(Long id,String tenantId); - - /** - *停车或核销给用户注入卡券 - * @param tenantId - * @param cUserId - * @param type 2:停车发券 3:核销发券 - */ - boolean sendCouponToUser(EnumCouponSendSendType type, Object param,EnumPayWay payWay,EnumPayVersion payVersion); - - void updateStatusByCouponId(Long couponId, TenantEntity tenantEntity, int status); - - /** - * 添加或更新生日券配置 - * @param beforeDays - * @param sendType - * @param tenantEntity - */ - void saveOrUpdateConfig(Integer beforeDays, Integer sendType, TenantEntity tenantEntity) ; - /** - * 获取生日券配置 - * @param sendType - * @param tenantEntity - * @return - */ - WxCouponSend getConfig(Integer sendType,TenantEntity tenantEntity) ; - - /** - * 商户注券 库存减少 - * - * @param id 券ID - * @param merchantRemain 当前库存 - * @param merchantSend 当前已发 - * @param number 减少数量 - */ - void reduceMerchantSend(String tenantId,Long id, Integer merchantRemain, Integer merchantSend ,Integer number); - - /** - * 商户注券 库存退回 - * - * @param id 券ID - * @param merchantRemain 当前库存 - * @param merchantSend 当前已发 - * @param number 回退数量 - */ - void backMerchantRemainInventory(String tenantId,Long id, Integer merchantRemain, Integer merchantSend ,Integer number); - - /** - * - * @param wxCouponSend - */ - void handSel(WxCouponSend wxCouponSend,Long cUserId,EnumPayWay payWay,EnumPayVersion payVersion,Long merchantId,Long bUserId) ; - - - List findListVo(WxCouponSend record); - - -} diff --git a/yqzjService/src/main/java/com/iformall/service/WxScreenAdService.java b/yqzjService/src/main/java/com/iformall/service/WxScreenAdService.java deleted file mode 100644 index dfcc1a7..0000000 --- a/yqzjService/src/main/java/com/iformall/service/WxScreenAdService.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.iformall.service; - - -import com.github.pagehelper.PageInfo; -import com.iformall.common.ResultData; -import com.iformall.domain.po.base.TenantEntity; -import com.iformall.domain.po.WxScreenAd; - -import java.util.List; - -public interface WxScreenAdService { - - - - /** - * 根据实体查询分页列表 - * - * @param record - * @param pageIndex - * @param pageSize - * @return - */ - PageInfo listAsPage(WxScreenAd record, Integer pageIndex, Integer pageSize); - - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - WxScreenAd getById(Long id); - - /** - * 保存或更新实体 - * - * @param record - */ - ResultData saveOrUpdate(WxScreenAd record); - - - /** - * 根据Id删除实体 - * - * @param id - */ - void deleteById(Long id); - - - /** - * 根据实体查询分页列表 - * - * @param record - * @return - */ - List findList(WxScreenAd record); - - - - void updateStatusByCouponChannelId(Long couponChannelId, TenantEntity tenantEntity, int status); - - void updateStatusByCouponId(Long couponId, TenantEntity tenantEntity, int status); -}