From 93bdd437f0f65bd92bb1ed5c7e69288ea11ff6ac Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Tue, 25 Sep 2018 13:21:30 +0800 Subject: [PATCH] =?UTF-8?q?[Logger=E9=87=8D=E6=95=B4][=E9=87=8D=E6=95=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/config/RedisConfig.java | 10 +- .../java/com/iformall/config/ShiroConfig.java | 2 +- .../controller/WxMsgSignatureController.java | 7 +- .../iformall/controller/WxPayController.java | 2 +- .../schedule/CouponExpiringSchedule.java | 7 +- .../schedule/CouponOrderExpiringSchedule.java | 6 +- .../schedule/DaliyAmountSchedule.java | 6 +- .../iformall/schedule/MsgSendingSchedule.java | 5 +- .../schedule/OrderExpiringSchedule.java | 6 +- .../iformall/schedule/WxAppVisitSchedule.java | 6 +- .../service/impl/CouponInjectServiceImpl.java | 6 +- .../service/impl/DataTowerServiceImpl.java | 5 +- .../impl/MallPermissionServiceImpl.java | 3 + .../impl/MallRolePermissionServiceImpl.java | 4 + .../service/impl/MallRoleServiceImpl.java | 3 + .../service/impl/MallUserRoleServiceImpl.java | 3 + .../impl/MarkingDataReportServiceImpl.java | 4 +- .../service/impl/PushLimitServiceImpl.java | 3 + .../service/impl/WxAdminLogServiceImpl.java | 3 + .../service/impl/WxAppinfoServiceImpl.java | 3 + .../service/impl/WxBLogServiceImpl.java | 3 + .../service/impl/WxBillRentServiceImpl.java | 3 + .../service/impl/WxBusinessServiceImpl.java | 3 + .../service/impl/WxCLogServiceImpl.java | 3 + .../service/impl/WxCUserCarServiceImpl.java | 3 + .../service/impl/WxCUserServiceImpl.java | 3 + .../service/impl/WxCUserTagsServiceImpl.java | 3 + .../service/impl/WxCampaignServiceImpl.java | 3 + .../service/impl/WxCarCmdLogServiceImpl.java | 3 + .../service/impl/WxChannelServiceImpl.java | 3 + .../impl/WxCouponActionLogServiceImpl.java | 3 + .../service/impl/WxCouponCarServiceImpl.java | 3 + .../impl/WxCouponChannelServiceImpl.java | 6 +- .../impl/WxCouponOrderServiceImpl.java | 5 +- .../service/impl/WxCouponSendServiceImpl.java | 3 + .../service/impl/WxCouponServiceImpl.java | 3 + .../impl/WxCouponSpreadServiceImpl.java | 3 + .../service/impl/WxCouponTypeServiceImpl.java | 3 + .../impl/WxDateAmountRecordServiceImpl.java | 3 + .../service/impl/WxGroupServiceImpl.java | 3 + .../impl/WxLevelConfigServiceImpl.java | 3 + .../service/impl/WxMallApplyServiceImpl.java | 3 + .../impl/WxMallBuildingServiceImpl.java | 3 + .../service/impl/WxMallConfigServiceImpl.java | 3 + .../service/impl/WxMallFloorServiceImpl.java | 3 + .../service/impl/WxMallServiceImpl.java | 3 + .../impl/WxMerchantBUserServiceImpl.java | 25 ++--- .../service/impl/WxMerchantServiceImpl.java | 3 + .../impl/WxMerchantShopServiceImpl.java | 3 + .../impl/WxMerchantTradeDailyServiceImpl.java | 3 + .../impl/WxMsgCallbackServiceImpl.java | 3 + .../service/impl/WxMsgConfigServiceImpl.java | 3 + .../service/impl/WxMsgModelServiceImpl.java | 3 + .../service/impl/WxMsgServiceImpl.java | 3 + .../impl/WxMsgSignatureServiceImpl.java | 3 + .../WxMsgValidationcodeModelServiceImpl.java | 3 + .../impl/WxMsgValidationcodeServiceImpl.java | 7 +- .../service/impl/WxOrderServiceImpl.java | 5 +- .../service/impl/WxParkServiceImpl.java | 3 + .../service/impl/WxPayAccountServiceImpl.java | 3 + .../service/impl/WxPayOrderServiceImpl.java | 45 +++++---- .../impl/WxProfitSharingOrderServiceImpl.java | 5 +- .../WxProfitSharingReceiverServiceImpl.java | 38 ++++---- .../WxProfitSharingResultServiceImpl.java | 3 + .../impl/WxRefundOrderServiceImpl.java | 97 ++++++++++--------- .../impl/WxRentContractServiceImpl.java | 3 + .../impl/WxScoreHistoryServiceImpl.java | 3 + .../service/impl/WxScoreRulesServiceImpl.java | 3 + .../WxScoreValidityPeriodServiceImpl.java | 3 + .../service/impl/WxShopServiceImpl.java | 3 + .../service/impl/WxTagsServiceImpl.java | 3 + .../impl/WxTemplateMsgServiceImpl.java | 3 + .../impl/WxUserChannelServiceImpl.java | 3 + .../service/impl/WxUserCouponServiceImpl.java | 3 + .../service/impl/WxUserVisitServiceImpl.java | 3 + .../java/com/iformall/utils/RedisLock.java | 5 +- 76 files changed, 325 insertions(+), 145 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java index 3b02c7c73..db0c20110 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java @@ -1,6 +1,7 @@ package com.iformall.config; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.cache.annotation.CachingConfigurerSupport; import org.springframework.cache.annotation.EnableCaching; @@ -15,6 +16,9 @@ import redis.clients.jedis.JedisPoolConfig; @Configuration @EnableCaching public class RedisConfig extends CachingConfigurerSupport { + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Value("${spring.redis.host}") private String host; @@ -35,8 +39,8 @@ public class RedisConfig extends CachingConfigurerSupport { @Bean public JedisPool redisPoolFactory() { - Logger.getLogger(getClass()).info("JedisPool注入成功!!"); - Logger.getLogger(getClass()).info("redis地址:" + host + ":" + port); + logger.info("JedisPool注入成功!!"); + logger.info("redis地址:" + host + ":" + port); JedisPoolConfig jedisPoolConfig = new JedisPoolConfig(); jedisPoolConfig.setMaxIdle(maxIdle); jedisPoolConfig.setMaxWaitMillis(maxWaitMillis); diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java index be13a5ce2..44a140a5a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -208,7 +208,7 @@ public class ShiroConfig { RedisManager redisManager = new RedisManager(); redisManager.setHost(host); redisManager.setPort(port); - redisManager.setExpire(expire);// 配置缓存过期时间 + //redisManager.setExpire(expire);// 配置缓存过期时间 redisManager.setTimeout(timeout); redisManager.setPassword(password); return redisManager; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgSignatureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgSignatureController.java index e2c45253b..61c96cea5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgSignatureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgSignatureController.java @@ -8,18 +8,19 @@ import com.iformall.service.WxMsgSignatureService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxMsgSignature") public class WxMsgSignatureController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired private WxMsgSignatureService wxMsgSignatureService; - private Logger logger = Logger.getLogger(WxMsgSignatureController.class); - @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxPayController.java index 825956c60..39ad435ac 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxPayController.java @@ -9,7 +9,7 @@ import com.iformall.service.WxProfitSharingOrderService; import com.iformall.service.WxRefundOrderService; import com.iformall.utils.XmlUtil; import org.apache.commons.io.IOUtils; -import org.jdom.JDOMException; +import org.jdom2.JDOMException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.MediaType; diff --git a/mallinkAdmin/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java b/mallinkAdmin/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java index 675792210..a0af0f569 100644 --- a/mallinkAdmin/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java +++ b/mallinkAdmin/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java @@ -1,7 +1,8 @@ package com.iformall.schedule; import com.iformall.mapper.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -11,14 +12,12 @@ import org.springframework.transaction.annotation.Transactional; @Component public class CouponExpiringSchedule { - private final Logger logger = Logger.getLogger(CouponExpiringSchedule.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxCouponChannelMapper wxCouponChannelMapper; - - @Scheduled(cron = "0 5 0 * * ?") // 每天凌晨00:05 //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) diff --git a/mallinkAdmin/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java b/mallinkAdmin/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java index b87032507..850ba0cd3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java +++ b/mallinkAdmin/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java @@ -7,7 +7,8 @@ import com.iformall.enums.EnumRefundWay; import com.iformall.mapper.*; import com.iformall.service.WxPayOrderService; import com.iformall.service.WxRefundOrderService; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -18,8 +19,7 @@ import java.util.List; @Component public class CouponOrderExpiringSchedule { - - private final Logger logger = Logger.getLogger(CouponOrderExpiringSchedule.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired diff --git a/mallinkAdmin/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java b/mallinkAdmin/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java index b567a3a07..ffdcbee70 100644 --- a/mallinkAdmin/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java +++ b/mallinkAdmin/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java @@ -8,7 +8,8 @@ import com.iformall.domain.po.WxMerchant; import com.iformall.enums.EnumDateAmtType; import com.iformall.mapper.*; import com.iformall.service.WxDateAmountRecordService; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -21,8 +22,7 @@ import java.util.*; @Component public class DaliyAmountSchedule { - - private final Logger logger = Logger.getLogger(DaliyAmountSchedule.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired diff --git a/mallinkAdmin/src/main/java/com/iformall/schedule/MsgSendingSchedule.java b/mallinkAdmin/src/main/java/com/iformall/schedule/MsgSendingSchedule.java index 2ad56daac..fe4de06ae 100644 --- a/mallinkAdmin/src/main/java/com/iformall/schedule/MsgSendingSchedule.java +++ b/mallinkAdmin/src/main/java/com/iformall/schedule/MsgSendingSchedule.java @@ -6,7 +6,8 @@ import com.iformall.domain.po.WxMsgConfig; import com.iformall.mapper.WxMsgConfigMapper; import com.iformall.mapper.WxMsgMapper; import com.iformall.utils.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -16,7 +17,7 @@ import java.util.*; @Component public class MsgSendingSchedule { - private final Logger logger = Logger.getLogger(MsgSendingSchedule.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxMsgMapper wxMsgMapper; diff --git a/mallinkAdmin/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java b/mallinkAdmin/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java index ea3131a4a..5daee43af 100644 --- a/mallinkAdmin/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkAdmin/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -4,7 +4,8 @@ import com.iformall.domain.po.WxOrder; import com.iformall.enums.EnumOrderStatus; import com.iformall.mapper.WxOrderMapper; import com.iformall.service.WxOrderService; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -18,8 +19,7 @@ import java.util.Map; @Component public class OrderExpiringSchedule { - - private final Logger logger = Logger.getLogger(OrderExpiringSchedule.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final int TIME_OUT_VALUE = 15 * 60 * 1000; //15分钟 diff --git a/mallinkAdmin/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java b/mallinkAdmin/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java index 957215c2c..272ba4208 100644 --- a/mallinkAdmin/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java +++ b/mallinkAdmin/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java @@ -7,7 +7,8 @@ import java.util.HashMap; import java.util.Map; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; @@ -29,8 +30,7 @@ import com.iformall.service.WxUserVisitService; @Component public class WxAppVisitSchedule { - - private Logger logger = Logger.getLogger(WxAppVisitSchedule.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); private static String visit = "https://api.weixin.qq.com/datacube/getweanalysisappiddailyvisittrend?access_token="; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/CouponInjectServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/CouponInjectServiceImpl.java index 9ec31ef1e..d24c8642d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/CouponInjectServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/CouponInjectServiceImpl.java @@ -5,14 +5,14 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; -import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.enums.*; import com.iformall.mapper.CouponInjectMapper; import com.iformall.service.*; import org.apache.commons.lang3.time.DateUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,6 +22,7 @@ import java.util.List; @Service public class CouponInjectServiceImpl implements CouponInjectService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired CouponInjectMapper couponInjectMapper; @@ -33,7 +34,6 @@ public class CouponInjectServiceImpl implements CouponInjectService { WxCUserTagsService wxCUserTagsService; @Autowired WxCouponActionLogService wxCouponActionLogService; - private Logger logger = Logger.getLogger(getClass()); @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index 714a8f575..2b064c4a4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -12,8 +12,9 @@ import com.iformall.service.DataTowerService; import com.iformall.utils.DateUtils; import com.iformall.utils.HashUtil; import com.iformall.utils.HttpUtil; -import org.apache.log4j.Logger; import org.apache.shiro.codec.Base64; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,7 +26,7 @@ import java.util.stream.Collectors; @Service public class DataTowerServiceImpl implements DataTowerService { - private Logger logger = Logger.getLogger(getClass()); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxShopMapper wxShopMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java index 899de7612..e9a931811 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java @@ -6,6 +6,8 @@ import com.iformall.common.IdWorker; import com.iformall.domain.po.MallPermission; import com.iformall.mapper.MallPermissionMapper; import com.iformall.service.MallPermissionService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -13,6 +15,7 @@ import java.util.List; @Service public class MallPermissionServiceImpl implements MallPermissionService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired MallPermissionMapper mallPermissionMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java index 661f181f2..a4f370b0c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java @@ -6,11 +6,15 @@ import com.iformall.common.IdWorker; import com.iformall.domain.po.MallRolePermission; import com.iformall.mapper.MallRolePermissionMapper; import com.iformall.service.MallRolePermissionService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service public class MallRolePermissionServiceImpl implements MallRolePermissionService { + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired MallRolePermissionMapper mallUserRolePermissionMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallRoleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallRoleServiceImpl.java index 57e31c4dd..8de8fb823 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallRoleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallRoleServiceImpl.java @@ -6,6 +6,8 @@ import com.iformall.common.IdWorker; import com.iformall.domain.po.MallRole; import com.iformall.mapper.MallRoleMapper; import com.iformall.service.MallRoleService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,6 +17,7 @@ import java.util.Map; @Service public class MallRoleServiceImpl implements MallRoleService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired MallRoleMapper mallRoleMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java index 5a85d2621..8b3e9caa6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java @@ -6,6 +6,8 @@ import com.iformall.common.IdWorker; import com.iformall.domain.po.MallUserRole; import com.iformall.mapper.MallUserRoleMapper; import com.iformall.service.MallUserRoleService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -13,6 +15,7 @@ import java.util.List; @Service public class MallUserRoleServiceImpl implements MallUserRoleService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired MallUserRoleMapper mallUserRoleMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java index 90df9bb98..f9052feee 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -11,6 +11,8 @@ import com.iformall.domain.vo.TouchUsersReportVo; import com.iformall.enums.EnumCouponType; import com.iformall.mapper.*; import com.iformall.service.MarkingDataReportService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,7 +25,7 @@ import java.util.stream.Collectors; */ @Service public class MarkingDataReportServiceImpl implements MarkingDataReportService { - + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxCouponOrderMapper wxCouponOrderMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java index 57e92dd94..f2a529660 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java @@ -6,6 +6,8 @@ import com.iformall.common.IdWorker; import com.iformall.domain.po.PushLimit; import com.iformall.mapper.PushLimitMapper; import com.iformall.service.PushLimitService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -13,6 +15,7 @@ import java.util.List; @Service public class PushLimitServiceImpl implements PushLimitService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired PushLimitMapper pushLimitMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAdminLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAdminLogServiceImpl.java index ecaf9e143..8196f47ae 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAdminLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAdminLogServiceImpl.java @@ -6,12 +6,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxAdminLog; import com.iformall.mapper.WxAdminLogMapper; import com.iformall.service.WxAdminLogService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxAdminLogServiceImpl implements WxAdminLogService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxAdminLogMapper wxAdminLogMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java index 185f8c641..020c2bc4b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java @@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxAppinfo; import com.iformall.mapper.WxAppinfoMapper; import com.iformall.service.WxAppinfoService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxAppinfoServiceImpl implements WxAppinfoService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxAppinfoMapper wxAppinfoMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBLogServiceImpl.java index 4612c0f6a..13b84cefa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBLogServiceImpl.java @@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxBLog; import com.iformall.mapper.WxBLogMapper; import com.iformall.service.WxBLogService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxBLogServiceImpl implements WxBLogService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxBLogMapper wxBLogMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 0b09ac357..af9fbb54b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -7,11 +7,14 @@ import com.iformall.common.IdWorker; import com.iformall.domain.po.WxBillRent; import com.iformall.mapper.WxBillRentMapper; import com.iformall.service.WxBillRentService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service public class WxBillRentServiceImpl implements WxBillRentService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxBillRentMapper wxBillRentMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java index 461ba7b1d..45e1ad464 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxBusiness; import com.iformall.mapper.WxBusinessMapper; import com.iformall.service.WxBusinessService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxBusinessServiceImpl implements WxBusinessService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxBusinessMapper wxBusinessMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCLogServiceImpl.java index d4ed05511..f871b18a6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCLogServiceImpl.java @@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxCLog; import com.iformall.mapper.WxCLogMapper; import com.iformall.service.WxCLogService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxCLogServiceImpl implements WxCLogService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxCLogMapper wxCLogMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java index fa3835cb0..f4a1a68db 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java @@ -6,12 +6,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxCUserCar; import com.iformall.mapper.WxCUserCarMapper; import com.iformall.service.WxCUserCarService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxCUserCarServiceImpl implements WxCUserCarService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxCUserCarMapper wxCUserCarMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java index ffffb9819..522b6d65d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java @@ -11,12 +11,15 @@ import com.iformall.mapper.WxCUserMapper; import com.iformall.mapper.WxCouponOrderMapper; import com.iformall.mapper.WxScoreRulesMapper; import com.iformall.service.WxCUserService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxCUserServiceImpl implements WxCUserService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxCUserMapper wxCUserMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java index 6f5f61766..37ad69c6f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java @@ -6,6 +6,8 @@ import java.util.List; import com.alibaba.fastjson.JSON; import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.mapper.WxCUserBasicInfoMapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,6 +25,7 @@ import com.iformall.service.WxCUserTagsService; @Service public class WxCUserTagsServiceImpl implements WxCUserTagsService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxCUserTagsMapper wxCUserTagsMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java index f63223967..974363b91 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -17,6 +17,8 @@ import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.service.WxCampaignService; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -27,6 +29,7 @@ import java.util.List; @Service public class WxCampaignServiceImpl implements WxCampaignService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxCampaignMapper wxCampaignMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java index 8b3e28747..3e8b35b03 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java @@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxCarCmdLog; import com.iformall.mapper.WxCarCmdLogMapper; import com.iformall.service.WxCarCmdLogService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxCarCmdLogMapper wxCarCmdLogMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChannelServiceImpl.java index 65444fe1e..483ed57be 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChannelServiceImpl.java @@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxChannel; import com.iformall.mapper.WxChannelMapper; import com.iformall.service.WxChannelService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxChannelServiceImpl implements WxChannelService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxChannelMapper wxChannelMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java index c6949f4d2..1151fb6b3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java @@ -6,12 +6,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxCouponActionLog; import com.iformall.mapper.WxCouponActionLogMapper; import com.iformall.service.WxCouponActionLogService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxCouponActionLogServiceImpl implements WxCouponActionLogService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxCouponActionLogMapper wxCouponActionLogMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponCarServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponCarServiceImpl.java index af28e65b3..08184a71c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponCarServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponCarServiceImpl.java @@ -7,11 +7,14 @@ import com.iformall.domain.po.WxCouponCar; import com.iformall.domain.vo.WxCouponCarVo; import com.iformall.mapper.WxCouponCarMapper; import com.iformall.service.WxCouponCarService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service public class WxCouponCarServiceImpl implements WxCouponCarService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxCouponCarMapper wxCouponCarMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index 615c8e0b9..ef56578c6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -16,13 +16,15 @@ import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.mapper.WxMerchantMapper; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponService; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxCouponChannelServiceImpl implements WxCouponChannelService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxCouponChannelMapper wxCouponChannelMapper; @@ -31,8 +33,6 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { @Autowired WxMerchantMapper wxMerchantMapper; - private Logger logger = Logger.getLogger(getClass()); - /** * B端业务端 * @param record diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 770925565..199cbc54a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -23,8 +23,9 @@ import com.iformall.service.*; import com.iformall.utils.DateUtils; import com.iformall.utils.MaUtil; import me.chanjar.weixin.common.error.WxErrorException; -import org.apache.log4j.Logger; import org.apache.poi.ss.usermodel.Workbook; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -39,7 +40,7 @@ import java.util.*; @Service public class WxCouponOrderServiceImpl implements WxCouponOrderService { - private Logger logger = Logger.getLogger(WxCouponOrderServiceImpl.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxCouponOrderMapper wxCouponOrderMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index 6c5134be3..004526a9e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -8,6 +8,8 @@ import com.iformall.enums.*; import com.iformall.mapper.WxCouponOrderMapper; import com.iformall.mapper.WxCouponSendMapper; import com.iformall.service.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -16,6 +18,7 @@ import java.util.List; @Service public class WxCouponSendServiceImpl implements WxCouponSendService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxCouponSendMapper wxCouponSendMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 2855d2b7c..94639a1ea 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -11,6 +11,8 @@ import com.iformall.mapper.WxCouponMapper; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponSendService; import com.iformall.service.WxCouponService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @@ -18,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class WxCouponServiceImpl implements WxCouponService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxCouponMapper wxCouponMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSpreadServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSpreadServiceImpl.java index cde1d402e..cf7df6c05 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSpreadServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSpreadServiceImpl.java @@ -6,12 +6,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxCouponSpread; import com.iformall.mapper.WxCouponSpreadMapper; import com.iformall.service.WxCouponSpreadService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxCouponSpreadServiceImpl implements WxCouponSpreadService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxCouponSpreadMapper wxCouponSpreadMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponTypeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponTypeServiceImpl.java index 23d4f371f..289146c80 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponTypeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponTypeServiceImpl.java @@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxCouponType; import com.iformall.mapper.WxCouponTypeMapper; import com.iformall.service.WxCouponTypeService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxCouponTypeServiceImpl implements WxCouponTypeService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxCouponTypeMapper wxCouponTypeMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxDateAmountRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxDateAmountRecordServiceImpl.java index fe79fa994..ad465ff99 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxDateAmountRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxDateAmountRecordServiceImpl.java @@ -6,12 +6,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxDateAmountRecord; import com.iformall.mapper.WxDateAmountRecordMapper; import com.iformall.service.WxDateAmountRecordService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxDateAmountRecordServiceImpl implements WxDateAmountRecordService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxDateAmountRecordMapper wxDateAmountRecordMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGroupServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGroupServiceImpl.java index 6501bfbad..bea48efa8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGroupServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGroupServiceImpl.java @@ -6,11 +6,14 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxGroup; import com.iformall.mapper.WxGroupMapper; import com.iformall.service.WxGroupService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service public class WxGroupServiceImpl implements WxGroupService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxGroupMapper wxGroupMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java index 70c4d8c33..665927f50 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java @@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxLevelConfig; import com.iformall.mapper.WxLevelConfigMapper; import com.iformall.service.WxLevelConfigService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxLevelConfigServiceImpl implements WxLevelConfigService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxLevelConfigMapper wxLevelConfigMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallApplyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallApplyServiceImpl.java index e26089351..146b9fb30 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallApplyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallApplyServiceImpl.java @@ -20,6 +20,8 @@ import com.iformall.utils.AesUtil; import com.iformall.utils.HMACSHA256; import com.iformall.utils.HttpUtil; import com.iformall.utils.RsaUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,6 +30,7 @@ import java.util.stream.Collectors; @Service public class WxMallApplyServiceImpl implements WxMallApplyService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxMallApplyMapper wxMallApplyMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java index 00f6a0702..32e5215f4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java @@ -9,6 +9,8 @@ import com.iformall.domain.po.WxMallFloor; import com.iformall.mapper.WxMallBuildingMapper; import com.iformall.mapper.WxMallFloorMapper; import com.iformall.service.WxMallBuildingService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -17,6 +19,7 @@ import java.util.stream.Collectors; @Service public class WxMallBuildingServiceImpl implements WxMallBuildingService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxMallBuildingMapper wxMallBuildingMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallConfigServiceImpl.java index 2b9e48f54..9ff3044b2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallConfigServiceImpl.java @@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxMallConfig; import com.iformall.mapper.WxMallConfigMapper; import com.iformall.service.WxMallConfigService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxMallConfigServiceImpl implements WxMallConfigService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxMallConfigMapper wxMallConfigMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java index 0a929e5a7..40ee471c6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java @@ -7,12 +7,15 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxMallFloor; import com.iformall.mapper.WxMallFloorMapper; import com.iformall.service.WxMallFloorService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxMallFloorServiceImpl implements WxMallFloorService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxMallFloorMapper wxMallFloorMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java index 0f8f7da85..edaaba2df 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java @@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxMall; import com.iformall.mapper.WxMallMapper; import com.iformall.service.WxMallService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxMallServiceImpl implements WxMallService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxMallMapper wxMallMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java index c0a4c70e5..4e4ee0e58 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java @@ -1,11 +1,9 @@ package com.iformall.service.impl; -import java.util.*; -import java.util.stream.Collectors; - import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; +import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxMerchantBUser; @@ -16,15 +14,18 @@ import com.iformall.mapper.WxAppinfoMapper; import com.iformall.mapper.WxMerchantBUserMapper; import com.iformall.mapper.WxMsgValidationcodeMapper; import com.iformall.service.WxMerchantBUserService; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; + +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; @Service public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { - - private Logger logger = Logger.getLogger(WxMerchantBUserServiceImpl.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxAppinfoMapper wxAppinfoMapper; @@ -92,7 +93,7 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { bUser.setPhone(phone); bUser.setStatus(EnumMerchantBUserStatus.VALID.getCode()); List list = wxMerchantBUserMapper.findList(bUser); - return list.size()>=1?true:false; + return list.size() >= 1 ? true : false; } @Override @@ -106,20 +107,20 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { Date currentdate = new Date(); wxmsgvalidationcodelist = wxmsgvalidationcodelist.stream().filter(validationcode -> validationcode.getExpiretime().after(currentdate)).collect(Collectors.toList()); - if(wxmsgvalidationcodelist.size()>0){ + if (wxmsgvalidationcodelist.size() > 0) { //更新 WxMerchantBUser bUser = new WxMerchantBUser(); bUser.setTenantId(appinfo.getTenantId()); bUser.setPhone(phone); bUser.setAppId(appId); List list = wxMerchantBUserMapper.findList(bUser); - if(list.size()>0){ + if (list.size() > 0) { bUser = list.get(0); bUser.setBUserPwd(pwd); - try{ + try { wxMerchantBUserMapper.updateByPrimaryKeySelective(bUser); - }catch (Exception e){ + } catch (Exception e) { logger.error("db failed: 商户-" + bUser.getId() + ", e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 68f68ba59..22db901c9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -8,6 +8,8 @@ import com.iformall.enums.*; import com.iformall.mapper.*; import com.iformall.service.WxMerchantService; import com.iformall.service.WxProfitSharingReceiverService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -18,6 +20,7 @@ import java.util.stream.Collectors; @Service public class WxMerchantServiceImpl implements WxMerchantService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxMerchantMapper wxMerchantMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantShopServiceImpl.java index c36b046e7..2e1c0ff01 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantShopServiceImpl.java @@ -8,6 +8,8 @@ import com.iformall.domain.po.WxShop; import com.iformall.mapper.WxMerchantShopMapper; import com.iformall.mapper.WxShopMapper; import com.iformall.service.WxMerchantShopService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -16,6 +18,7 @@ import java.util.List; @Service public class WxMerchantShopServiceImpl implements WxMerchantShopService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxMerchantShopMapper wxMerchantShopMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index 4514225df..92a10e8d0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -15,12 +15,15 @@ import com.iformall.service.WxMerchantTradeDailyService; import com.iformall.service.WxMallService; import com.iformall.service.WxMerchantBUserService; import com.iformall.service.WxMerchantService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxMerchantTradeDailyMapper wxMerchantTradeDailyMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java index bbecd9e7c..c9475b139 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java @@ -13,6 +13,8 @@ import com.iformall.mapper.WxMsgConfigMapper; import com.iformall.mapper.WxMsgModelMapper; import com.iformall.mapper.WxMsgValidationcodeModelMapper; import com.iformall.service.WxMsgCallbackService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,6 +24,7 @@ import java.util.Map; @Service public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxMsgCallbackMapper wxMsgCallbackMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java index a0190d32e..dc63b2411 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java @@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxMsgConfig; import com.iformall.mapper.WxMsgConfigMapper; import com.iformall.service.WxMsgConfigService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxMsgConfigServiceImpl implements WxMsgConfigService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxMsgConfigMapper wxMsgConfigMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java index fdc40c162..2e6db3787 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java @@ -16,6 +16,8 @@ import com.iformall.utils.AesUtil; import com.iformall.utils.HMACSHA256; import com.iformall.utils.HttpUtil; import com.iformall.utils.RsaUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,6 +25,7 @@ import java.util.*; @Service public class WxMsgModelServiceImpl implements WxMsgModelService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxMsgModelMapper wxMsgModelMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index 4d1601d37..0921efe4d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -21,6 +21,8 @@ import com.iformall.utils.AesUtil; import com.iformall.utils.HMACSHA256; import com.iformall.utils.HttpUtil; import com.iformall.utils.RsaUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,6 +31,7 @@ import java.util.*; @Service public class WxMsgServiceImpl implements WxMsgService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxMsgMapper wxMsgMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgSignatureServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgSignatureServiceImpl.java index b5e445d6f..1687208cd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgSignatureServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgSignatureServiceImpl.java @@ -7,12 +7,15 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxMsgSignature; import com.iformall.mapper.WxMsgSignatureMapper; import com.iformall.service.WxMsgSignatureService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxMsgSignatureServiceImpl implements WxMsgSignatureService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxMsgSignatureMapper wxMsgSignatureMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java index 9ae8081c8..10bae1799 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java @@ -16,6 +16,8 @@ import com.iformall.utils.AesUtil; import com.iformall.utils.HMACSHA256; import com.iformall.utils.HttpUtil; import com.iformall.utils.RsaUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,6 +25,7 @@ import java.util.*; @Service public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeModelService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxMsgValidationcodeModelMapper wxMsgValidationcodeModelMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java index 4fe377553..a49612a3a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java @@ -14,7 +14,8 @@ import com.iformall.utils.AesUtil; import com.iformall.utils.HMACSHA256; import com.iformall.utils.HttpUtil; import com.iformall.utils.RsaUtil; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,9 +25,7 @@ import java.util.stream.Collectors; @Service public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeService { - - private Logger logger = Logger.getLogger(WxMsgValidationcodeServiceImpl.class); - + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxMsgValidationcodeMapper wxMsgValidationcodeMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index b0c520874..31c569c04 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -14,7 +14,8 @@ import com.iformall.service.WxCUserService; import com.iformall.service.WxOrderService; import com.iformall.service.WxPayOrderService; import com.iformall.utils.RedisLock; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -27,7 +28,7 @@ import java.util.List; @Service public class WxOrderServiceImpl implements WxOrderService { - private Logger logger = Logger.getLogger(getClass()); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired RedisLock redisLock; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxParkServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxParkServiceImpl.java index dc340d76b..fa1f93781 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxParkServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxParkServiceImpl.java @@ -6,12 +6,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxPark; import com.iformall.mapper.WxParkMapper; import com.iformall.service.WxParkService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxParkServiceImpl implements WxParkService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxParkMapper wxParkMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java index 719426b17..761c77a6a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java @@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxPayAccount; import com.iformall.mapper.WxPayAccountMapper; import com.iformall.service.WxPayAccountService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxPayAccountServiceImpl implements WxPayAccountService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxPayAccountMapper wxPayAccountMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 3df10fa5b..6c844c844 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -1,13 +1,11 @@ package com.iformall.service.impl; -import java.text.ParseException; -import java.util.*; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; +import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; @@ -17,19 +15,24 @@ import com.iformall.mapper.*; import com.iformall.pay.*; import com.iformall.service.WxOrderService; import com.iformall.service.WxPayOrderService; -import com.iformall.utils.*; +import com.iformall.utils.BeanUtils; +import com.iformall.utils.MapUtil; +import com.iformall.utils.Utility; +import com.iformall.utils.XmlUtil; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.text.ParseException; +import java.util.*; + @Service public class WxPayOrderServiceImpl implements WxPayOrderService { - - private Logger logger = Logger.getLogger(getClass()); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxAppinfoMapper wxAppinfoMapper; @@ -148,7 +151,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { record.setShare(isShare.getCode()); if (isShare == EnumPayShare.YES) { // 分账金额 - Double dChargeFee = Math.ceil(record.getPayAmount()*1.0D*payAccount.getRate()/1000); + Double dChargeFee = Math.ceil(record.getPayAmount() * 1.0D * payAccount.getRate() / 1000); Integer share_amount = record.getPayAmount() - dChargeFee.intValue(); record.setShareAmount(share_amount); } @@ -184,7 +187,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { wxPayOrderP.setProduct_id(String.valueOf(order.getId())); // 订单ID wxPayOrderP.setTime_start(Utility.getDataFormatStringYYYYMMDDHHmmss(currentDate)); Date futureDate = new Date(); - futureDate.setTime(currentDate.getTime() + 15*60*1000); + futureDate.setTime(currentDate.getTime() + 15 * 60 * 1000); wxPayOrderP.setTime_expire(Utility.getDataFormatStringYYYYMMDDHHmmss(futureDate)); // 15分钟后结束 Map payOrderMap = BeanUtils.toStringMap(wxPayOrderP); wxPayOrderP.setSign(WxPayment.createSign(payOrderMap, payAccount.getApiKey())); @@ -217,7 +220,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { returnMap.put("nonceStr", noncestr); returnMap.put("package", "prepay_id=" + prepay_id); returnMap.put("paySign", signAgent); - logger.info("back to UI: " +returnMap.toString()); + logger.info("back to UI: " + returnMap.toString()); return new ResultData(Result.SUCCESS, "创建支付订单成功", returnMap); } else { String errMsg = ""; @@ -257,10 +260,10 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { wxPayOrderSP.setProduct_id(String.valueOf(order.getId())); // 订单ID wxPayOrderSP.setTime_start(Utility.getDataFormatStringYYYYMMDDHHmmss(currentDate)); Date futureDate = new Date(); - futureDate.setTime(currentDate.getTime() + 15*60*1000); + futureDate.setTime(currentDate.getTime() + 15 * 60 * 1000); wxPayOrderSP.setTime_expire(Utility.getDataFormatStringYYYYMMDDHHmmss(futureDate)); // 15分钟后结束 wxPayOrderSP.setSign_type("HMAC-SHA256"); - if(isShare == EnumPayShare.YES) { + if (isShare == EnumPayShare.YES) { wxPayOrderSP.setProfit_sharing("Y"); } Map payOrderMap = BeanUtils.toStringMap(wxPayOrderSP); @@ -296,7 +299,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { returnMap.put("package", "prepay_id=" + prepay_id); returnMap.put("paySign", signAgent); returnMap.put("signType", "HMAC-SHA256"); - logger.info("back to UI: " +returnMap.toString()); + logger.info("back to UI: " + returnMap.toString()); return new ResultData(Result.SUCCESS, "创建支付订单成功", returnMap); } else { String errMsg = ""; @@ -333,7 +336,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { wxPayOrderP.setProduct_id(String.valueOf(order.getId())); // 订单ID wxPayOrderP.setTime_start(Utility.getDataFormatStringYYYYMMDDHHmmss(currentDate)); Date futureDate = new Date(); - futureDate.setTime(currentDate.getTime() + 15*60*1000); + futureDate.setTime(currentDate.getTime() + 15 * 60 * 1000); wxPayOrderP.setTime_expire(Utility.getDataFormatStringYYYYMMDDHHmmss(futureDate)); // 15分钟后结束 wxPayOrderP.setSign(WxPayment.createSign(BeanUtils.toStringMap(wxPayOrderP), payAccount.getApiKey())); Map returnMap = BeanUtils.toStringMap(wxPayOrderP); @@ -347,9 +350,9 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } // TODO + /** * 微信订单查询 - * */ @Override public ResultData payOrderQuery(WxAppinfo appInfo, WxPayOrder record) { @@ -414,7 +417,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } } catch (RuntimeException e) { throw new MallinkException(ErrorCode.PAY_ORDER_ERROR.getCode(), e.getMessage()); - } catch (Exception e){ + } catch (Exception e) { throw new MallinkException(ErrorCode.PAY_ORDER_ERROR.getCode(), e.getMessage()); } } else { @@ -480,7 +483,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } } catch (RuntimeException e) { throw new MallinkException(ErrorCode.PAY_ORDER_ERROR.getCode(), e.getMessage()); - } catch (Exception e){ + } catch (Exception e) { throw new MallinkException(ErrorCode.PAY_ORDER_ERROR.getCode(), e.getMessage()); } } @@ -829,7 +832,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { payOrderQ.setTenantId(order.getTenantId()); payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_WAY_WAIT.getCode()); List payOrders = wxPayOrderMapper.select(payOrderQ); - for(WxPayOrder payOrder: payOrders) { + for (WxPayOrder payOrder : payOrders) { payOrderClose(appInfo, payOrder); } } @@ -910,10 +913,10 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { wxPayOrderMapper.deleteByPrimaryKey(id); } - public static void main(String [] args) { + public static void main(String[] args) { Integer v = 50; Integer rate = 6; - Double dChargeFee = Math.ceil(v*1.0D*6/1000); + Double dChargeFee = Math.ceil(v * 1.0D * 6 / 1000); Integer share_amount = v - dChargeFee.intValue(); System.out.println("share value " + share_amount); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java index 341195e3b..d30d2e764 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -20,7 +20,8 @@ import com.iformall.pay.WxProfitSharingQueryP; import com.iformall.service.WxProfitSharingOrderService; import com.iformall.utils.BeanUtils; import com.iformall.utils.Utility; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @@ -30,7 +31,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderService { - private Logger logger = Logger.getLogger(getClass()); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxProfitSharingOrderMapper wxProfitSharingOrderMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java index 650528a27..4261e6128 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java @@ -1,18 +1,20 @@ package com.iformall.service.impl; -import java.util.*; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; +import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxPayAccount; import com.iformall.domain.po.WxProfitSharingReceiver; -import com.iformall.enums.*; +import com.iformall.enums.EnumAppType; +import com.iformall.enums.EnumProfitSharingReceiverStatus; +import com.iformall.enums.EnumProfitSharingReceiverType; +import com.iformall.enums.EnumProfitSharingType; import com.iformall.mapper.WxAppinfoMapper; import com.iformall.mapper.WxPayAccountMapper; import com.iformall.mapper.WxProfitSharingReceiverMapper; @@ -22,17 +24,18 @@ import com.iformall.pay.WxProfitSharingReceiverP; import com.iformall.service.WxProfitSharingReceiverService; import com.iformall.utils.BeanUtils; import com.iformall.utils.Utility; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; +import java.util.Date; +import java.util.Map; @Service public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiverService { - - private Logger logger = Logger.getLogger(WxCouponOrderServiceImpl.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); final JSONObject errorMap = JSON.parseObject("{" + "\"SYSTEMERROR\":{\"detail\":\"接口返回错误\",\"reason\":\"系统超时\",\"resolution\":\"系统异常,请用相同参数重新调用\"}," + @@ -44,7 +47,6 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv "\"USER_NOTEXIST\":{\"detail\":\"分账接受方不存在\",\"reason\":\"分账接受方不存在\",\"resolution\":\"请确认分账接收方类型或者账号无误后重试\"}}"); - @Autowired WxProfitSharingReceiverMapper wxProfitSharingReceiverMapper; @Autowired @@ -67,7 +69,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); - record.setId(idWorker.nextId()); + record.setId(idWorker.nextId()); wxProfitSharingReceiverMapper.insertSelective(record); } else { wxProfitSharingReceiverMapper.updateByPrimaryKeySelective(record); @@ -125,16 +127,16 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv JSONObject receiverJSON = new JSONObject(); - receiverJSON.put("type",EnumProfitSharingReceiverType.getEnum(receiver.getReceiverType()).getMessage()); - receiverJSON.put("account",receiver.getReceiverAccount()); - receiverJSON.put("name",receiver.getTrueName()); + receiverJSON.put("type", EnumProfitSharingReceiverType.getEnum(receiver.getReceiverType()).getMessage()); + receiverJSON.put("account", receiver.getReceiverAccount()); + receiverJSON.put("name", receiver.getTrueName()); wxProfitSharingReceiverP.setReceiver(receiverJSON.toJSONString()); String response; try { wxProfitSharingReceiverP.setSign(WxPayment.createSignHMAC(BeanUtils.toStringMap(wxProfitSharingReceiverP), payAccount.getApiKey())); response = WxProfitSharing.addReceiver(BeanUtils.toStringMap(wxProfitSharingReceiverP)); - }catch (Exception e) { + } catch (Exception e) { logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_ADD_FAILED.getMessage() + e.getMessage()); return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_ADD_FAILED, e.getMessage()); } @@ -151,7 +153,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_ADD_FAILED.getCode(), returnMap.get("err_code_des")); } - if (!WxPayment.verifyNotifyHMAC(returnMap,payAccount.getApiKey())){ + if (!WxPayment.verifyNotifyHMAC(returnMap, payAccount.getApiKey())) { logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_ADD_FAILED.getMessage() + "verifyNotifyHMAC"); return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_ADD_FAILED.getCode(), ErrorCode.PROFIT_SHARING_RECEIVER_ADD_FAILED.getMessage()); } @@ -191,15 +193,15 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv wxProfitSharingReceiverP.setSign_type("HMAC-SHA256"); JSONObject receiverJSON = new JSONObject(); - receiverJSON.put("type",EnumProfitSharingReceiverType.getEnum(receiver.getReceiverType()).getMessage()); - receiverJSON.put("account",receiver.getReceiverAccount()); + receiverJSON.put("type", EnumProfitSharingReceiverType.getEnum(receiver.getReceiverType()).getMessage()); + receiverJSON.put("account", receiver.getReceiverAccount()); wxProfitSharingReceiverP.setReceiver(receiverJSON.toJSONString()); String response; try { wxProfitSharingReceiverP.setSign(WxPayment.createSignHMAC(BeanUtils.toStringMap(wxProfitSharingReceiverP), payAccount.getApiKey())); response = WxProfitSharing.delReceiver(BeanUtils.toStringMap(wxProfitSharingReceiverP)); - }catch (Exception e) { + } catch (Exception e) { logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getMessage() + e.getMessage()); return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED, e.getMessage()); } @@ -222,7 +224,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getCode(), returnMap.get("result_msg")); } - if (!WxPayment.verifyNotifyHMAC(returnMap,payAccount.getApiKey())){ + if (!WxPayment.verifyNotifyHMAC(returnMap, payAccount.getApiKey())) { logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getMessage()); return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getCode(), "verifyNotifyHMAC"); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingResultServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingResultServiceImpl.java index 68b33419b..e3a362f22 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingResultServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingResultServiceImpl.java @@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxProfitSharingResult; import com.iformall.mapper.WxProfitSharingResultMapper; import com.iformall.service.WxProfitSharingResultService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxProfitSharingResultServiceImpl implements WxProfitSharingResultService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxProfitSharingResultMapper wxProfitSharingResultMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java index 068a0ce3b..2999a2d24 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java @@ -1,12 +1,11 @@ package com.iformall.service.impl; -import java.util.*; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; +import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; @@ -24,24 +23,26 @@ import com.iformall.utils.CipherUtil; import com.iformall.utils.Utility; import com.iformall.utils.XmlUtil; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.*; + @Service public class WxRefundOrderServiceImpl implements WxRefundOrderService { - private Logger logger = Logger.getLogger(getClass()); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxAppinfoMapper wxAppinfoMapper; - - @Autowired + + @Autowired WxRefundOrderMapper wxRefundOrderMapper; - @Autowired + @Autowired WxOrderMapper wxOrderMapper; @Autowired @@ -232,8 +233,8 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public ResultData createRefundOrder(boolean isReal, WxAppinfo appInfo, Long couponOrderId, EnumRefundWay refundWay, Long bUserId) { WxCouponOrder wxCouponOrder = wxCouponOrderMapper.selectByPrimaryKey(couponOrderId); - if(wxCouponOrder == null){ - logger.error("券ID不存在:"+ couponOrderId); + if (wxCouponOrder == null) { + logger.error("券ID不存在:" + couponOrderId); throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL); } @@ -241,8 +242,8 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { if (refundWay == EnumRefundWay.B) { logger.info("B端发起退款: bUserId-" + bUserId); - if (bUserId == null || bUserId ==0 ) { - logger.error("B端用户不存在:"+ bUserId); + if (bUserId == null || bUserId == 0) { + logger.error("B端用户不存在:" + bUserId); throw new MallinkException(ErrorCode.USER_IS_EMPTY); } // B端用户退款检查一下商户 @@ -375,7 +376,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { // 退款订单 try { int sqlRow = wxRefundOrderMapper.insertSelective(record); - if(sqlRow != 1) { + if (sqlRow != 1) { logger.error("退款订单数据库插入出错: " + record.toString()); throw new MallinkException(ErrorCode.DB_FAIL); } @@ -610,6 +611,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { /** * 微信退款查询 + * * @param appInfo * @param record */ @@ -660,8 +662,9 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { /** * 微信退款结果通知 - * @param paramMap 异步通知参数 - * @param payWay 支付方式 + * + * @param paramMap 异步通知参数 + * @param payWay 支付方式 * @return */ @Override @@ -675,23 +678,23 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { // 普通商户号 WxAppinfo appinfo = wxAppinfoMapper.findByAppId(appId); if (appinfo == null) { - logger.error("未找到appid信息:"+appId); + logger.error("未找到appid信息:" + appId); throw new MallinkException(ErrorCode.APP_ID_NOT_FOUND); } WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appinfo.getPayId()); if (payAccount == null) { - logger.error("未找到mch_id信息:"+mchId); + logger.error("未找到mch_id信息:" + mchId); throw new MallinkException(ErrorCode.MCH_INFO_NOT_FOUND); } if (!mchId.equalsIgnoreCase(payAccount.getMchId())) { - logger.error("mch_id不对应:"+mchId + ",account:" + payAccount.getMchId()); + logger.error("mch_id不对应:" + mchId + ",account:" + payAccount.getMchId()); throw new MallinkException(ErrorCode.MCH_INFO_NOT_EQUAL); } String partnerKey = payAccount.getApiKey(); try { if (payWay == EnumPayWay.PAY_WAY_WEAPP) { if (!"SUCCESS".equals(paramMap.get("return_code"))) { - logger.warn("notify refund, wxpay status not success, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString()); + logger.warn("notify refund, wxpay status not success, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); resultMap.put("return_code", "FAIL"); resultMap.put("return_msg", "订单状态码非SUCCESS"); @@ -706,15 +709,15 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { Long payOrderId = Long.valueOf(payOrderNo); WxPayOrder payOrder = wxPayOrderMapper.selectByPrimaryKey(payOrderId); if (payOrder == null) { - logger.warn("notify refund, wxpay check pay order not exists, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString()); + logger.warn("notify refund, wxpay check pay order not exists, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); resultMap.put("return_code", "FAIL"); resultMap.put("return_msg", "支付订单不存在"); return XmlUtil.getRequestXml(resultMap); } // 验证支付金额 - if(!reqMap.get("total_fee").equals(payOrder.getPayAmount().toString())) { - logger.warn("notify refund, wxpay check total_fee is invalid, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString()); + if (!reqMap.get("total_fee").equals(payOrder.getPayAmount().toString())) { + logger.warn("notify refund, wxpay check total_fee is invalid, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); resultMap.put("return_code", "FAIL"); resultMap.put("return_msg", "支付订单总金额不一致"); @@ -724,23 +727,23 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { Long refundOrderId = Long.valueOf(refundIdStr); WxRefundOrder refundOrder = wxRefundOrderMapper.selectByPrimaryKey(refundOrderId); if (refundOrder == null) { - logger.warn("notify refund, wxpay check pay order not exists, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString()); + logger.warn("notify refund, wxpay check pay order not exists, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); resultMap.put("return_code", "FAIL"); resultMap.put("return_msg", "退款订单不存在"); return XmlUtil.getRequestXml(resultMap); } // 验证支付金额 - if(!reqMap.get("total_fee").equals(refundOrder.getTotalFee().toString())) { - logger.warn("notify refund, wxpay check total_fee is invalid, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString()); + if (!reqMap.get("total_fee").equals(refundOrder.getTotalFee().toString())) { + logger.warn("notify refund, wxpay check total_fee is invalid, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); resultMap.put("return_code", "FAIL"); resultMap.put("return_msg", "订单总金额不一致"); return XmlUtil.getRequestXml(resultMap); } // 验证退款金额 - if(!reqMap.get("refund_fee").equals(refundOrder.getRefundFee().toString())) { - logger.warn("notify refund, wxpay check refund_fee is invalid, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString()); + if (!reqMap.get("refund_fee").equals(refundOrder.getRefundFee().toString())) { + logger.warn("notify refund, wxpay check refund_fee is invalid, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); resultMap.put("return_code", "FAIL"); resultMap.put("return_msg", "退款总金额不一致"); @@ -749,40 +752,40 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { // 处理支付成功 handleRefundSuccess(refundOrder, reqMap.get("transaction_id"), reqMap.get("refund_id")); - logger.info("notify refund, wxpay checksign success, paramMap:{}, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString()); + logger.info("notify refund, wxpay checksign success, paramMap:{}, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); resultMap.put("return_code", "SUCCESS"); resultMap.put("return_msg", "OK"); return XmlUtil.getRequestXml(resultMap); } } catch (RuntimeException e) { - logger.warn("notify refund paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString() + ", e:" + e.getMessage()); + logger.warn("notify refund paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString() + ", e:" + e.getMessage()); throw new MallinkException(ErrorCode.REFUND_ORDER_ERROR.getCode(), e.getMessage()); } catch (Exception e) { - logger.warn("notify refund, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString() + ", e:" + e.getMessage()); + logger.warn("notify refund, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString() + ", e:" + e.getMessage()); throw new MallinkException(ErrorCode.REFUND_ORDER_ERROR.getCode(), e.getMessage()); } } else { // 服务号回调 WxAppinfo appinfo = wxAppinfoMapper.findByAppId(subAppId); if (appinfo == null) { - logger.error("未找到appid信息:"+appId); + logger.error("未找到appid信息:" + appId); throw new MallinkException(ErrorCode.APP_ID_NOT_FOUND); } WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appinfo.getPayId()); if (payAccount == null) { - logger.error("未找到mch_id信息:"+mchId); + logger.error("未找到mch_id信息:" + mchId); throw new MallinkException(ErrorCode.MCH_INFO_NOT_FOUND); } if (!mchId.equalsIgnoreCase(payAccount.getMchId())) { - logger.error("mch_id不对应:"+mchId + ",account:" + payAccount.getMchId()); + logger.error("mch_id不对应:" + mchId + ",account:" + payAccount.getMchId()); throw new MallinkException(ErrorCode.MCH_INFO_NOT_EQUAL); } String partnerKey = payAccount.getApiKey(); try { if (payWay == EnumPayWay.PAY_WAY_WEAPP) { if (!"SUCCESS".equals(paramMap.get("return_code"))) { - logger.warn("notify order, wxpay status not success, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString()); + logger.warn("notify order, wxpay status not success, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); resultMap.put("return_code", "FAIL"); resultMap.put("return_msg", "订单状态码非SUCCESS"); @@ -804,15 +807,15 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { Long payOrderId = Long.valueOf(payOrderNo); WxPayOrder payOrder = wxPayOrderMapper.selectByPrimaryKey(payOrderId); if (payOrder == null) { - logger.warn("notify refund, wxpay check pay order not exists, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString()); + logger.warn("notify refund, wxpay check pay order not exists, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); resultMap.put("return_code", "FAIL"); resultMap.put("return_msg", "支付订单不存在"); return XmlUtil.getRequestXml(resultMap); } // 验证支付金额 - if(!reqMap.get("total_fee").equals(payOrder.getPayAmount().toString())) { - logger.warn("notify refund, wxpay check total_fee is invalid, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString()); + if (!reqMap.get("total_fee").equals(payOrder.getPayAmount().toString())) { + logger.warn("notify refund, wxpay check total_fee is invalid, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); resultMap.put("return_code", "FAIL"); resultMap.put("return_msg", "支付订单总金额不一致"); @@ -822,23 +825,23 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { Long refundOrderId = Long.valueOf(refundIdStr); WxRefundOrder refundOrder = wxRefundOrderMapper.selectByPrimaryKey(refundOrderId); if (refundOrder == null) { - logger.warn("notify refund, wxpay check pay order not exists, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString()); + logger.warn("notify refund, wxpay check pay order not exists, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); resultMap.put("return_code", "FAIL"); resultMap.put("return_msg", "退款订单不存在"); return XmlUtil.getRequestXml(resultMap); } // 验证支付金额 - if(!reqMap.get("total_fee").equals(refundOrder.getTotalFee().toString())) { - logger.warn("notify refund, wxpay check total_fee is invalid, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString()); + if (!reqMap.get("total_fee").equals(refundOrder.getTotalFee().toString())) { + logger.warn("notify refund, wxpay check total_fee is invalid, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); resultMap.put("return_code", "FAIL"); resultMap.put("return_msg", "订单总金额不一致"); return XmlUtil.getRequestXml(resultMap); } // 验证退款金额 - if(!reqMap.get("refund_fee").equals(refundOrder.getRefundFee().toString())) { - logger.warn("notify refund, wxpay check refund_fee is invalid, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString()); + if (!reqMap.get("refund_fee").equals(refundOrder.getRefundFee().toString())) { + logger.warn("notify refund, wxpay check refund_fee is invalid, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); resultMap.put("return_code", "FAIL"); resultMap.put("return_msg", "退款总金额不一致"); @@ -847,17 +850,17 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { // 处理支付成功 handleRefundSuccess(refundOrder, reqMap.get("transaction_id"), reqMap.get("refund_id")); - logger.info("notify refund, wxpay checksign success, paramMap:{}, paramMap: "+reqMap.toString()+ ", payWay:" + payWay.toString()); + logger.info("notify refund, wxpay checksign success, paramMap:{}, paramMap: " + reqMap.toString() + ", payWay:" + payWay.toString()); SortedMap resultMap = new TreeMap(); resultMap.put("return_code", "SUCCESS"); resultMap.put("return_msg", "OK"); return XmlUtil.getRequestXml(resultMap); } } catch (RuntimeException e) { - logger.warn("notify refund, wepay checksign error, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString() + ", e:" + e.getMessage()); + logger.warn("notify refund, wepay checksign error, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString() + ", e:" + e.getMessage()); throw new MallinkException(ErrorCode.REFUND_ORDER_ERROR); } catch (Exception e) { - logger.warn("notify refund, paramMap: "+paramMap.toString()+ ", payWay:" + payWay.toString() + ", e:" + e.getMessage()); + logger.warn("notify refund, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString() + ", e:" + e.getMessage()); throw new MallinkException(ErrorCode.REFUND_ORDER_ERROR.getCode(), e.getMessage()); } } @@ -886,7 +889,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { WxOrder order = wxOrderMapper.selectByPrimaryKey(refundOrder.getOrderId()); if (order == null) { - logger.error("pay success handle, order " + refundOrder.getOrderId() +" not found , refundId : " + refundOrder.getId()); + logger.error("pay success handle, order " + refundOrder.getOrderId() + " not found , refundId : " + refundOrder.getId()); throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); } @@ -946,7 +949,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); - record.setId(idWorker.nextId()); + record.setId(idWorker.nextId()); wxRefundOrderMapper.insertSelective(record); } else { wxRefundOrderMapper.updateByPrimaryKeySelective(record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 1fd6ea47e..63bb4ba99 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -6,11 +6,14 @@ import com.iformall.common.IdWorker; import com.iformall.domain.po.WxRentContract; import com.iformall.mapper.WxRentContractMapper; import com.iformall.service.WxRentContractService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @Service public class WxRentContractServiceImpl implements WxRentContractService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxRentContractMapper wxRentContractMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreHistoryServiceImpl.java index 2f1e11b6b..1a3195451 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreHistoryServiceImpl.java @@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxScoreHistory; import com.iformall.mapper.WxScoreHistoryMapper; import com.iformall.service.WxScoreHistoryService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxScoreHistoryServiceImpl implements WxScoreHistoryService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxScoreHistoryMapper wxScoreHistoryMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index 071065367..f9b91dadc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -10,12 +10,15 @@ import com.iformall.mapper.WxScoreRulesMapper; import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCUserService; import com.iformall.service.WxScoreRulesService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxScoreRulesServiceImpl implements WxScoreRulesService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxScoreRulesMapper wxScoreRulesMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreValidityPeriodServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreValidityPeriodServiceImpl.java index 0f435d114..fc1bf536b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreValidityPeriodServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreValidityPeriodServiceImpl.java @@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxScoreValidityPeriod; import com.iformall.mapper.WxScoreValidityPeriodMapper; import com.iformall.service.WxScoreValidityPeriodService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxScoreValidityPeriodServiceImpl implements WxScoreValidityPeriodService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxScoreValidityPeriodMapper wxScoreValidityPeriodMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 728c7e650..7574998c3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -10,12 +10,15 @@ import com.iformall.domain.po.WxShop; import com.iformall.enums.EnumShopStatus; import com.iformall.mapper.WxShopMapper; import com.iformall.service.WxShopService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxShopServiceImpl implements WxShopService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxShopMapper wxShopMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java index 38d20d2bb..4f5d04cd9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java @@ -6,12 +6,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxTags; import com.iformall.mapper.WxTagsMapper; import com.iformall.service.WxTagsService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxTagsServiceImpl implements WxTagsService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxTagsMapper wxTagsMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java index f2631372f..c3e0746f2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java @@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxTemplateMsg; import com.iformall.mapper.WxTemplateMsgMapper; import com.iformall.service.WxTemplateMsgService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxTemplateMsgServiceImpl implements WxTemplateMsgService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxTemplateMsgMapper wxTemplateMsgMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxUserChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxUserChannelServiceImpl.java index 821e0896c..7e6442237 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxUserChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxUserChannelServiceImpl.java @@ -6,12 +6,15 @@ import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxUserChannel; import com.iformall.mapper.WxUserChannelMapper; import com.iformall.service.WxUserChannelService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxUserChannelServiceImpl implements WxUserChannelService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxUserChannelMapper wxUserChannelMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxUserCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxUserCouponServiceImpl.java index 2098f1917..b3f623816 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxUserCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxUserCouponServiceImpl.java @@ -5,6 +5,8 @@ import com.iformall.domain.po.WxCouponOrder; import com.iformall.mapper.WxCouponMapper; import com.iformall.mapper.WxCouponOrderMapper; import com.iformall.service.WxUserCouponService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -18,6 +20,7 @@ import java.util.stream.Collectors; */ @Service public class WxUserCouponServiceImpl implements WxUserCouponService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxCouponOrderMapper wxCouponOrderMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java index 3408e6613..d0dc48b9e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java @@ -7,12 +7,15 @@ import com.iformall.domain.po.WxUserVisit; import com.iformall.domain.vo.TouchUsersReportVo; import com.iformall.mapper.WxUserVisitMapper; import com.iformall.service.WxUserVisitService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @Service public class WxUserVisitServiceImpl implements WxUserVisitService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired WxUserVisitMapper wxUserVisitMapper; diff --git a/mallinkService/src/main/java/com/iformall/utils/RedisLock.java b/mallinkService/src/main/java/com/iformall/utils/RedisLock.java index 955422ad8..d9bdeb9d2 100644 --- a/mallinkService/src/main/java/com/iformall/utils/RedisLock.java +++ b/mallinkService/src/main/java/com/iformall/utils/RedisLock.java @@ -1,6 +1,7 @@ package com.iformall.utils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Component; @@ -14,7 +15,7 @@ import org.springframework.util.StringUtils; */ @Component public class RedisLock { - private org.apache.log4j.Logger logger = Logger.getLogger(getClass()); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private StringRedisTemplate stringRedisTemplate;