From d96d5edcd523a5ce66deca8768083b4c7ff708ff Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 29 Jun 2021 10:13:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=8F=90=E7=8E=B0api?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/member/MemberWithdrawApplyManagerController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java index eff087ba..57f2112d 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java @@ -47,7 +47,7 @@ public class MemberWithdrawApplyManagerController { @ApiOperation(value = "提现申请审核") @PostMapping @ApiImplicitParams({ - @ApiImplicitParam(name = "apply_id", value = "审核记录id", required = true, paramType = "query"), + @ApiImplicitParam(name = "applyId", value = "审核记录id", required = true, paramType = "query"), @ApiImplicitParam(name = "result", value = "审核结果", required = true, paramType = "query", dataType = "boolean"), @ApiImplicitParam(name = "remark", value = "审核备注", paramType = "query") }) From 5a415ffc7779e5d546ea3d52de8638d88a7c6850 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 29 Jun 2021 10:25:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=A4=E5=AE=9A?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/lili/event/impl/NoticeMessageExecute.java | 4 ++-- .../modules/order/order/serviceimpl/OrderServiceImpl.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java b/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java index 3b63bdd8..5a038765 100644 --- a/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java @@ -59,7 +59,7 @@ public class NoticeMessageExecute implements TradeEvent, OrderStatusChangeEvent, //如果订单状态不为空 if (orderDetailVO != null) { Map params = new HashMap<>(); - switch (orderMessage.getNewStatus()){ + switch (orderMessage.getNewStatus()) { //如果订单新的状态为已取消 则发送取消订单站内信 case CANCELLED: params.put(NoticeMessageParameterEnum.CANCEL_REASON.getType(), orderDetailVO.getOrder().getCancelReason()); @@ -82,7 +82,7 @@ public class NoticeMessageExecute implements TradeEvent, OrderStatusChangeEvent, break; //如果是拼团订单，发送拼团成功消息 case UNDELIVERED: - if(orderDetailVO.getOrder().getOrderPromotionType().equals(OrderPromotionTypeEnum.PINTUAN.name())){ + if (OrderPromotionTypeEnum.PINTUAN.name().equals(orderDetailVO.getOrder().getOrderPromotionType())) { //拼团成功消息 noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.PINTUAN_SUCCESS); } diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java index c0b02ebc..f423e6ea 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java @@ -203,8 +203,7 @@ public class OrderServiceImpl extends ServiceImpl implements public Order cancel(String orderSn, String reason) { Order order = OperationalJudgment.judgment(this.getBySn(orderSn)); //如果订单促销类型不为空&&订单是拼团订单，并且订单未成团，则抛出异常 - if (StringUtils.isNotEmpty(order.getOrderPromotionType()) - && order.getOrderPromotionType().equals(OrderPromotionTypeEnum.PINTUAN.name()) + if (OrderPromotionTypeEnum.PINTUAN.name().equals(order.getOrderPromotionType()) && !order.getOrderStatus().equals(OrderStatusEnum.UNDELIVERED.name())) { throw new ServiceException(ResultCode.ORDER_CAN_NOT_CANCEL); } @@ -286,7 +285,7 @@ public class OrderServiceImpl extends ServiceImpl implements Order order = this.getBySn(orderSn); //判断是否为拼团订单，进行特殊处理 //判断订单类型进行不同的订单确认操作 - if (order.getOrderPromotionType() != null && order.getOrderPromotionType().equals(OrderPromotionTypeEnum.PINTUAN.name())) { + if (OrderPromotionTypeEnum.PINTUAN.name().equals(order.getOrderPromotionType())) { this.checkPintuanOrder(order.getPromotionId(), order.getParentOrderSn()); } else { //判断订单类型 From 39e851ee789c714900cdb59e4d45de6aac5ec75f Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 29 Jun 2021 11:15:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?aop=E7=A7=AF=E5=88=86=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lili/event/impl/NoticeMessageExecute.java | 5 ++++- .../entity/aop/interceptor/PointLogInterceptor.java | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java b/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java index 5a038765..e3346136 100644 --- a/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java @@ -148,11 +148,14 @@ public class NoticeMessageExecute implements TradeEvent, OrderStatusChangeEvent, @Override public void memberPointChange(MemberPointMessage memberPointMessage) { + if (memberPointMessage == null) { + return; + } //组织站内信参数 NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO(); noticeMessageDTO.setMemberId(memberPointMessage.getMemberId()); Map params = new HashMap<>(); - if (memberPointMessage.getType().equals(1)) { + if (memberPointMessage.getType()) { params.put("expenditure_points", "0"); params.put("income_points", memberPointMessage.getPoint().toString()); } else { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java b/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java index 7d6708ab..425fcb72 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java @@ -40,9 +40,9 @@ public class PointLogInterceptor { point = Long.valueOf(obj[0].toString()); } //变动类型 - Integer type = 0; + Boolean type = false; if (obj[1] != null) { - type = Integer.valueOf(obj[1].toString()); + type = Boolean.valueOf(obj[1].toString()); } //会员ID String memberId = ""; @@ -55,7 +55,7 @@ public class PointLogInterceptor { MemberPointsHistory memberPointsHistory = new MemberPointsHistory(); memberPointsHistory.setMemberId(member.getId()); memberPointsHistory.setMemberName(member.getUsername()); - memberPointsHistory.setPointType(type); + memberPointsHistory.setPointType(type ? 1 : 0); memberPointsHistory.setVariablePoint(point); memberPointsHistory.setBeforePoint(new Double(CurrencyUtil.sub(member.getPoint(), point)).longValue()); memberPointsHistory.setPoint(member.getPoint()); @@ -64,7 +64,7 @@ public class PointLogInterceptor { memberPointsHistoryService.save(memberPointsHistory); } } catch (Exception e) { - log.error("积分操作错误",e); + log.error("积分操作错误", e); }