From bede8ddcd2d2eb8cfa1c8221642f5e0109c2854b Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 21 Sep 2019 15:51:10 +0800 Subject: [PATCH] =?UTF-8?q?[B=E7=AB=AF][=E4=BF=AE=E6=94=B9][=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E4=BE=8B=E5=A6=82=E7=94=A8=E6=88=B7ID]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/config/RedisConfig.java | 22 +++++++++++++++---- .../controller/WxCouponOrderController.java | 5 ++--- .../WxMerchantTradeDailyController.java | 8 +++---- .../controller/WxMicroPayController.java | 2 +- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/config/RedisConfig.java b/mallinkBApi/src/main/java/com/iformall/config/RedisConfig.java index 7e167a93e..4de091e49 100644 --- a/mallinkBApi/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkBApi/src/main/java/com/iformall/config/RedisConfig.java @@ -1,9 +1,6 @@ package com.iformall.config; -import com.iformall.domain.po.PushLimit; -import com.iformall.domain.po.WxCUser; -import com.iformall.domain.po.WxMall; -import com.iformall.domain.po.WxScoreRules; +import com.iformall.domain.po.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.CacheManager; @@ -122,4 +119,21 @@ public class RedisConfig extends CachingConfigurerSupport { return template; } + @Bean("buserTokenRedisTemplate") + public RedisTemplate getBuserTokenRedisTemplate(RedisConnectionFactory connectionFactory) { + RedisTemplate template = new RedisTemplate(); + + Jackson2JsonRedisSerializer j = new Jackson2JsonRedisSerializer(WxBuser.class); + // value值的序列化 + template.setValueSerializer(j); + template.setHashKeySerializer(j); + + // key的序列化 + template.setKeySerializer(new StringRedisSerializer()); + template.setHashKeySerializer(new StringRedisSerializer()); + + template.setConnectionFactory(connectionFactory); + return template; + } + } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 78592c3ad..aefb7f881 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -7,7 +7,6 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxCouponOrder; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.vo.WxCouponOrderCVo; -import com.iformall.enums.EnumCouponVerifyType; import com.iformall.exception.MallinkException; import com.iformall.service.WxCouponOrderService; import com.iformall.service.WxMerchantBUserService; @@ -146,9 +145,9 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); } - WxMerchantBUser wxMerchantBUser = wxMerchantBUserService.getById(getUserId()); + WxMerchantBUser wxMerchantBUser = wxMerchantBUserService.getById(getUser().getId()); if (wxMerchantBUser == null) { - logger.error("核销员ID不存在:" + getUserId()); + logger.error("核销员ID不存在:" + getUser().getId()); throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "核销员ID不存在或者无权限"); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java index e33694f51..de77872a7 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java @@ -83,7 +83,7 @@ public class WxMerchantTradeDailyController extends BaseController { wxMerchantTradeDaily.setTradeAmt(Double.parseDouble(wxMerchantTradeDaily.getTradeAmt())*100 +""); } - WxMerchantBUser user = wxMerchantBUserService.getById(getUserId()); + WxMerchantBUser user = wxMerchantBUserService.getById(getUser().getId()); if (user==null) return new ResultData(ErrorCode.USER_IS_EMPTY); WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); @@ -104,9 +104,9 @@ public class WxMerchantTradeDailyController extends BaseController { } } - wxMerchantTradeDaily.setbUserId(getUserId()); + wxMerchantTradeDaily.setbUserId(getUser().getId()); logger.info("1------------------------------------" + wxMerchantTradeDaily.getbUserId()); - wxMerchantTradeDaily.setBUserId(getUserId()); + wxMerchantTradeDaily.setBUserId(getUser().getId()); logger.info("2------------------------------------" + wxMerchantTradeDaily.getBUserId()); wxMerchantTradeDailyService.saveOrUpdate(wxMerchantTradeDaily); return new ResultData(); @@ -127,7 +127,7 @@ public class WxMerchantTradeDailyController extends BaseController { SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); //根据userid查询merchantId - WxMerchantBUser user = wxMerchantBUserService.getById(getUserId()); + WxMerchantBUser user = wxMerchantBUserService.getById(getUser().getId()); if (user==null) return new ResultData(ErrorCode.USER_IS_EMPTY); WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java index 13941cbe1..a11545936 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java @@ -193,7 +193,7 @@ public class WxMicroPayController extends BaseController { record.setTenantId(getTenantId()); record.setId(payOrderId); record.setPayOrderNo(payOrderIdStr); - record.setBUserId(getUserId()); + record.setBUserId(getUser().getId()); record.setOrderId(orderId); try {