Browse Source

[Logger重整][重整]

release_toaliyun_real
Stormeye.Wu 7 years ago
parent
commit
93bdd437f0
76 changed files with 325 additions and 145 deletions
  1. +7
    -3
      mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java
  3. +4
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/WxMsgSignatureController.java
  4. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxPayController.java
  5. +3
    -4
      mallinkAdmin/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java
  6. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java
  7. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java
  8. +3
    -2
      mallinkAdmin/src/main/java/com/iformall/schedule/MsgSendingSchedule.java
  9. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java
  10. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java
  11. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/CouponInjectServiceImpl.java
  12. +3
    -2
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
  13. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java
  14. +4
    -0
      mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java
  15. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/MallRoleServiceImpl.java
  16. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java
  17. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java
  18. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java
  19. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxAdminLogServiceImpl.java
  20. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java
  21. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBLogServiceImpl.java
  22. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
  23. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java
  24. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCLogServiceImpl.java
  25. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java
  26. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java
  27. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java
  28. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java
  29. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java
  30. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxChannelServiceImpl.java
  31. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java
  32. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponCarServiceImpl.java
  33. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java
  34. +3
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  35. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java
  36. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java
  37. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponSpreadServiceImpl.java
  38. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponTypeServiceImpl.java
  39. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxDateAmountRecordServiceImpl.java
  40. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxGroupServiceImpl.java
  41. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java
  42. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMallApplyServiceImpl.java
  43. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java
  44. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMallConfigServiceImpl.java
  45. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java
  46. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java
  47. +13
    -12
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java
  48. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  49. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantShopServiceImpl.java
  50. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java
  51. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java
  52. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java
  53. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java
  54. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java
  55. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgSignatureServiceImpl.java
  56. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java
  57. +3
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java
  58. +3
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  59. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxParkServiceImpl.java
  60. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java
  61. +24
    -21
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
  62. +3
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java
  63. +20
    -18
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java
  64. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingResultServiceImpl.java
  65. +50
    -47
      mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java
  66. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  67. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxScoreHistoryServiceImpl.java
  68. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java
  69. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxScoreValidityPeriodServiceImpl.java
  70. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java
  71. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java
  72. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java
  73. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxUserChannelServiceImpl.java
  74. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxUserCouponServiceImpl.java
  75. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java
  76. +3
    -2
      mallinkService/src/main/java/com/iformall/utils/RedisLock.java

+ 7
- 3
mallinkAdmin/src/main/java/com/iformall/config/RedisConfig.java View File

@@ -1,6 +1,7 @@
package com.iformall.config; 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.beans.factory.annotation.Value;
import org.springframework.cache.annotation.CachingConfigurerSupport; import org.springframework.cache.annotation.CachingConfigurerSupport;
import org.springframework.cache.annotation.EnableCaching; import org.springframework.cache.annotation.EnableCaching;
@@ -15,6 +16,9 @@ import redis.clients.jedis.JedisPoolConfig;
@Configuration @Configuration
@EnableCaching @EnableCaching
public class RedisConfig extends CachingConfigurerSupport { public class RedisConfig extends CachingConfigurerSupport {

private final Logger logger = LoggerFactory.getLogger(this.getClass());

@Value("${spring.redis.host}") @Value("${spring.redis.host}")
private String host; private String host;


@@ -35,8 +39,8 @@ public class RedisConfig extends CachingConfigurerSupport {


@Bean @Bean
public JedisPool redisPoolFactory() { 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 jedisPoolConfig = new JedisPoolConfig();
jedisPoolConfig.setMaxIdle(maxIdle); jedisPoolConfig.setMaxIdle(maxIdle);
jedisPoolConfig.setMaxWaitMillis(maxWaitMillis); jedisPoolConfig.setMaxWaitMillis(maxWaitMillis);


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java View File

@@ -208,7 +208,7 @@ public class ShiroConfig {
RedisManager redisManager = new RedisManager(); RedisManager redisManager = new RedisManager();
redisManager.setHost(host); redisManager.setHost(host);
redisManager.setPort(port); redisManager.setPort(port);
redisManager.setExpire(expire);// 配置缓存过期时间
//redisManager.setExpire(expire);// 配置缓存过期时间
redisManager.setTimeout(timeout); redisManager.setTimeout(timeout);
redisManager.setPassword(password); redisManager.setPassword(password);
return redisManager; return redisManager;


+ 4
- 3
mallinkAdmin/src/main/java/com/iformall/controller/WxMsgSignatureController.java View File

@@ -8,18 +8,19 @@ import com.iformall.service.WxMsgSignatureService;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; 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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


@RestController @RestController
@RequestMapping("wxMsgSignature") @RequestMapping("wxMsgSignature")
public class WxMsgSignatureController extends BaseController { public class WxMsgSignatureController extends BaseController {
private final Logger logger = LoggerFactory.getLogger(this.getClass());

@Autowired @Autowired
private WxMsgSignatureService wxMsgSignatureService; private WxMsgSignatureService wxMsgSignatureService;


private Logger logger = Logger.getLogger(WxMsgSignatureController.class);

@ApiOperation("分页列表接口") @ApiOperation("分页列表接口")
@GetMapping("list") @GetMapping("list")
@ApiImplicitParams({ @ApiImplicitParams({


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/WxPayController.java View File

@@ -9,7 +9,7 @@ import com.iformall.service.WxProfitSharingOrderService;
import com.iformall.service.WxRefundOrderService; import com.iformall.service.WxRefundOrderService;
import com.iformall.utils.XmlUtil; import com.iformall.utils.XmlUtil;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.jdom.JDOMException;
import org.jdom2.JDOMException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;


+ 3
- 4
mallinkAdmin/src/main/java/com/iformall/schedule/CouponExpiringSchedule.java View File

@@ -1,7 +1,8 @@
package com.iformall.schedule; package com.iformall.schedule;


import com.iformall.mapper.*; 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.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -11,14 +12,12 @@ import org.springframework.transaction.annotation.Transactional;
@Component @Component
public class CouponExpiringSchedule { public class CouponExpiringSchedule {


private final Logger logger = Logger.getLogger(CouponExpiringSchedule.class);
private final Logger logger = LoggerFactory.getLogger(this.getClass());




@Autowired @Autowired
private WxCouponChannelMapper wxCouponChannelMapper; private WxCouponChannelMapper wxCouponChannelMapper;




@Scheduled(cron = "0 5 0 * * ?") // 每天凌晨00:05 @Scheduled(cron = "0 5 0 * * ?") // 每天凌晨00:05
//@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})


+ 3
- 3
mallinkAdmin/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java View File

@@ -7,7 +7,8 @@ import com.iformall.enums.EnumRefundWay;
import com.iformall.mapper.*; import com.iformall.mapper.*;
import com.iformall.service.WxPayOrderService; import com.iformall.service.WxPayOrderService;
import com.iformall.service.WxRefundOrderService; 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.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -18,8 +19,7 @@ import java.util.List;


@Component @Component
public class CouponOrderExpiringSchedule { public class CouponOrderExpiringSchedule {

private final Logger logger = Logger.getLogger(CouponOrderExpiringSchedule.class);
private final Logger logger = LoggerFactory.getLogger(this.getClass());




@Autowired @Autowired


+ 3
- 3
mallinkAdmin/src/main/java/com/iformall/schedule/DaliyAmountSchedule.java View File

@@ -8,7 +8,8 @@ import com.iformall.domain.po.WxMerchant;
import com.iformall.enums.EnumDateAmtType; import com.iformall.enums.EnumDateAmtType;
import com.iformall.mapper.*; import com.iformall.mapper.*;
import com.iformall.service.WxDateAmountRecordService; 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.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -21,8 +22,7 @@ import java.util.*;


@Component @Component
public class DaliyAmountSchedule { public class DaliyAmountSchedule {

private final Logger logger = Logger.getLogger(DaliyAmountSchedule.class);
private final Logger logger = LoggerFactory.getLogger(this.getClass());




@Autowired @Autowired


+ 3
- 2
mallinkAdmin/src/main/java/com/iformall/schedule/MsgSendingSchedule.java View File

@@ -6,7 +6,8 @@ import com.iformall.domain.po.WxMsgConfig;
import com.iformall.mapper.WxMsgConfigMapper; import com.iformall.mapper.WxMsgConfigMapper;
import com.iformall.mapper.WxMsgMapper; import com.iformall.mapper.WxMsgMapper;
import com.iformall.utils.*; 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.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -16,7 +17,7 @@ import java.util.*;
@Component @Component
public class MsgSendingSchedule { public class MsgSendingSchedule {


private final Logger logger = Logger.getLogger(MsgSendingSchedule.class);
private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired @Autowired
private WxMsgMapper wxMsgMapper; private WxMsgMapper wxMsgMapper;


+ 3
- 3
mallinkAdmin/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java View File

@@ -4,7 +4,8 @@ import com.iformall.domain.po.WxOrder;
import com.iformall.enums.EnumOrderStatus; import com.iformall.enums.EnumOrderStatus;
import com.iformall.mapper.WxOrderMapper; import com.iformall.mapper.WxOrderMapper;
import com.iformall.service.WxOrderService; 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.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -18,8 +19,7 @@ import java.util.Map;


@Component @Component
public class OrderExpiringSchedule { 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分钟 private final int TIME_OUT_VALUE = 15 * 60 * 1000; //15分钟




+ 3
- 3
mallinkAdmin/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java View File

@@ -7,7 +7,8 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;


import org.apache.commons.lang3.StringUtils; 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.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity; import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
@@ -29,8 +30,7 @@ import com.iformall.service.WxUserVisitService;


@Component @Component
public class WxAppVisitSchedule { 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="; private static String visit = "https://api.weixin.qq.com/datacube/getweanalysisappiddailyvisittrend?access_token=";




+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/CouponInjectServiceImpl.java View File

@@ -5,14 +5,14 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;
import com.iformall.common.Result;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.enums.*; import com.iformall.enums.*;
import com.iformall.mapper.CouponInjectMapper; import com.iformall.mapper.CouponInjectMapper;
import com.iformall.service.*; import com.iformall.service.*;
import org.apache.commons.lang3.time.DateUtils; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@@ -22,6 +22,7 @@ import java.util.List;


@Service @Service
public class CouponInjectServiceImpl implements CouponInjectService { public class CouponInjectServiceImpl implements CouponInjectService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired @Autowired
CouponInjectMapper couponInjectMapper; CouponInjectMapper couponInjectMapper;
@@ -33,7 +34,6 @@ public class CouponInjectServiceImpl implements CouponInjectService {
WxCUserTagsService wxCUserTagsService; WxCUserTagsService wxCUserTagsService;
@Autowired @Autowired
WxCouponActionLogService wxCouponActionLogService; WxCouponActionLogService wxCouponActionLogService;
private Logger logger = Logger.getLogger(getClass());




@Override @Override


+ 3
- 2
mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java View File

@@ -12,8 +12,9 @@ import com.iformall.service.DataTowerService;
import com.iformall.utils.DateUtils; import com.iformall.utils.DateUtils;
import com.iformall.utils.HashUtil; import com.iformall.utils.HashUtil;
import com.iformall.utils.HttpUtil; import com.iformall.utils.HttpUtil;
import org.apache.log4j.Logger;
import org.apache.shiro.codec.Base64; import org.apache.shiro.codec.Base64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@@ -25,7 +26,7 @@ import java.util.stream.Collectors;
@Service @Service
public class DataTowerServiceImpl implements DataTowerService { public class DataTowerServiceImpl implements DataTowerService {


private Logger logger = Logger.getLogger(getClass());
private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired @Autowired
WxShopMapper wxShopMapper; WxShopMapper wxShopMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java View File

@@ -6,6 +6,8 @@ import com.iformall.common.IdWorker;
import com.iformall.domain.po.MallPermission; import com.iformall.domain.po.MallPermission;
import com.iformall.mapper.MallPermissionMapper; import com.iformall.mapper.MallPermissionMapper;
import com.iformall.service.MallPermissionService; import com.iformall.service.MallPermissionService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@@ -13,6 +15,7 @@ import java.util.List;


@Service @Service
public class MallPermissionServiceImpl implements MallPermissionService { public class MallPermissionServiceImpl implements MallPermissionService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
MallPermissionMapper mallPermissionMapper; MallPermissionMapper mallPermissionMapper;


+ 4
- 0
mallinkService/src/main/java/com/iformall/service/impl/MallRolePermissionServiceImpl.java View File

@@ -6,11 +6,15 @@ import com.iformall.common.IdWorker;
import com.iformall.domain.po.MallRolePermission; import com.iformall.domain.po.MallRolePermission;
import com.iformall.mapper.MallRolePermissionMapper; import com.iformall.mapper.MallRolePermissionMapper;
import com.iformall.service.MallRolePermissionService; import com.iformall.service.MallRolePermissionService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@Service @Service
public class MallRolePermissionServiceImpl implements MallRolePermissionService { public class MallRolePermissionServiceImpl implements MallRolePermissionService {

private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
MallRolePermissionMapper mallUserRolePermissionMapper; MallRolePermissionMapper mallUserRolePermissionMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/MallRoleServiceImpl.java View File

@@ -6,6 +6,8 @@ import com.iformall.common.IdWorker;
import com.iformall.domain.po.MallRole; import com.iformall.domain.po.MallRole;
import com.iformall.mapper.MallRoleMapper; import com.iformall.mapper.MallRoleMapper;
import com.iformall.service.MallRoleService; import com.iformall.service.MallRoleService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@@ -15,6 +17,7 @@ import java.util.Map;


@Service @Service
public class MallRoleServiceImpl implements MallRoleService { public class MallRoleServiceImpl implements MallRoleService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
MallRoleMapper mallRoleMapper; MallRoleMapper mallRoleMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/MallUserRoleServiceImpl.java View File

@@ -6,6 +6,8 @@ import com.iformall.common.IdWorker;
import com.iformall.domain.po.MallUserRole; import com.iformall.domain.po.MallUserRole;
import com.iformall.mapper.MallUserRoleMapper; import com.iformall.mapper.MallUserRoleMapper;
import com.iformall.service.MallUserRoleService; import com.iformall.service.MallUserRoleService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@@ -13,6 +15,7 @@ import java.util.List;


@Service @Service
public class MallUserRoleServiceImpl implements MallUserRoleService { public class MallUserRoleServiceImpl implements MallUserRoleService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
MallUserRoleMapper mallUserRoleMapper; MallUserRoleMapper mallUserRoleMapper;


+ 3
- 1
mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java View File

@@ -11,6 +11,8 @@ import com.iformall.domain.vo.TouchUsersReportVo;
import com.iformall.enums.EnumCouponType; import com.iformall.enums.EnumCouponType;
import com.iformall.mapper.*; import com.iformall.mapper.*;
import com.iformall.service.MarkingDataReportService; import com.iformall.service.MarkingDataReportService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@@ -23,7 +25,7 @@ import java.util.stream.Collectors;
*/ */
@Service @Service
public class MarkingDataReportServiceImpl implements MarkingDataReportService { public class MarkingDataReportServiceImpl implements MarkingDataReportService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired @Autowired
private WxCouponOrderMapper wxCouponOrderMapper; private WxCouponOrderMapper wxCouponOrderMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/PushLimitServiceImpl.java View File

@@ -6,6 +6,8 @@ import com.iformall.common.IdWorker;
import com.iformall.domain.po.PushLimit; import com.iformall.domain.po.PushLimit;
import com.iformall.mapper.PushLimitMapper; import com.iformall.mapper.PushLimitMapper;
import com.iformall.service.PushLimitService; import com.iformall.service.PushLimitService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@@ -13,6 +15,7 @@ import java.util.List;


@Service @Service
public class PushLimitServiceImpl implements PushLimitService { public class PushLimitServiceImpl implements PushLimitService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
PushLimitMapper pushLimitMapper; PushLimitMapper pushLimitMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxAdminLogServiceImpl.java View File

@@ -6,12 +6,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxAdminLog; import com.iformall.domain.po.WxAdminLog;
import com.iformall.mapper.WxAdminLogMapper; import com.iformall.mapper.WxAdminLogMapper;
import com.iformall.service.WxAdminLogService; import com.iformall.service.WxAdminLogService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxAdminLogServiceImpl implements WxAdminLogService { public class WxAdminLogServiceImpl implements WxAdminLogService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxAdminLogMapper wxAdminLogMapper; WxAdminLogMapper wxAdminLogMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java View File

@@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxAppinfo;
import com.iformall.mapper.WxAppinfoMapper; import com.iformall.mapper.WxAppinfoMapper;
import com.iformall.service.WxAppinfoService; import com.iformall.service.WxAppinfoService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxAppinfoServiceImpl implements WxAppinfoService { public class WxAppinfoServiceImpl implements WxAppinfoService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxAppinfoMapper wxAppinfoMapper; WxAppinfoMapper wxAppinfoMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBLogServiceImpl.java View File

@@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxBLog; import com.iformall.domain.po.WxBLog;
import com.iformall.mapper.WxBLogMapper; import com.iformall.mapper.WxBLogMapper;
import com.iformall.service.WxBLogService; import com.iformall.service.WxBLogService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxBLogServiceImpl implements WxBLogService { public class WxBLogServiceImpl implements WxBLogService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxBLogMapper wxBLogMapper; WxBLogMapper wxBLogMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java View File

@@ -7,11 +7,14 @@ import com.iformall.common.IdWorker;
import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxBillRent;
import com.iformall.mapper.WxBillRentMapper; import com.iformall.mapper.WxBillRentMapper;
import com.iformall.service.WxBillRentService; import com.iformall.service.WxBillRentService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@Service @Service
public class WxBillRentServiceImpl implements WxBillRentService { public class WxBillRentServiceImpl implements WxBillRentService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxBillRentMapper wxBillRentMapper; WxBillRentMapper wxBillRentMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java View File

@@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxBusiness; import com.iformall.domain.po.WxBusiness;
import com.iformall.mapper.WxBusinessMapper; import com.iformall.mapper.WxBusinessMapper;
import com.iformall.service.WxBusinessService; import com.iformall.service.WxBusinessService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxBusinessServiceImpl implements WxBusinessService { public class WxBusinessServiceImpl implements WxBusinessService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxBusinessMapper wxBusinessMapper; WxBusinessMapper wxBusinessMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCLogServiceImpl.java View File

@@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxCLog; import com.iformall.domain.po.WxCLog;
import com.iformall.mapper.WxCLogMapper; import com.iformall.mapper.WxCLogMapper;
import com.iformall.service.WxCLogService; import com.iformall.service.WxCLogService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxCLogServiceImpl implements WxCLogService { public class WxCLogServiceImpl implements WxCLogService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxCLogMapper wxCLogMapper; WxCLogMapper wxCLogMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCUserCarServiceImpl.java View File

@@ -6,12 +6,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxCUserCar; import com.iformall.domain.po.WxCUserCar;
import com.iformall.mapper.WxCUserCarMapper; import com.iformall.mapper.WxCUserCarMapper;
import com.iformall.service.WxCUserCarService; import com.iformall.service.WxCUserCarService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxCUserCarServiceImpl implements WxCUserCarService { public class WxCUserCarServiceImpl implements WxCUserCarService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxCUserCarMapper wxCUserCarMapper; WxCUserCarMapper wxCUserCarMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java View File

@@ -11,12 +11,15 @@ import com.iformall.mapper.WxCUserMapper;
import com.iformall.mapper.WxCouponOrderMapper; import com.iformall.mapper.WxCouponOrderMapper;
import com.iformall.mapper.WxScoreRulesMapper; import com.iformall.mapper.WxScoreRulesMapper;
import com.iformall.service.WxCUserService; import com.iformall.service.WxCUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxCUserServiceImpl implements WxCUserService { public class WxCUserServiceImpl implements WxCUserService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired @Autowired
WxCUserMapper wxCUserMapper; WxCUserMapper wxCUserMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java View File

@@ -6,6 +6,8 @@ import java.util.List;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxCUserBasicInfo;
import com.iformall.mapper.WxCUserBasicInfoMapper; import com.iformall.mapper.WxCUserBasicInfoMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@@ -23,6 +25,7 @@ import com.iformall.service.WxCUserTagsService;


@Service @Service
public class WxCUserTagsServiceImpl implements WxCUserTagsService { public class WxCUserTagsServiceImpl implements WxCUserTagsService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxCUserTagsMapper wxCUserTagsMapper; WxCUserTagsMapper wxCUserTagsMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java View File

@@ -17,6 +17,8 @@ import com.iformall.mapper.WxCouponChannelMapper;
import com.iformall.service.WxCampaignService; import com.iformall.service.WxCampaignService;
import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponChannelService;
import com.iformall.service.WxCouponService; import com.iformall.service.WxCouponService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
@@ -27,6 +29,7 @@ import java.util.List;


@Service @Service
public class WxCampaignServiceImpl implements WxCampaignService { public class WxCampaignServiceImpl implements WxCampaignService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxCampaignMapper wxCampaignMapper; WxCampaignMapper wxCampaignMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java View File

@@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxCarCmdLog; import com.iformall.domain.po.WxCarCmdLog;
import com.iformall.mapper.WxCarCmdLogMapper; import com.iformall.mapper.WxCarCmdLogMapper;
import com.iformall.service.WxCarCmdLogService; import com.iformall.service.WxCarCmdLogService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { public class WxCarCmdLogServiceImpl implements WxCarCmdLogService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxCarCmdLogMapper wxCarCmdLogMapper; WxCarCmdLogMapper wxCarCmdLogMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxChannelServiceImpl.java View File

@@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxChannel; import com.iformall.domain.po.WxChannel;
import com.iformall.mapper.WxChannelMapper; import com.iformall.mapper.WxChannelMapper;
import com.iformall.service.WxChannelService; import com.iformall.service.WxChannelService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxChannelServiceImpl implements WxChannelService { public class WxChannelServiceImpl implements WxChannelService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxChannelMapper wxChannelMapper; WxChannelMapper wxChannelMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java View File

@@ -6,12 +6,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxCouponActionLog; import com.iformall.domain.po.WxCouponActionLog;
import com.iformall.mapper.WxCouponActionLogMapper; import com.iformall.mapper.WxCouponActionLogMapper;
import com.iformall.service.WxCouponActionLogService; import com.iformall.service.WxCouponActionLogService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxCouponActionLogServiceImpl implements WxCouponActionLogService { public class WxCouponActionLogServiceImpl implements WxCouponActionLogService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxCouponActionLogMapper wxCouponActionLogMapper; WxCouponActionLogMapper wxCouponActionLogMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponCarServiceImpl.java View File

@@ -7,11 +7,14 @@ import com.iformall.domain.po.WxCouponCar;
import com.iformall.domain.vo.WxCouponCarVo; import com.iformall.domain.vo.WxCouponCarVo;
import com.iformall.mapper.WxCouponCarMapper; import com.iformall.mapper.WxCouponCarMapper;
import com.iformall.service.WxCouponCarService; import com.iformall.service.WxCouponCarService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@Service @Service
public class WxCouponCarServiceImpl implements WxCouponCarService { public class WxCouponCarServiceImpl implements WxCouponCarService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxCouponCarMapper wxCouponCarMapper; WxCouponCarMapper wxCouponCarMapper;


+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java View File

@@ -16,13 +16,15 @@ import com.iformall.mapper.WxCouponChannelMapper;
import com.iformall.mapper.WxMerchantMapper; import com.iformall.mapper.WxMerchantMapper;
import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponChannelService;
import com.iformall.service.WxCouponService; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxCouponChannelServiceImpl implements WxCouponChannelService { public class WxCouponChannelServiceImpl implements WxCouponChannelService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxCouponChannelMapper wxCouponChannelMapper; WxCouponChannelMapper wxCouponChannelMapper;
@@ -31,8 +33,6 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService {
@Autowired @Autowired
WxMerchantMapper wxMerchantMapper; WxMerchantMapper wxMerchantMapper;


private Logger logger = Logger.getLogger(getClass());

/** /**
* B端业务端 * B端业务端
* @param record * @param record


+ 3
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java View File

@@ -23,8 +23,9 @@ import com.iformall.service.*;
import com.iformall.utils.DateUtils; import com.iformall.utils.DateUtils;
import com.iformall.utils.MaUtil; import com.iformall.utils.MaUtil;
import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.error.WxErrorException;
import org.apache.log4j.Logger;
import org.apache.poi.ss.usermodel.Workbook; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
@@ -39,7 +40,7 @@ import java.util.*;


@Service @Service
public class WxCouponOrderServiceImpl implements WxCouponOrderService { public class WxCouponOrderServiceImpl implements WxCouponOrderService {
private Logger logger = Logger.getLogger(WxCouponOrderServiceImpl.class);
private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired @Autowired
WxCouponOrderMapper wxCouponOrderMapper; WxCouponOrderMapper wxCouponOrderMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java View File

@@ -8,6 +8,8 @@ import com.iformall.enums.*;
import com.iformall.mapper.WxCouponOrderMapper; import com.iformall.mapper.WxCouponOrderMapper;
import com.iformall.mapper.WxCouponSendMapper; import com.iformall.mapper.WxCouponSendMapper;
import com.iformall.service.*; import com.iformall.service.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -16,6 +18,7 @@ import java.util.List;


@Service @Service
public class WxCouponSendServiceImpl implements WxCouponSendService { public class WxCouponSendServiceImpl implements WxCouponSendService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired @Autowired
WxCouponSendMapper wxCouponSendMapper; WxCouponSendMapper wxCouponSendMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java View File

@@ -11,6 +11,8 @@ import com.iformall.mapper.WxCouponMapper;
import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponChannelService;
import com.iformall.service.WxCouponSendService; import com.iformall.service.WxCouponSendService;
import com.iformall.service.WxCouponService; import com.iformall.service.WxCouponService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;
@@ -18,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional;


@Service @Service
public class WxCouponServiceImpl implements WxCouponService { public class WxCouponServiceImpl implements WxCouponService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired @Autowired
WxCouponMapper wxCouponMapper; WxCouponMapper wxCouponMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponSpreadServiceImpl.java View File

@@ -6,12 +6,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxCouponSpread; import com.iformall.domain.po.WxCouponSpread;
import com.iformall.mapper.WxCouponSpreadMapper; import com.iformall.mapper.WxCouponSpreadMapper;
import com.iformall.service.WxCouponSpreadService; import com.iformall.service.WxCouponSpreadService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxCouponSpreadServiceImpl implements WxCouponSpreadService { public class WxCouponSpreadServiceImpl implements WxCouponSpreadService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxCouponSpreadMapper wxCouponSpreadMapper; WxCouponSpreadMapper wxCouponSpreadMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponTypeServiceImpl.java View File

@@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxCouponType; import com.iformall.domain.po.WxCouponType;
import com.iformall.mapper.WxCouponTypeMapper; import com.iformall.mapper.WxCouponTypeMapper;
import com.iformall.service.WxCouponTypeService; import com.iformall.service.WxCouponTypeService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxCouponTypeServiceImpl implements WxCouponTypeService { public class WxCouponTypeServiceImpl implements WxCouponTypeService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxCouponTypeMapper wxCouponTypeMapper; WxCouponTypeMapper wxCouponTypeMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxDateAmountRecordServiceImpl.java View File

@@ -6,12 +6,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxDateAmountRecord; import com.iformall.domain.po.WxDateAmountRecord;
import com.iformall.mapper.WxDateAmountRecordMapper; import com.iformall.mapper.WxDateAmountRecordMapper;
import com.iformall.service.WxDateAmountRecordService; import com.iformall.service.WxDateAmountRecordService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxDateAmountRecordServiceImpl implements WxDateAmountRecordService { public class WxDateAmountRecordServiceImpl implements WxDateAmountRecordService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxDateAmountRecordMapper wxDateAmountRecordMapper; WxDateAmountRecordMapper wxDateAmountRecordMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxGroupServiceImpl.java View File

@@ -6,11 +6,14 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxGroup; import com.iformall.domain.po.WxGroup;
import com.iformall.mapper.WxGroupMapper; import com.iformall.mapper.WxGroupMapper;
import com.iformall.service.WxGroupService; import com.iformall.service.WxGroupService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@Service @Service
public class WxGroupServiceImpl implements WxGroupService { public class WxGroupServiceImpl implements WxGroupService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxGroupMapper wxGroupMapper; WxGroupMapper wxGroupMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java View File

@@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxLevelConfig; import com.iformall.domain.po.WxLevelConfig;
import com.iformall.mapper.WxLevelConfigMapper; import com.iformall.mapper.WxLevelConfigMapper;
import com.iformall.service.WxLevelConfigService; import com.iformall.service.WxLevelConfigService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxLevelConfigServiceImpl implements WxLevelConfigService { public class WxLevelConfigServiceImpl implements WxLevelConfigService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxLevelConfigMapper wxLevelConfigMapper; WxLevelConfigMapper wxLevelConfigMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMallApplyServiceImpl.java View File

@@ -20,6 +20,8 @@ import com.iformall.utils.AesUtil;
import com.iformall.utils.HMACSHA256; import com.iformall.utils.HMACSHA256;
import com.iformall.utils.HttpUtil; import com.iformall.utils.HttpUtil;
import com.iformall.utils.RsaUtil; import com.iformall.utils.RsaUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@@ -28,6 +30,7 @@ import java.util.stream.Collectors;


@Service @Service
public class WxMallApplyServiceImpl implements WxMallApplyService { public class WxMallApplyServiceImpl implements WxMallApplyService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxMallApplyMapper wxMallApplyMapper; WxMallApplyMapper wxMallApplyMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java View File

@@ -9,6 +9,8 @@ import com.iformall.domain.po.WxMallFloor;
import com.iformall.mapper.WxMallBuildingMapper; import com.iformall.mapper.WxMallBuildingMapper;
import com.iformall.mapper.WxMallFloorMapper; import com.iformall.mapper.WxMallFloorMapper;
import com.iformall.service.WxMallBuildingService; import com.iformall.service.WxMallBuildingService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@@ -17,6 +19,7 @@ import java.util.stream.Collectors;


@Service @Service
public class WxMallBuildingServiceImpl implements WxMallBuildingService { public class WxMallBuildingServiceImpl implements WxMallBuildingService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxMallBuildingMapper wxMallBuildingMapper; WxMallBuildingMapper wxMallBuildingMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMallConfigServiceImpl.java View File

@@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxMallConfig; import com.iformall.domain.po.WxMallConfig;
import com.iformall.mapper.WxMallConfigMapper; import com.iformall.mapper.WxMallConfigMapper;
import com.iformall.service.WxMallConfigService; import com.iformall.service.WxMallConfigService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxMallConfigServiceImpl implements WxMallConfigService { public class WxMallConfigServiceImpl implements WxMallConfigService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxMallConfigMapper wxMallConfigMapper; WxMallConfigMapper wxMallConfigMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java View File

@@ -7,12 +7,15 @@ import com.iformall.common.ResultData;
import com.iformall.domain.po.WxMallFloor; import com.iformall.domain.po.WxMallFloor;
import com.iformall.mapper.WxMallFloorMapper; import com.iformall.mapper.WxMallFloorMapper;
import com.iformall.service.WxMallFloorService; import com.iformall.service.WxMallFloorService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxMallFloorServiceImpl implements WxMallFloorService { public class WxMallFloorServiceImpl implements WxMallFloorService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxMallFloorMapper wxMallFloorMapper; WxMallFloorMapper wxMallFloorMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java View File

@@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxMall;
import com.iformall.mapper.WxMallMapper; import com.iformall.mapper.WxMallMapper;
import com.iformall.service.WxMallService; import com.iformall.service.WxMallService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxMallServiceImpl implements WxMallService { public class WxMallServiceImpl implements WxMallService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxMallMapper wxMallMapper; WxMallMapper wxMallMapper;


+ 13
- 12
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java View File

@@ -1,11 +1,9 @@
package com.iformall.service.impl; package com.iformall.service.impl;


import java.util.*;
import java.util.stream.Collectors;

import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.common.IdWorker;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxAppinfo;
import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxMerchantBUser;
@@ -16,15 +14,18 @@ import com.iformall.mapper.WxAppinfoMapper;
import com.iformall.mapper.WxMerchantBUserMapper; import com.iformall.mapper.WxMerchantBUserMapper;
import com.iformall.mapper.WxMsgValidationcodeMapper; import com.iformall.mapper.WxMsgValidationcodeMapper;
import com.iformall.service.WxMerchantBUserService; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker;

import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;


@Service @Service
public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { public class WxMerchantBUserServiceImpl implements WxMerchantBUserService {

private Logger logger = Logger.getLogger(WxMerchantBUserServiceImpl.class);
private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired @Autowired
WxAppinfoMapper wxAppinfoMapper; WxAppinfoMapper wxAppinfoMapper;
@@ -92,7 +93,7 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService {
bUser.setPhone(phone); bUser.setPhone(phone);
bUser.setStatus(EnumMerchantBUserStatus.VALID.getCode()); bUser.setStatus(EnumMerchantBUserStatus.VALID.getCode());
List<WxMerchantBUser> list = wxMerchantBUserMapper.findList(bUser); List<WxMerchantBUser> list = wxMerchantBUserMapper.findList(bUser);
return list.size()>=1?true:false;
return list.size() >= 1 ? true : false;
} }


@Override @Override
@@ -106,20 +107,20 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService {
Date currentdate = new Date(); Date currentdate = new Date();
wxmsgvalidationcodelist = wxmsgvalidationcodelist.stream().filter(validationcode -> wxmsgvalidationcodelist = wxmsgvalidationcodelist.stream().filter(validationcode ->
validationcode.getExpiretime().after(currentdate)).collect(Collectors.toList()); validationcode.getExpiretime().after(currentdate)).collect(Collectors.toList());
if(wxmsgvalidationcodelist.size()>0){
if (wxmsgvalidationcodelist.size() > 0) {
//更新 //更新
WxMerchantBUser bUser = new WxMerchantBUser(); WxMerchantBUser bUser = new WxMerchantBUser();
bUser.setTenantId(appinfo.getTenantId()); bUser.setTenantId(appinfo.getTenantId());
bUser.setPhone(phone); bUser.setPhone(phone);
bUser.setAppId(appId); bUser.setAppId(appId);
List<WxMerchantBUser> list = wxMerchantBUserMapper.findList(bUser); List<WxMerchantBUser> list = wxMerchantBUserMapper.findList(bUser);
if(list.size()>0){
if (list.size() > 0) {
bUser = list.get(0); bUser = list.get(0);


bUser.setBUserPwd(pwd); bUser.setBUserPwd(pwd);
try{
try {
wxMerchantBUserMapper.updateByPrimaryKeySelective(bUser); wxMerchantBUserMapper.updateByPrimaryKeySelective(bUser);
}catch (Exception e){
} catch (Exception e) {
logger.error("db failed: 商户-" + bUser.getId() + ", e:" + e.getMessage()); logger.error("db failed: 商户-" + bUser.getId() + ", e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());
} }


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java View File

@@ -8,6 +8,8 @@ import com.iformall.enums.*;
import com.iformall.mapper.*; import com.iformall.mapper.*;
import com.iformall.service.WxMerchantService; import com.iformall.service.WxMerchantService;
import com.iformall.service.WxProfitSharingReceiverService; import com.iformall.service.WxProfitSharingReceiverService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -18,6 +20,7 @@ import java.util.stream.Collectors;


@Service @Service
public class WxMerchantServiceImpl implements WxMerchantService { public class WxMerchantServiceImpl implements WxMerchantService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxMerchantMapper wxMerchantMapper; WxMerchantMapper wxMerchantMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantShopServiceImpl.java View File

@@ -8,6 +8,8 @@ import com.iformall.domain.po.WxShop;
import com.iformall.mapper.WxMerchantShopMapper; import com.iformall.mapper.WxMerchantShopMapper;
import com.iformall.mapper.WxShopMapper; import com.iformall.mapper.WxShopMapper;
import com.iformall.service.WxMerchantShopService; import com.iformall.service.WxMerchantShopService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@@ -16,6 +18,7 @@ import java.util.List;


@Service @Service
public class WxMerchantShopServiceImpl implements WxMerchantShopService { public class WxMerchantShopServiceImpl implements WxMerchantShopService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxMerchantShopMapper wxMerchantShopMapper; WxMerchantShopMapper wxMerchantShopMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java View File

@@ -15,12 +15,15 @@ import com.iformall.service.WxMerchantTradeDailyService;
import com.iformall.service.WxMallService; import com.iformall.service.WxMallService;
import com.iformall.service.WxMerchantBUserService; import com.iformall.service.WxMerchantBUserService;
import com.iformall.service.WxMerchantService; import com.iformall.service.WxMerchantService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyService { public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxMerchantTradeDailyMapper wxMerchantTradeDailyMapper; WxMerchantTradeDailyMapper wxMerchantTradeDailyMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java View File

@@ -13,6 +13,8 @@ import com.iformall.mapper.WxMsgConfigMapper;
import com.iformall.mapper.WxMsgModelMapper; import com.iformall.mapper.WxMsgModelMapper;
import com.iformall.mapper.WxMsgValidationcodeModelMapper; import com.iformall.mapper.WxMsgValidationcodeModelMapper;
import com.iformall.service.WxMsgCallbackService; import com.iformall.service.WxMsgCallbackService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@@ -22,6 +24,7 @@ import java.util.Map;


@Service @Service
public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { public class WxMsgCallbackServiceImpl implements WxMsgCallbackService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxMsgCallbackMapper wxMsgCallbackMapper; WxMsgCallbackMapper wxMsgCallbackMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java View File

@@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxMsgConfig; import com.iformall.domain.po.WxMsgConfig;
import com.iformall.mapper.WxMsgConfigMapper; import com.iformall.mapper.WxMsgConfigMapper;
import com.iformall.service.WxMsgConfigService; import com.iformall.service.WxMsgConfigService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxMsgConfigServiceImpl implements WxMsgConfigService { public class WxMsgConfigServiceImpl implements WxMsgConfigService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxMsgConfigMapper wxMsgConfigMapper; WxMsgConfigMapper wxMsgConfigMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java View File

@@ -16,6 +16,8 @@ import com.iformall.utils.AesUtil;
import com.iformall.utils.HMACSHA256; import com.iformall.utils.HMACSHA256;
import com.iformall.utils.HttpUtil; import com.iformall.utils.HttpUtil;
import com.iformall.utils.RsaUtil; import com.iformall.utils.RsaUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@@ -23,6 +25,7 @@ import java.util.*;


@Service @Service
public class WxMsgModelServiceImpl implements WxMsgModelService { public class WxMsgModelServiceImpl implements WxMsgModelService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired @Autowired
WxMsgModelMapper wxMsgModelMapper; WxMsgModelMapper wxMsgModelMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java View File

@@ -21,6 +21,8 @@ import com.iformall.utils.AesUtil;
import com.iformall.utils.HMACSHA256; import com.iformall.utils.HMACSHA256;
import com.iformall.utils.HttpUtil; import com.iformall.utils.HttpUtil;
import com.iformall.utils.RsaUtil; import com.iformall.utils.RsaUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@@ -29,6 +31,7 @@ import java.util.*;


@Service @Service
public class WxMsgServiceImpl implements WxMsgService { public class WxMsgServiceImpl implements WxMsgService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired @Autowired
WxMsgMapper wxMsgMapper; WxMsgMapper wxMsgMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMsgSignatureServiceImpl.java View File

@@ -7,12 +7,15 @@ import com.iformall.common.ResultData;
import com.iformall.domain.po.WxMsgSignature; import com.iformall.domain.po.WxMsgSignature;
import com.iformall.mapper.WxMsgSignatureMapper; import com.iformall.mapper.WxMsgSignatureMapper;
import com.iformall.service.WxMsgSignatureService; import com.iformall.service.WxMsgSignatureService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxMsgSignatureServiceImpl implements WxMsgSignatureService { public class WxMsgSignatureServiceImpl implements WxMsgSignatureService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxMsgSignatureMapper wxMsgSignatureMapper; WxMsgSignatureMapper wxMsgSignatureMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java View File

@@ -16,6 +16,8 @@ import com.iformall.utils.AesUtil;
import com.iformall.utils.HMACSHA256; import com.iformall.utils.HMACSHA256;
import com.iformall.utils.HttpUtil; import com.iformall.utils.HttpUtil;
import com.iformall.utils.RsaUtil; import com.iformall.utils.RsaUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@@ -23,6 +25,7 @@ import java.util.*;


@Service @Service
public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeModelService { public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeModelService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxMsgValidationcodeModelMapper wxMsgValidationcodeModelMapper; WxMsgValidationcodeModelMapper wxMsgValidationcodeModelMapper;


+ 3
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java View File

@@ -14,7 +14,8 @@ import com.iformall.utils.AesUtil;
import com.iformall.utils.HMACSHA256; import com.iformall.utils.HMACSHA256;
import com.iformall.utils.HttpUtil; import com.iformall.utils.HttpUtil;
import com.iformall.utils.RsaUtil; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@@ -24,9 +25,7 @@ import java.util.stream.Collectors;
@Service @Service
public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeService { public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeService {



private Logger logger = Logger.getLogger(WxMsgValidationcodeServiceImpl.class);

private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired @Autowired
WxMsgValidationcodeMapper wxMsgValidationcodeMapper; WxMsgValidationcodeMapper wxMsgValidationcodeMapper;


+ 3
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java View File

@@ -14,7 +14,8 @@ import com.iformall.service.WxCUserService;
import com.iformall.service.WxOrderService; import com.iformall.service.WxOrderService;
import com.iformall.service.WxPayOrderService; import com.iformall.service.WxPayOrderService;
import com.iformall.utils.RedisLock; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
@@ -27,7 +28,7 @@ import java.util.List;
@Service @Service
public class WxOrderServiceImpl implements WxOrderService { public class WxOrderServiceImpl implements WxOrderService {


private Logger logger = Logger.getLogger(getClass());
private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired @Autowired
RedisLock redisLock; RedisLock redisLock;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxParkServiceImpl.java View File

@@ -6,12 +6,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxPark; import com.iformall.domain.po.WxPark;
import com.iformall.mapper.WxParkMapper; import com.iformall.mapper.WxParkMapper;
import com.iformall.service.WxParkService; import com.iformall.service.WxParkService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxParkServiceImpl implements WxParkService { public class WxParkServiceImpl implements WxParkService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxParkMapper wxParkMapper; WxParkMapper wxParkMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxPayAccountServiceImpl.java View File

@@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxPayAccount; import com.iformall.domain.po.WxPayAccount;
import com.iformall.mapper.WxPayAccountMapper; import com.iformall.mapper.WxPayAccountMapper;
import com.iformall.service.WxPayAccountService; import com.iformall.service.WxPayAccountService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxPayAccountServiceImpl implements WxPayAccountService { public class WxPayAccountServiceImpl implements WxPayAccountService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxPayAccountMapper wxPayAccountMapper; WxPayAccountMapper wxPayAccountMapper;


+ 24
- 21
mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java View File

@@ -1,13 +1,11 @@
package com.iformall.service.impl; package com.iformall.service.impl;


import java.text.ParseException;
import java.util.*;

import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.common.IdWorker;
import com.iformall.common.Result; import com.iformall.common.Result;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
@@ -17,19 +15,24 @@ import com.iformall.mapper.*;
import com.iformall.pay.*; import com.iformall.pay.*;
import com.iformall.service.WxOrderService; import com.iformall.service.WxOrderService;
import com.iformall.service.WxPayOrderService; 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.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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;


import java.text.ParseException;
import java.util.*;

@Service @Service
public class WxPayOrderServiceImpl implements WxPayOrderService { public class WxPayOrderServiceImpl implements WxPayOrderService {

private Logger logger = Logger.getLogger(getClass());
private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired @Autowired
WxAppinfoMapper wxAppinfoMapper; WxAppinfoMapper wxAppinfoMapper;
@@ -148,7 +151,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
record.setShare(isShare.getCode()); record.setShare(isShare.getCode());
if (isShare == EnumPayShare.YES) { 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(); Integer share_amount = record.getPayAmount() - dChargeFee.intValue();
record.setShareAmount(share_amount); record.setShareAmount(share_amount);
} }
@@ -184,7 +187,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
wxPayOrderP.setProduct_id(String.valueOf(order.getId())); // 订单ID wxPayOrderP.setProduct_id(String.valueOf(order.getId())); // 订单ID
wxPayOrderP.setTime_start(Utility.getDataFormatStringYYYYMMDDHHmmss(currentDate)); wxPayOrderP.setTime_start(Utility.getDataFormatStringYYYYMMDDHHmmss(currentDate));
Date futureDate = new Date(); 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.setTime_expire(Utility.getDataFormatStringYYYYMMDDHHmmss(futureDate)); // 15分钟后结束
Map<String, String> payOrderMap = BeanUtils.toStringMap(wxPayOrderP); Map<String, String> payOrderMap = BeanUtils.toStringMap(wxPayOrderP);
wxPayOrderP.setSign(WxPayment.createSign(payOrderMap, payAccount.getApiKey())); wxPayOrderP.setSign(WxPayment.createSign(payOrderMap, payAccount.getApiKey()));
@@ -217,7 +220,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
returnMap.put("nonceStr", noncestr); returnMap.put("nonceStr", noncestr);
returnMap.put("package", "prepay_id=" + prepay_id); returnMap.put("package", "prepay_id=" + prepay_id);
returnMap.put("paySign", signAgent); returnMap.put("paySign", signAgent);
logger.info("back to UI: " +returnMap.toString());
logger.info("back to UI: " + returnMap.toString());
return new ResultData(Result.SUCCESS, "创建支付订单成功", returnMap); return new ResultData(Result.SUCCESS, "创建支付订单成功", returnMap);
} else { } else {
String errMsg = ""; String errMsg = "";
@@ -257,10 +260,10 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
wxPayOrderSP.setProduct_id(String.valueOf(order.getId())); // 订单ID wxPayOrderSP.setProduct_id(String.valueOf(order.getId())); // 订单ID
wxPayOrderSP.setTime_start(Utility.getDataFormatStringYYYYMMDDHHmmss(currentDate)); wxPayOrderSP.setTime_start(Utility.getDataFormatStringYYYYMMDDHHmmss(currentDate));
Date futureDate = new Date(); 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.setTime_expire(Utility.getDataFormatStringYYYYMMDDHHmmss(futureDate)); // 15分钟后结束
wxPayOrderSP.setSign_type("HMAC-SHA256"); wxPayOrderSP.setSign_type("HMAC-SHA256");
if(isShare == EnumPayShare.YES) {
if (isShare == EnumPayShare.YES) {
wxPayOrderSP.setProfit_sharing("Y"); wxPayOrderSP.setProfit_sharing("Y");
} }
Map<String, String> payOrderMap = BeanUtils.toStringMap(wxPayOrderSP); Map<String, String> payOrderMap = BeanUtils.toStringMap(wxPayOrderSP);
@@ -296,7 +299,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
returnMap.put("package", "prepay_id=" + prepay_id); returnMap.put("package", "prepay_id=" + prepay_id);
returnMap.put("paySign", signAgent); returnMap.put("paySign", signAgent);
returnMap.put("signType", "HMAC-SHA256"); 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); return new ResultData(Result.SUCCESS, "创建支付订单成功", returnMap);
} else { } else {
String errMsg = ""; String errMsg = "";
@@ -333,7 +336,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
wxPayOrderP.setProduct_id(String.valueOf(order.getId())); // 订单ID wxPayOrderP.setProduct_id(String.valueOf(order.getId())); // 订单ID
wxPayOrderP.setTime_start(Utility.getDataFormatStringYYYYMMDDHHmmss(currentDate)); wxPayOrderP.setTime_start(Utility.getDataFormatStringYYYYMMDDHHmmss(currentDate));
Date futureDate = new Date(); 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.setTime_expire(Utility.getDataFormatStringYYYYMMDDHHmmss(futureDate)); // 15分钟后结束
wxPayOrderP.setSign(WxPayment.createSign(BeanUtils.toStringMap(wxPayOrderP), payAccount.getApiKey())); wxPayOrderP.setSign(WxPayment.createSign(BeanUtils.toStringMap(wxPayOrderP), payAccount.getApiKey()));
Map<String, String> returnMap = BeanUtils.toStringMap(wxPayOrderP); Map<String, String> returnMap = BeanUtils.toStringMap(wxPayOrderP);
@@ -347,9 +350,9 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
} }


// TODO // TODO

/** /**
* 微信订单查询 * 微信订单查询
*
*/ */
@Override @Override
public ResultData payOrderQuery(WxAppinfo appInfo, WxPayOrder record) { public ResultData payOrderQuery(WxAppinfo appInfo, WxPayOrder record) {
@@ -414,7 +417,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
} }
} catch (RuntimeException e) { } catch (RuntimeException e) {
throw new MallinkException(ErrorCode.PAY_ORDER_ERROR.getCode(), e.getMessage()); 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()); throw new MallinkException(ErrorCode.PAY_ORDER_ERROR.getCode(), e.getMessage());
} }
} else { } else {
@@ -480,7 +483,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
} }
} catch (RuntimeException e) { } catch (RuntimeException e) {
throw new MallinkException(ErrorCode.PAY_ORDER_ERROR.getCode(), e.getMessage()); 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()); throw new MallinkException(ErrorCode.PAY_ORDER_ERROR.getCode(), e.getMessage());
} }
} }
@@ -829,7 +832,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
payOrderQ.setTenantId(order.getTenantId()); payOrderQ.setTenantId(order.getTenantId());
payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_WAY_WAIT.getCode()); payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_WAY_WAIT.getCode());
List<WxPayOrder> payOrders = wxPayOrderMapper.select(payOrderQ); List<WxPayOrder> payOrders = wxPayOrderMapper.select(payOrderQ);
for(WxPayOrder payOrder: payOrders) {
for (WxPayOrder payOrder : payOrders) {
payOrderClose(appInfo, payOrder); payOrderClose(appInfo, payOrder);
} }
} }
@@ -910,10 +913,10 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
wxPayOrderMapper.deleteByPrimaryKey(id); wxPayOrderMapper.deleteByPrimaryKey(id);
} }


public static void main(String [] args) {
public static void main(String[] args) {
Integer v = 50; Integer v = 50;
Integer rate = 6; 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(); Integer share_amount = v - dChargeFee.intValue();
System.out.println("share value " + share_amount); System.out.println("share value " + share_amount);
} }


+ 3
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java View File

@@ -20,7 +20,8 @@ import com.iformall.pay.WxProfitSharingQueryP;
import com.iformall.service.WxProfitSharingOrderService; import com.iformall.service.WxProfitSharingOrderService;
import com.iformall.utils.BeanUtils; import com.iformall.utils.BeanUtils;
import com.iformall.utils.Utility; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;
@@ -30,7 +31,7 @@ import org.springframework.transaction.annotation.Transactional;


@Service @Service
public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderService { public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderService {
private Logger logger = Logger.getLogger(getClass());
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxProfitSharingOrderMapper wxProfitSharingOrderMapper; WxProfitSharingOrderMapper wxProfitSharingOrderMapper;


+ 20
- 18
mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java View File

@@ -1,18 +1,20 @@
package com.iformall.service.impl; package com.iformall.service.impl;


import java.util.*;

import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.common.IdWorker;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxAppinfo;
import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxPayAccount; import com.iformall.domain.po.WxPayAccount;
import com.iformall.domain.po.WxProfitSharingReceiver; 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.WxAppinfoMapper;
import com.iformall.mapper.WxPayAccountMapper; import com.iformall.mapper.WxPayAccountMapper;
import com.iformall.mapper.WxProfitSharingReceiverMapper; import com.iformall.mapper.WxProfitSharingReceiverMapper;
@@ -22,17 +24,18 @@ import com.iformall.pay.WxProfitSharingReceiverP;
import com.iformall.service.WxProfitSharingReceiverService; import com.iformall.service.WxProfitSharingReceiverService;
import com.iformall.utils.BeanUtils; import com.iformall.utils.BeanUtils;
import com.iformall.utils.Utility; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker;


import java.util.Date;
import java.util.Map;




@Service @Service
public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiverService { 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("{" + final JSONObject errorMap = JSON.parseObject("{" +
"\"SYSTEMERROR\":{\"detail\":\"接口返回错误\",\"reason\":\"系统超时\",\"resolution\":\"系统异常,请用相同参数重新调用\"}," + "\"SYSTEMERROR\":{\"detail\":\"接口返回错误\",\"reason\":\"系统超时\",\"resolution\":\"系统异常,请用相同参数重新调用\"}," +
@@ -44,7 +47,6 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv
"\"USER_NOTEXIST\":{\"detail\":\"分账接受方不存在\",\"reason\":\"分账接受方不存在\",\"resolution\":\"请确认分账接收方类型或者账号无误后重试\"}}"); "\"USER_NOTEXIST\":{\"detail\":\"分账接受方不存在\",\"reason\":\"分账接受方不存在\",\"resolution\":\"请确认分账接收方类型或者账号无误后重试\"}}");





@Autowired @Autowired
WxProfitSharingReceiverMapper wxProfitSharingReceiverMapper; WxProfitSharingReceiverMapper wxProfitSharingReceiverMapper;
@Autowired @Autowired
@@ -67,7 +69,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv
if (record.getId() == null) { if (record.getId() == null) {
//record.setId(UUID.randomUUID().toString().replaceAll("-", "")); //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
record.setId(idWorker.nextId());
wxProfitSharingReceiverMapper.insertSelective(record); wxProfitSharingReceiverMapper.insertSelective(record);
} else { } else {
wxProfitSharingReceiverMapper.updateByPrimaryKeySelective(record); wxProfitSharingReceiverMapper.updateByPrimaryKeySelective(record);
@@ -125,16 +127,16 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv




JSONObject receiverJSON = new JSONObject(); 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()); wxProfitSharingReceiverP.setReceiver(receiverJSON.toJSONString());
String response; String response;
try { try {
wxProfitSharingReceiverP.setSign(WxPayment.createSignHMAC(BeanUtils.toStringMap(wxProfitSharingReceiverP), payAccount.getApiKey())); wxProfitSharingReceiverP.setSign(WxPayment.createSignHMAC(BeanUtils.toStringMap(wxProfitSharingReceiverP), payAccount.getApiKey()));
response = WxProfitSharing.addReceiver(BeanUtils.toStringMap(wxProfitSharingReceiverP)); response = WxProfitSharing.addReceiver(BeanUtils.toStringMap(wxProfitSharingReceiverP));
}catch (Exception e) {
} catch (Exception e) {
logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_ADD_FAILED.getMessage() + e.getMessage()); logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_ADD_FAILED.getMessage() + e.getMessage());
return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_ADD_FAILED, 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")); 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"); 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()); 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"); wxProfitSharingReceiverP.setSign_type("HMAC-SHA256");


JSONObject receiverJSON = new JSONObject(); 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()); wxProfitSharingReceiverP.setReceiver(receiverJSON.toJSONString());
String response; String response;
try { try {
wxProfitSharingReceiverP.setSign(WxPayment.createSignHMAC(BeanUtils.toStringMap(wxProfitSharingReceiverP), payAccount.getApiKey())); wxProfitSharingReceiverP.setSign(WxPayment.createSignHMAC(BeanUtils.toStringMap(wxProfitSharingReceiverP), payAccount.getApiKey()));
response = WxProfitSharing.delReceiver(BeanUtils.toStringMap(wxProfitSharingReceiverP)); response = WxProfitSharing.delReceiver(BeanUtils.toStringMap(wxProfitSharingReceiverP));
}catch (Exception e) {
} catch (Exception e) {
logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getMessage() + e.getMessage()); logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getMessage() + e.getMessage());
return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED, 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")); 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()); logger.error(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getMessage());
return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getCode(), "verifyNotifyHMAC"); return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_DEL_FAILED.getCode(), "verifyNotifyHMAC");
} }


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingResultServiceImpl.java View File

@@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxProfitSharingResult; import com.iformall.domain.po.WxProfitSharingResult;
import com.iformall.mapper.WxProfitSharingResultMapper; import com.iformall.mapper.WxProfitSharingResultMapper;
import com.iformall.service.WxProfitSharingResultService; import com.iformall.service.WxProfitSharingResultService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxProfitSharingResultServiceImpl implements WxProfitSharingResultService { public class WxProfitSharingResultServiceImpl implements WxProfitSharingResultService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxProfitSharingResultMapper wxProfitSharingResultMapper; WxProfitSharingResultMapper wxProfitSharingResultMapper;


+ 50
- 47
mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java View File

@@ -1,12 +1,11 @@
package com.iformall.service.impl; package com.iformall.service.impl;


import java.util.*;

import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.common.IdWorker;
import com.iformall.common.Result; import com.iformall.common.Result;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
@@ -24,24 +23,26 @@ import com.iformall.utils.CipherUtil;
import com.iformall.utils.Utility; import com.iformall.utils.Utility;
import com.iformall.utils.XmlUtil; import com.iformall.utils.XmlUtil;
import org.apache.commons.lang3.StringUtils; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;


import java.util.*;

@Service @Service
public class WxRefundOrderServiceImpl implements WxRefundOrderService { public class WxRefundOrderServiceImpl implements WxRefundOrderService {
private Logger logger = Logger.getLogger(getClass());
private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired @Autowired
WxAppinfoMapper wxAppinfoMapper; WxAppinfoMapper wxAppinfoMapper;
@Autowired
@Autowired
WxRefundOrderMapper wxRefundOrderMapper; WxRefundOrderMapper wxRefundOrderMapper;


@Autowired
@Autowired
WxOrderMapper wxOrderMapper; WxOrderMapper wxOrderMapper;


@Autowired @Autowired
@@ -232,8 +233,8 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public ResultData createRefundOrder(boolean isReal, WxAppinfo appInfo, Long couponOrderId, EnumRefundWay refundWay, Long bUserId) { public ResultData createRefundOrder(boolean isReal, WxAppinfo appInfo, Long couponOrderId, EnumRefundWay refundWay, Long bUserId) {
WxCouponOrder wxCouponOrder = wxCouponOrderMapper.selectByPrimaryKey(couponOrderId); 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); throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL);
} }


@@ -241,8 +242,8 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {


if (refundWay == EnumRefundWay.B) { if (refundWay == EnumRefundWay.B) {
logger.info("B端发起退款: bUserId-" + bUserId); 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); throw new MallinkException(ErrorCode.USER_IS_EMPTY);
} }
// B端用户退款检查一下商户 // B端用户退款检查一下商户
@@ -375,7 +376,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
// 退款订单 // 退款订单
try { try {
int sqlRow = wxRefundOrderMapper.insertSelective(record); int sqlRow = wxRefundOrderMapper.insertSelective(record);
if(sqlRow != 1) {
if (sqlRow != 1) {
logger.error("退款订单数据库插入出错: " + record.toString()); logger.error("退款订单数据库插入出错: " + record.toString());
throw new MallinkException(ErrorCode.DB_FAIL); throw new MallinkException(ErrorCode.DB_FAIL);
} }
@@ -610,6 +611,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {


/** /**
* 微信退款查询 * 微信退款查询
*
* @param appInfo * @param appInfo
* @param record * @param record
*/ */
@@ -660,8 +662,9 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {


/** /**
* 微信退款结果通知 * 微信退款结果通知
* @param paramMap 异步通知参数
* @param payWay 支付方式
*
* @param paramMap 异步通知参数
* @param payWay 支付方式
* @return * @return
*/ */
@Override @Override
@@ -675,23 +678,23 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
// 普通商户号 // 普通商户号
WxAppinfo appinfo = wxAppinfoMapper.findByAppId(appId); WxAppinfo appinfo = wxAppinfoMapper.findByAppId(appId);
if (appinfo == null) { if (appinfo == null) {
logger.error("未找到appid信息:"+appId);
logger.error("未找到appid信息:" + appId);
throw new MallinkException(ErrorCode.APP_ID_NOT_FOUND); throw new MallinkException(ErrorCode.APP_ID_NOT_FOUND);
} }
WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appinfo.getPayId()); WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appinfo.getPayId());
if (payAccount == null) { if (payAccount == null) {
logger.error("未找到mch_id信息:"+mchId);
logger.error("未找到mch_id信息:" + mchId);
throw new MallinkException(ErrorCode.MCH_INFO_NOT_FOUND); throw new MallinkException(ErrorCode.MCH_INFO_NOT_FOUND);
} }
if (!mchId.equalsIgnoreCase(payAccount.getMchId())) { 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); throw new MallinkException(ErrorCode.MCH_INFO_NOT_EQUAL);
} }
String partnerKey = payAccount.getApiKey(); String partnerKey = payAccount.getApiKey();
try { try {
if (payWay == EnumPayWay.PAY_WAY_WEAPP) { if (payWay == EnumPayWay.PAY_WAY_WEAPP) {
if (!"SUCCESS".equals(paramMap.get("return_code"))) { 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(); SortedMap resultMap = new TreeMap();
resultMap.put("return_code", "FAIL"); resultMap.put("return_code", "FAIL");
resultMap.put("return_msg", "订单状态码非SUCCESS"); resultMap.put("return_msg", "订单状态码非SUCCESS");
@@ -706,15 +709,15 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
Long payOrderId = Long.valueOf(payOrderNo); Long payOrderId = Long.valueOf(payOrderNo);
WxPayOrder payOrder = wxPayOrderMapper.selectByPrimaryKey(payOrderId); WxPayOrder payOrder = wxPayOrderMapper.selectByPrimaryKey(payOrderId);
if (payOrder == null) { 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(); SortedMap resultMap = new TreeMap();
resultMap.put("return_code", "FAIL"); resultMap.put("return_code", "FAIL");
resultMap.put("return_msg", "支付订单不存在"); resultMap.put("return_msg", "支付订单不存在");
return XmlUtil.getRequestXml(resultMap); 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(); SortedMap resultMap = new TreeMap();
resultMap.put("return_code", "FAIL"); resultMap.put("return_code", "FAIL");
resultMap.put("return_msg", "支付订单总金额不一致"); resultMap.put("return_msg", "支付订单总金额不一致");
@@ -724,23 +727,23 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
Long refundOrderId = Long.valueOf(refundIdStr); Long refundOrderId = Long.valueOf(refundIdStr);
WxRefundOrder refundOrder = wxRefundOrderMapper.selectByPrimaryKey(refundOrderId); WxRefundOrder refundOrder = wxRefundOrderMapper.selectByPrimaryKey(refundOrderId);
if (refundOrder == null) { 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(); SortedMap resultMap = new TreeMap();
resultMap.put("return_code", "FAIL"); resultMap.put("return_code", "FAIL");
resultMap.put("return_msg", "退款订单不存在"); resultMap.put("return_msg", "退款订单不存在");
return XmlUtil.getRequestXml(resultMap); 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(); SortedMap resultMap = new TreeMap();
resultMap.put("return_code", "FAIL"); resultMap.put("return_code", "FAIL");
resultMap.put("return_msg", "订单总金额不一致"); resultMap.put("return_msg", "订单总金额不一致");
return XmlUtil.getRequestXml(resultMap); 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(); SortedMap resultMap = new TreeMap();
resultMap.put("return_code", "FAIL"); resultMap.put("return_code", "FAIL");
resultMap.put("return_msg", "退款总金额不一致"); resultMap.put("return_msg", "退款总金额不一致");
@@ -749,40 +752,40 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {


// 处理支付成功 // 处理支付成功
handleRefundSuccess(refundOrder, reqMap.get("transaction_id"), reqMap.get("refund_id")); 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(); SortedMap resultMap = new TreeMap();
resultMap.put("return_code", "SUCCESS"); resultMap.put("return_code", "SUCCESS");
resultMap.put("return_msg", "OK"); resultMap.put("return_msg", "OK");
return XmlUtil.getRequestXml(resultMap); return XmlUtil.getRequestXml(resultMap);
} }
} catch (RuntimeException e) { } 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()); throw new MallinkException(ErrorCode.REFUND_ORDER_ERROR.getCode(), e.getMessage());
} catch (Exception e) { } 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()); throw new MallinkException(ErrorCode.REFUND_ORDER_ERROR.getCode(), e.getMessage());
} }
} else { } else {
// 服务号回调 // 服务号回调
WxAppinfo appinfo = wxAppinfoMapper.findByAppId(subAppId); WxAppinfo appinfo = wxAppinfoMapper.findByAppId(subAppId);
if (appinfo == null) { if (appinfo == null) {
logger.error("未找到appid信息:"+appId);
logger.error("未找到appid信息:" + appId);
throw new MallinkException(ErrorCode.APP_ID_NOT_FOUND); throw new MallinkException(ErrorCode.APP_ID_NOT_FOUND);
} }
WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appinfo.getPayId()); WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appinfo.getPayId());
if (payAccount == null) { if (payAccount == null) {
logger.error("未找到mch_id信息:"+mchId);
logger.error("未找到mch_id信息:" + mchId);
throw new MallinkException(ErrorCode.MCH_INFO_NOT_FOUND); throw new MallinkException(ErrorCode.MCH_INFO_NOT_FOUND);
} }
if (!mchId.equalsIgnoreCase(payAccount.getMchId())) { 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); throw new MallinkException(ErrorCode.MCH_INFO_NOT_EQUAL);
} }
String partnerKey = payAccount.getApiKey(); String partnerKey = payAccount.getApiKey();
try { try {
if (payWay == EnumPayWay.PAY_WAY_WEAPP) { if (payWay == EnumPayWay.PAY_WAY_WEAPP) {
if (!"SUCCESS".equals(paramMap.get("return_code"))) { 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(); SortedMap resultMap = new TreeMap();
resultMap.put("return_code", "FAIL"); resultMap.put("return_code", "FAIL");
resultMap.put("return_msg", "订单状态码非SUCCESS"); resultMap.put("return_msg", "订单状态码非SUCCESS");
@@ -804,15 +807,15 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
Long payOrderId = Long.valueOf(payOrderNo); Long payOrderId = Long.valueOf(payOrderNo);
WxPayOrder payOrder = wxPayOrderMapper.selectByPrimaryKey(payOrderId); WxPayOrder payOrder = wxPayOrderMapper.selectByPrimaryKey(payOrderId);
if (payOrder == null) { 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(); SortedMap resultMap = new TreeMap();
resultMap.put("return_code", "FAIL"); resultMap.put("return_code", "FAIL");
resultMap.put("return_msg", "支付订单不存在"); resultMap.put("return_msg", "支付订单不存在");
return XmlUtil.getRequestXml(resultMap); 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(); SortedMap resultMap = new TreeMap();
resultMap.put("return_code", "FAIL"); resultMap.put("return_code", "FAIL");
resultMap.put("return_msg", "支付订单总金额不一致"); resultMap.put("return_msg", "支付订单总金额不一致");
@@ -822,23 +825,23 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
Long refundOrderId = Long.valueOf(refundIdStr); Long refundOrderId = Long.valueOf(refundIdStr);
WxRefundOrder refundOrder = wxRefundOrderMapper.selectByPrimaryKey(refundOrderId); WxRefundOrder refundOrder = wxRefundOrderMapper.selectByPrimaryKey(refundOrderId);
if (refundOrder == null) { 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(); SortedMap resultMap = new TreeMap();
resultMap.put("return_code", "FAIL"); resultMap.put("return_code", "FAIL");
resultMap.put("return_msg", "退款订单不存在"); resultMap.put("return_msg", "退款订单不存在");
return XmlUtil.getRequestXml(resultMap); 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(); SortedMap resultMap = new TreeMap();
resultMap.put("return_code", "FAIL"); resultMap.put("return_code", "FAIL");
resultMap.put("return_msg", "订单总金额不一致"); resultMap.put("return_msg", "订单总金额不一致");
return XmlUtil.getRequestXml(resultMap); 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(); SortedMap resultMap = new TreeMap();
resultMap.put("return_code", "FAIL"); resultMap.put("return_code", "FAIL");
resultMap.put("return_msg", "退款总金额不一致"); resultMap.put("return_msg", "退款总金额不一致");
@@ -847,17 +850,17 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {


// 处理支付成功 // 处理支付成功
handleRefundSuccess(refundOrder, reqMap.get("transaction_id"), reqMap.get("refund_id")); 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(); SortedMap resultMap = new TreeMap();
resultMap.put("return_code", "SUCCESS"); resultMap.put("return_code", "SUCCESS");
resultMap.put("return_msg", "OK"); resultMap.put("return_msg", "OK");
return XmlUtil.getRequestXml(resultMap); return XmlUtil.getRequestXml(resultMap);
} }
} catch (RuntimeException e) { } 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); throw new MallinkException(ErrorCode.REFUND_ORDER_ERROR);
} catch (Exception e) { } 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()); 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()); WxOrder order = wxOrderMapper.selectByPrimaryKey(refundOrder.getOrderId());
if (order == null) { 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); throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND);
} }


@@ -946,7 +949,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
if (record.getId() == null) { if (record.getId() == null) {
//record.setId(UUID.randomUUID().toString().replaceAll("-", "")); //record.setId(UUID.randomUUID().toString().replaceAll("-", ""));
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
record.setId(idWorker.nextId());
wxRefundOrderMapper.insertSelective(record); wxRefundOrderMapper.insertSelective(record);
} else { } else {
wxRefundOrderMapper.updateByPrimaryKeySelective(record); wxRefundOrderMapper.updateByPrimaryKeySelective(record);


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -6,11 +6,14 @@ import com.iformall.common.IdWorker;
import com.iformall.domain.po.WxRentContract; import com.iformall.domain.po.WxRentContract;
import com.iformall.mapper.WxRentContractMapper; import com.iformall.mapper.WxRentContractMapper;
import com.iformall.service.WxRentContractService; import com.iformall.service.WxRentContractService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@Service @Service
public class WxRentContractServiceImpl implements WxRentContractService { public class WxRentContractServiceImpl implements WxRentContractService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxRentContractMapper wxRentContractMapper; WxRentContractMapper wxRentContractMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxScoreHistoryServiceImpl.java View File

@@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxScoreHistory; import com.iformall.domain.po.WxScoreHistory;
import com.iformall.mapper.WxScoreHistoryMapper; import com.iformall.mapper.WxScoreHistoryMapper;
import com.iformall.service.WxScoreHistoryService; import com.iformall.service.WxScoreHistoryService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxScoreHistoryServiceImpl implements WxScoreHistoryService { public class WxScoreHistoryServiceImpl implements WxScoreHistoryService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxScoreHistoryMapper wxScoreHistoryMapper; WxScoreHistoryMapper wxScoreHistoryMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java View File

@@ -10,12 +10,15 @@ import com.iformall.mapper.WxScoreRulesMapper;
import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCUserBasicInfoService;
import com.iformall.service.WxCUserService; import com.iformall.service.WxCUserService;
import com.iformall.service.WxScoreRulesService; import com.iformall.service.WxScoreRulesService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxScoreRulesServiceImpl implements WxScoreRulesService { public class WxScoreRulesServiceImpl implements WxScoreRulesService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxScoreRulesMapper wxScoreRulesMapper; WxScoreRulesMapper wxScoreRulesMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxScoreValidityPeriodServiceImpl.java View File

@@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxScoreValidityPeriod; import com.iformall.domain.po.WxScoreValidityPeriod;
import com.iformall.mapper.WxScoreValidityPeriodMapper; import com.iformall.mapper.WxScoreValidityPeriodMapper;
import com.iformall.service.WxScoreValidityPeriodService; import com.iformall.service.WxScoreValidityPeriodService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxScoreValidityPeriodServiceImpl implements WxScoreValidityPeriodService { public class WxScoreValidityPeriodServiceImpl implements WxScoreValidityPeriodService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxScoreValidityPeriodMapper wxScoreValidityPeriodMapper; WxScoreValidityPeriodMapper wxScoreValidityPeriodMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java View File

@@ -10,12 +10,15 @@ import com.iformall.domain.po.WxShop;
import com.iformall.enums.EnumShopStatus; import com.iformall.enums.EnumShopStatus;
import com.iformall.mapper.WxShopMapper; import com.iformall.mapper.WxShopMapper;
import com.iformall.service.WxShopService; import com.iformall.service.WxShopService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxShopServiceImpl implements WxShopService { public class WxShopServiceImpl implements WxShopService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxShopMapper wxShopMapper; WxShopMapper wxShopMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxTagsServiceImpl.java View File

@@ -6,12 +6,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxTags; import com.iformall.domain.po.WxTags;
import com.iformall.mapper.WxTagsMapper; import com.iformall.mapper.WxTagsMapper;
import com.iformall.service.WxTagsService; import com.iformall.service.WxTagsService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxTagsServiceImpl implements WxTagsService { public class WxTagsServiceImpl implements WxTagsService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxTagsMapper wxTagsMapper; WxTagsMapper wxTagsMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java View File

@@ -5,12 +5,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxTemplateMsg; import com.iformall.domain.po.WxTemplateMsg;
import com.iformall.mapper.WxTemplateMsgMapper; import com.iformall.mapper.WxTemplateMsgMapper;
import com.iformall.service.WxTemplateMsgService; import com.iformall.service.WxTemplateMsgService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxTemplateMsgServiceImpl implements WxTemplateMsgService { public class WxTemplateMsgServiceImpl implements WxTemplateMsgService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxTemplateMsgMapper wxTemplateMsgMapper; WxTemplateMsgMapper wxTemplateMsgMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxUserChannelServiceImpl.java View File

@@ -6,12 +6,15 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxUserChannel; import com.iformall.domain.po.WxUserChannel;
import com.iformall.mapper.WxUserChannelMapper; import com.iformall.mapper.WxUserChannelMapper;
import com.iformall.service.WxUserChannelService; import com.iformall.service.WxUserChannelService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxUserChannelServiceImpl implements WxUserChannelService { public class WxUserChannelServiceImpl implements WxUserChannelService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxUserChannelMapper wxUserChannelMapper; WxUserChannelMapper wxUserChannelMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxUserCouponServiceImpl.java View File

@@ -5,6 +5,8 @@ import com.iformall.domain.po.WxCouponOrder;
import com.iformall.mapper.WxCouponMapper; import com.iformall.mapper.WxCouponMapper;
import com.iformall.mapper.WxCouponOrderMapper; import com.iformall.mapper.WxCouponOrderMapper;
import com.iformall.service.WxUserCouponService; import com.iformall.service.WxUserCouponService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


@@ -18,6 +20,7 @@ import java.util.stream.Collectors;
*/ */
@Service @Service
public class WxUserCouponServiceImpl implements WxUserCouponService { public class WxUserCouponServiceImpl implements WxUserCouponService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired @Autowired
private WxCouponOrderMapper wxCouponOrderMapper; private WxCouponOrderMapper wxCouponOrderMapper;


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java View File

@@ -7,12 +7,15 @@ import com.iformall.domain.po.WxUserVisit;
import com.iformall.domain.vo.TouchUsersReportVo; import com.iformall.domain.vo.TouchUsersReportVo;
import com.iformall.mapper.WxUserVisitMapper; import com.iformall.mapper.WxUserVisitMapper;
import com.iformall.service.WxUserVisitService; import com.iformall.service.WxUserVisitService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;


@Service @Service
public class WxUserVisitServiceImpl implements WxUserVisitService { public class WxUserVisitServiceImpl implements WxUserVisitService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
WxUserVisitMapper wxUserVisitMapper; WxUserVisitMapper wxUserVisitMapper;


+ 3
- 2
mallinkService/src/main/java/com/iformall/utils/RedisLock.java View File

@@ -1,6 +1,7 @@
package com.iformall.utils; 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.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -14,7 +15,7 @@ import org.springframework.util.StringUtils;
*/ */
@Component @Component
public class RedisLock { public class RedisLock {
private org.apache.log4j.Logger logger = Logger.getLogger(getClass());
private final Logger logger = LoggerFactory.getLogger(this.getClass());


@Autowired @Autowired
private StringRedisTemplate stringRedisTemplate; private StringRedisTemplate stringRedisTemplate;


Loading…
Cancel
Save