code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码接口，异常规范问题处理。

Browse Source
This commit is contained in:
Chopper
2021-07-29 17:00:15 +08:00
parent f8ae17b360
commit 02327402a8
10 changed files with 71 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java
View File

@@ -40,7 +40,6 @@ public class GlobalControllerExceptionHandler {
@ResponseStatus(value = HttpStatus.BAD_REQUEST)
public ResultMessage<Object> handleServiceException(HttpServletRequest request, final Exception e, HttpServletResponse response) {
log.error("全局异常[ServiceException]:", e);
//如果是自定义异常，则获取异常，返回自定义错误消息
if (e instanceof ServiceException) {
@@ -58,7 +57,13 @@ public class GlobalControllerExceptionHandler {
if (!serviceException.getMsg().equals(ServiceException.DEFAULT_MESSAGE)) {
message += ":" + serviceException.getMsg();
}
log.error("全局异常[ServiceException]:{}-{}", serviceException.getResultCode().code(), serviceException.getResultCode().message(), e);
return ResultUtil.error(code, message);
} else {
log.error("全局异常[ServiceException]:", e);
}
//默认错误消息

15
framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java
View File

@@ -166,17 +166,22 @@ public class DistributionOrderServiceImpl extends ServiceImpl<DistributionOrderM
//获取收款分销订单
DistributionOrder distributionOrder = this.getOne(new LambdaQueryWrapper<DistributionOrder>()
.eq(DistributionOrder::getOrderItemSn, storeFlow.getOrderItemSn()));
//分销订单不存在，则直接返回
if (distributionOrder == null) {
return;
}
//已提交无法重复提交
//如果未结算则将分销订单取消
//如果已结算则创建退款分销订单
if (distributionOrder.getDistributionOrderStatus().equals(DistributionOrderStatusEnum.CANCEL.name())) {
return;
} else if (distributionOrder.getDistributionOrderStatus().equals(DistributionOrderStatusEnum.WAIT_BILL.name())) {
}
//如果未结算则将分销订单取消
else if (distributionOrder.getDistributionOrderStatus().equals(DistributionOrderStatusEnum.WAIT_BILL.name())) {
this.update(new LambdaUpdateWrapper<DistributionOrder>()
.eq(DistributionOrder::getOrderItemSn, storeFlow.getOrderItemSn())
.set(DistributionOrder::getDistributionOrderStatus, DistributionOrderStatusEnum.CANCEL.name()));
} else {
}
//如果已结算则创建退款分销订单
else {
//修改分销员提成金额
distributionService.subCanRebate(CurrencyUtil.sub(0, storeFlow.getDistributionRebate()), distributionOrder.getDistributionId());
}

5
framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java
View File

@@ -51,7 +51,10 @@ public class NoticeMessageServiceImpl extends ServiceImpl<NoticeMessageTemplateM
return;
}
try {
NoticeMessage noticeMessage = this.getOne(new LambdaQueryWrapper<NoticeMessage>().eq(NoticeMessage::getNoticeNode, noticeMessageDTO.getNoticeMessageNodeEnum().getDescription().trim()));
NoticeMessage noticeMessage = this.getOne(
new LambdaQueryWrapper<NoticeMessage>()
.eq(NoticeMessage::getNoticeNode
, noticeMessageDTO.getNoticeMessageNodeEnum().getDescription().trim()));
//如果通知类站内信开启的情况下
if (noticeMessage != null && noticeMessage.getNoticeStatus().equals(SwitchEnum.OPEN.name())) {
MemberMessage memberMessage = new MemberMessage();

8
framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java
View File

@@ -76,6 +76,9 @@ public class WechatMessageUtil {
public void wechatMessage(String sn) {
Order order = orderService.getBySn(sn);
if (order == null) {
throw new ServiceException("订单" + sn + "不存在，发送微信公众号消息错误");
}
//获取微信消息
LambdaQueryWrapper<WechatMessage> wechatMessageQueryWrapper = new LambdaQueryWrapper();
wechatMessageQueryWrapper.eq(WechatMessage::getOrderStatus, order.getOrderStatus());
@@ -130,8 +133,11 @@ public class WechatMessageUtil {
*/
public void wechatMpMessage(String sn) {
log.error("发送消息订阅");
log.info("发送消息订阅");
Order order = orderService.getBySn(sn);
if (order == null) {
throw new ServiceException("订单" + sn + "不存在，发送订阅消息错误");
}
//获取微信消息
LambdaQueryWrapper<WechatMPMessage> wechatMPMessageQueryWrapper = new LambdaQueryWrapper();
wechatMPMessageQueryWrapper.eq(WechatMPMessage::getOrderStatus, order.getOrderStatus());

7
framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java
View File

@@ -157,6 +157,13 @@ public interface OrderService extends IService<Order> {
*/
void complete(String orderSn);
/**
* 系统定时完成订单
*
* @param orderSn 订单编号
*/
void systemComplete(String orderSn);
/**
* 通过trade 获取订单列表
*

18
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
View File

@@ -407,8 +407,23 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
public void complete(String orderSn) {
//是否可以查询到订单
Order order = OperationalJudgment.judgment(this.getBySn(orderSn));
complete(order, orderSn);
}
//修改订单状态为完成
@Override
@OrderLogPoint(description = "'订单['+#orderSn+']完成'", orderSn = "#orderSn")
public void systemComplete(String orderSn) {
Order order = this.getBySn(orderSn);
complete(order, orderSn);
}
/**
* 完成订单方法封装
*
* @param order 订单
* @param orderSn 订单编号
*/
private void complete(Order order, String orderSn) {//修改订单状态为完成
this.updateStatus(orderSn, OrderStatusEnum.COMPLETED);
//修改订单货物可以进行评价
@@ -437,7 +452,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
//发送订单变更mq消息
rocketMQTemplate.asyncSend(destination, JSONUtil.toJsonStr(goodsCompleteMessageList), RocketmqSendCallbackBuilder.commonCallback());
}
}
@Override