diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxBLogController.java b/mallinkBApi/src/main/java/com/simple/controller/WxBLogController.java index 0a7a298cd..172cb109d 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxBLogController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxBLogController.java @@ -1,43 +1,40 @@ package com.simple.controller; -import io.swagger.annotations.Api; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; - import com.simple.domain.po.WxBLog; import com.simple.service.WxBLogService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("wxBLog") -@Api(description="B端埋点相关接口") -public class WxBLogController extends BaseController -{ - @Autowired +@Api(description = "B端埋点相关接口") +public class WxBLogController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired private WxBLogService wxBLogService; - private Logger logger = Logger.getLogger(WxBLogController.class); - - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口") @GetMapping("list") - @ApiImplicitParams({ - @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), - @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) - public ResultData list(@ModelAttribute WxBLog wxBLog,Integer pageNum, Integer pageSize) { - if (null == wxBLog) wxBLog = new WxBLog(); + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxBLog wxBLog, Integer pageNum, Integer pageSize) { + if (null == wxBLog) wxBLog = new WxBLog(); final PageInfo page = wxBLogService.listAsPage(wxBLog, pageNum, pageSize); return new ResultData(page); } - @ApiOperation("新增接口") + @ApiOperation("新增接口") @PostMapping("add") public ResultData add(@RequestBody WxBLog wxBLog) { //Assert.notNull(wxBLog.getName(), "角色名不能为空"); @@ -55,19 +52,18 @@ public class WxBLogController extends BaseController @ApiOperation("根据id删除接口") @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData delete(Long id) { wxBLogService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxBLogService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxBLogService.getById(id)); } - - - + + } diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java index eb28665e8..fd3dd0dde 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java @@ -6,7 +6,8 @@ import com.simple.service.WxCouponService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/api/coupon") @Api(description="券类相关接口") public class WxCouponController extends BaseController { - private Logger logger = Logger.getLogger(WxCouponController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxCouponService wxCouponService; diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java index 3f855ff79..22ae3324a 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java @@ -13,7 +13,8 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; 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.web.bind.annotation.*; @@ -23,7 +24,7 @@ import java.util.Map; @RequestMapping("/api/couponOrder") @Api(description = "卡券相关接口") public class WxCouponOrderController extends BaseController { - private Logger logger = Logger.getLogger(WxCouponOrderController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxCouponOrderService wxCouponOrderService; diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java b/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java index bb87f0fdf..817b177da 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxDateAmountRecordController.java @@ -1,78 +1,71 @@ package com.simple.controller; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import com.github.pagehelper.PageInfo; -import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.po.WxDateAmountRecord; import com.simple.domain.po.WxMerchantBUser; import com.simple.domain.vo.AmountRecordVo; import com.simple.service.WxDateAmountRecordService; - import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.List; @RestController @RequestMapping("/api/wxDateAmountRecord") -@Api(description="首页交易记录相关接口") -public class WxDateAmountRecordController extends BaseController -{ - @Autowired - private WxDateAmountRecordService wxDateAmountRecordService; +@Api(description = "首页交易记录相关接口") +public class WxDateAmountRecordController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private Logger logger = Logger.getLogger(WxDateAmountRecordController.class); + @Autowired + private WxDateAmountRecordService wxDateAmountRecordService; - @ApiOperation("首页查询交易金额记录接口") + @ApiOperation("首页查询交易金额记录接口") @GetMapping("listOrder") - public ResultData listOrder() { - return list(0); - } - - @ApiOperation("首页查询核销金额记录接口") - @GetMapping("listVerified") - public ResultData listVerified() { - return list(1); - } - - private ResultData list(int verified) { - - List list =new ArrayList<>(); - - WxDateAmountRecord temp = new WxDateAmountRecord(); - WxMerchantBUser u = getUser(); - temp.setTenantId(u.getTenantId()); - temp.setMerchantId(u.getMerchantId()); - temp.setType(verified); - temp.setSortColumns(WxDateAmountRecord.Field.UpdateDate_ASC); - - SimpleDateFormat fmt = new SimpleDateFormat("MM/dd"); - - PageInfo page = wxDateAmountRecordService.listAsPage(temp, 1, 7); - if(page.getSize()>0) { - - for (WxDateAmountRecord wxDateAmountRecord:page.getList()) { - - AmountRecordVo vo = new AmountRecordVo(); - vo.setAmount(wxDateAmountRecord.getPayPrice()); - vo.setAmountDetail(wxDateAmountRecord); - vo.setMouthAndDate(fmt.format(wxDateAmountRecord.getUpdateDate())); - list.add(vo); - } - } - return new ResultData(list); - } + public ResultData listOrder() { + return list(0); + } + + @ApiOperation("首页查询核销金额记录接口") + @GetMapping("listVerified") + public ResultData listVerified() { + return list(1); + } + + private ResultData list(int verified) { + + List list = new ArrayList<>(); + + WxDateAmountRecord temp = new WxDateAmountRecord(); + WxMerchantBUser u = getUser(); + temp.setTenantId(u.getTenantId()); + temp.setMerchantId(u.getMerchantId()); + temp.setType(verified); + temp.setSortColumns(WxDateAmountRecord.Field.UpdateDate_ASC); + + SimpleDateFormat fmt = new SimpleDateFormat("MM/dd"); + + PageInfo page = wxDateAmountRecordService.listAsPage(temp, 1, 7); + if (page.getSize() > 0) { + + for (WxDateAmountRecord wxDateAmountRecord : page.getList()) { + + AmountRecordVo vo = new AmountRecordVo(); + vo.setAmount(wxDateAmountRecord.getPayPrice()); + vo.setAmountDetail(wxDateAmountRecord); + vo.setMouthAndDate(fmt.format(wxDateAmountRecord.getUpdateDate())); + list.add(vo); + } + } + return new ResultData(list); + } } diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMallController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMallController.java index f234eef23..c09ce7b34 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMallController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxMallController.java @@ -6,13 +6,13 @@ import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.po.WxAppinfo; import com.simple.domain.po.WxMall; -import com.simple.mapper.WxAppinfoMapper; import com.simple.service.WxAppinfoService; import com.simple.service.WxMallService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -23,9 +23,9 @@ import java.util.Map; @RestController @RequestMapping("/api/mall") -@Api(description="商场信息相关接口") +@Api(description = "商场信息相关接口") public class WxMallController extends BaseController { - private Logger logger = Logger.getLogger(WxMallController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxMallService wxMallService; @@ -44,7 +44,7 @@ public class WxMallController extends BaseController { return new ResultData(ErrorCode.APP_ID_NOT_FOUND); } WxMall mall = wxMallService.getByTenantId(appInfo.getTenantId()); - if (mall==null) { + if (mall == null) { return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); } Map resultMap = new HashMap(); @@ -62,7 +62,7 @@ public class WxMallController extends BaseController { return new ResultData(ErrorCode.APP_ID_NOT_FOUND); } WxMall mall = wxMallService.getByTenantId(appInfo.getTenantId()); - if (mall==null) { + if (mall == null) { return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); } return new ResultData(Result.SUCCESS, "查询成功", mall); diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java index 8301d4fba..90d300f01 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java @@ -3,7 +3,6 @@ package com.simple.controller; import com.simple.annotation.AuthIgnore; import com.simple.common.ErrorCode; -import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.po.WxMall; import com.simple.domain.po.WxMerchant; @@ -16,7 +15,8 @@ import com.simple.utils.IPUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; 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.web.bind.annotation.*; import org.springframework.web.context.request.RequestContextHolder; @@ -28,13 +28,12 @@ import java.util.HashMap; import java.util.Map; @RestController -@Api(description="B端用户相关接口") +@Api(description = "B端用户相关接口") @RequestMapping("/api/user") -public class WxMerchantBUserController extends BaseController -{ - private Logger logger = Logger.getLogger(WxMerchantBUserController.class); +public class WxMerchantBUserController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Autowired + @Autowired private WxMerchantBUserService wxMerchantBUserService; @Autowired @@ -51,36 +50,37 @@ public class WxMerchantBUserController extends BaseController WxMerchantBUser user = wxMerchantBUserService.getById(getUser().getId()); - if (user==null) + if (user == null) return new ResultData(ErrorCode.USER_IS_EMPTY); WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); - if (merchant==null) + if (merchant == null) return new ResultData(ErrorCode.MCH_INFO_NOT_FOUND); WxMall mall = wxMallService.getByTenantId(merchant.getTenantId()); - if (mall==null) + if (mall == null) return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); - resultMap.put("phone",user.getPhone()); - resultMap.put("name",user.getName()); - resultMap.put("merchant_name",merchant.getName()); - resultMap.put("merchant_img_url",merchant.getImgUrl()); - resultMap.put("mall_name",mall.getName()); - resultMap.put("service_phone",mall.getServicePhone()); + resultMap.put("phone", user.getPhone()); + resultMap.put("name", user.getName()); + resultMap.put("merchant_name", merchant.getName()); + resultMap.put("merchant_img_url", merchant.getImgUrl()); + resultMap.put("mall_name", mall.getName()); + resultMap.put("service_phone", mall.getServicePhone()); return new ResultData(resultMap); } /** * 用户登录 + * * @param map * @return */ @AuthIgnore @PostMapping("/login") - @ApiOperation(value="用户登录", notes="{" + + @ApiOperation(value = "用户登录", notes = "{" + "\"appId\":\"string\"," + "\"phone\":\"string\",\"password\":\"string\"," + "\"latitude\":\"string\",\"longitude\":\"string\"}") @@ -103,9 +103,9 @@ public class WxMerchantBUserController extends BaseController } String token = null; - HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest(); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String ipaddress = IPUtil.getIpAddr(request); - if (!StringUtils.isBlank(latitude)&&!StringUtils.isBlank(longitude)) { + if (!StringUtils.isBlank(latitude) && !StringUtils.isBlank(longitude)) { //return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "经纬度未获取"); logger.info("B端用户: " + phone + " 登录 IP" + ipaddress + ", 经纬度(" + longitude + "," + latitude + ")"); } @@ -131,15 +131,15 @@ public class WxMerchantBUserController extends BaseController try { merchant = wxMerchantService.getById(user1.getMerchantId()); } catch (Exception e) { - logger.error(ErrorCode.DB_FAIL.getMessage( ) + ": " + user1.getMerchantId()); + logger.error(ErrorCode.DB_FAIL.getMessage() + ": " + user1.getMerchantId()); return new ResultData(ErrorCode.DB_FAIL); } if (merchant == null) { - logger.error(ErrorCode.MERCHANT_INFO_NOT_FOUND.getMessage( ) + ": " + user1.getMerchantId()); + logger.error(ErrorCode.MERCHANT_INFO_NOT_FOUND.getMessage() + ": " + user1.getMerchantId()); return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); } if (merchant.getStatus() == EnumMerchantStatus.NOT_VALID.getCode()) { - logger.error(ErrorCode.MERCHANT_INFO_NOT_VALID.getMessage( ) + ": " + user1.getMerchantId()); + logger.error(ErrorCode.MERCHANT_INFO_NOT_VALID.getMessage() + ": " + user1.getMerchantId()); return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID); } // check password @@ -169,12 +169,12 @@ public class WxMerchantBUserController extends BaseController @AuthIgnore @ApiOperation(value = "修改密码", notes = "{\"appId\",\"string\", \"phone\",\"string\",\"code\",\"string\",\"pwd\",\"string\"}") @PostMapping("/updatepwd") - public ResultData updatepwd(@RequestBody Map params) { + public ResultData updatepwd(@RequestBody Map params) { // String phone,String code,String pwd String appId = params.get("appId"); - String phone=params.get("phone"); - String code=params.get("code"); - String pwd=params.get("pwd"); + String phone = params.get("phone"); + String code = params.get("code"); + String pwd = params.get("pwd"); if (StringUtils.isBlank(appId)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "appId不能为空"); } @@ -190,5 +190,5 @@ public class WxMerchantBUserController extends BaseController return wxMerchantBUserService.updatepwd(appId, phone, code, pwd); } - + } diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java index 2efde81d3..9184a1c1e 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java @@ -1,30 +1,25 @@ package com.simple.controller; -import io.swagger.annotations.Api; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.*; - -import com.github.pagehelper.PageInfo; -import com.simple.common.Result; import com.simple.common.ResultData; - -import com.simple.domain.po.WxMerchantTradeDaily; import com.simple.service.WxMerchantTradeDailyService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/api/wxMerchantTradeDaily") @Api(description = "解单相关接口") -public class WxMerchantTradeDailyController extends BaseController -{ - @Autowired - private WxMerchantTradeDailyService wxMerchantTradeDailyService; +public class WxMerchantTradeDailyController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); - private Logger logger = Logger.getLogger(WxMerchantTradeDailyController.class); + @Autowired + private WxMerchantTradeDailyService wxMerchantTradeDailyService; @ApiOperation("获得当日解单") @@ -41,11 +36,10 @@ public class WxMerchantTradeDailyController extends BaseController @ApiOperation("上报每日解单") @GetMapping("/reportDailyVolume") - @ApiImplicitParam(name="volume",value="总金额(分)",dataType="Integer", paramType = "query",required=true) + @ApiImplicitParam(name = "volume", value = "总金额(分)", dataType = "Integer", paramType = "query", required = true) public ResultData saveDailyTradingVolume(Integer volume) { - return wxMerchantTradeDailyService.saveDailyTradingVolume(getUser().getId(),volume); + return wxMerchantTradeDailyService.saveDailyTradingVolume(getUser().getId(), volume); } - - - + + } diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java index 5cc042ca9..fe1e68b3e 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxMsgValidationcodeController.java @@ -11,7 +11,8 @@ import com.simple.service.WxMsgValidationcodeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -21,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("wxMsgValidationcode") @Api(description="短信验证相关接口") public class WxMsgValidationcodeController extends BaseController { - private Logger logger = Logger.getLogger(WxMsgValidationcodeController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private WxMsgValidationcodeService wxMsgValidationcodeService; diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxRefundOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxRefundOrderController.java index 22481f9a1..0528c0bb5 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxRefundOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxRefundOrderController.java @@ -5,18 +5,22 @@ import com.simple.common.ErrorCode; import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.config.PayProperty; -import com.simple.domain.po.*; -import com.simple.enums.EnumPayStatus; -import com.simple.enums.EnumPayWay; +import com.simple.domain.po.WxAppinfo; +import com.simple.domain.po.WxMerchantBUser; +import com.simple.domain.po.WxRefundOrder; import com.simple.enums.EnumRefundWay; import com.simple.exception.MallinkException; -import com.simple.service.*; +import com.simple.service.WxCouponOrderService; +import com.simple.service.WxOrderService; +import com.simple.service.WxPayOrderService; +import com.simple.service.WxRefundOrderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; 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.web.bind.annotation.*; @@ -24,9 +28,9 @@ import java.util.Map; @RestController @RequestMapping("/api/refund") -@Api(description="退款相关接口") +@Api(description = "退款相关接口") public class WxRefundOrderController extends BaseController { - private Logger logger = Logger.getLogger(WxRefundOrderController.class); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private PayProperty payProperty;