From 429d58be1c095217777b81156af8e814a6848150 Mon Sep 17 00:00:00 2001 From: Burce Date: Wed, 18 Sep 2019 13:42:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=E5=95=86=E6=88=B7=E4=B8=BB?= =?UTF-8?q?=E5=88=B8=E5=8F=82=E6=95=B0=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/basic/WxMerchantController.java | 2 +- .../com/iformall/controller/WxCouponSendController.java | 8 ++++---- .../java/com/iformall/service/WxCouponSendService.java | 2 +- .../iformall/service/impl/WxCouponSendServiceImpl.java | 5 ++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index d412b944f..e1b7a6da4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -185,7 +185,7 @@ public class WxMerchantController extends BaseController { return wxMerchantService.updateMerchantTax(wxMerchant); } - @ApiOperation("更新会员等级权益接口") + @ApiOperation("商户信息设置接口") @PostMapping("updateMerchantLevel") @SystemControllerLog(description = "商户-更新会员等级权益") public ResultData updateMerchantLevel(@RequestBody WxMerchant wxMerchant) { diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java index 19cd85631..2679150b5 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java @@ -81,7 +81,7 @@ public class WxCouponSendController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - Object cUserId = params.get("cUserId") ; + String cUserId = (String) params.get("cUserId"); if (!params.containsKey("wxCouponSendIds")) { return new ResultData(ErrorCode.COUPON_IS_EMPTY); @@ -98,12 +98,12 @@ public class WxCouponSendController extends BaseController { wxCouponSend.setSendType(EnumCouponSendSendType.MERCHANT.getCode()); wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); try { - wxCouponSendService.handSel(wxCouponSend, cUserId); + wxCouponSendService.handSel(wxCouponSend, Long.parseLong(cUserId)); } catch (MallinkException e) { - logger.error("注券异常: " + e.getMessage()); + logger.error("注券异常: ", e); return new ResultData(e.getErrorCode(), e.getMessage()); } catch (Exception e) { - logger.error("注券异常: " + e.getMessage()); + logger.error("注券异常: ", e); return new ResultData(ErrorCode.COUPON_HANDSEL_VERIFY, e.getMessage()); } return new ResultData(); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java index df23f22b8..e49200f15 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java @@ -97,7 +97,7 @@ public interface WxCouponSendService { * * @param wxCouponSend */ - void handSel(WxCouponSend wxCouponSend,Object cUserId) ; + void handSel(WxCouponSend wxCouponSend,Long cUserId) ; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index 9b20b955f..8a9fbaf4d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -599,11 +599,10 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { } } - @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) - public void handSel(WxCouponSend wxCouponSend, Object cUserId) { - WxCUser cu = wxCUserMapper.selectById((Long)cUserId); + public void handSel(WxCouponSend wxCouponSend, Long cUserId) { + WxCUser cu = wxCUserMapper.selectById(cUserId); if (Objects.isNull(cu)) { throw new MallinkException(ErrorCode.USER_NOT_AUTH_PHONE); }