diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java index 272864d6..640c69eb 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java +++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java @@ -66,6 +66,8 @@ public interface OrderService extends IService { /** * 订单付款 + * 修改订单付款信息 + * 记录订单流水 * * @param orderSn 订单编号 * @param paymentMethod 支付方法 @@ -118,14 +120,14 @@ public interface OrderService extends IService { /** * 订单核验 * - * @param verificationCode 验证码 + * @param verificationCode 验证码 */ - Order take(String orderSn,String verificationCode); + Order take(String orderSn, String verificationCode); /** * 根据核验码获取订单信息 * - * @param verificationCode 验证码 + * @param verificationCode 验证码 */ Order getOrderByVerificationCode(String verificationCode); @@ -186,8 +188,9 @@ public interface OrderService extends IService { /** * 获取待发货订单编号列表 + * * @param response - * @param orderIds 订单ID列表 + * @param orderIds 订单ID列表 * @param logisticsName 店铺已选择物流公司列表 * @return 待发货订单编号列表 */ @@ -195,6 +198,7 @@ public interface OrderService extends IService { /** * 订单批量发货 + * * @param list 批量发货列表 */ void batchDeliver(List list); 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 243e18a0..42fafe52 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 @@ -257,11 +257,13 @@ public class OrderServiceImpl extends ServiceImpl implements order.setPayStatus(PayStatusEnum.PAID.name()); order.setOrderStatus(OrderStatusEnum.PAID.name()); order.setReceivableNo(receivableNo); + order.setCanReturn(!PaymentMethodEnum.BANK_TRANSFER.name().equals(order.getPaymentMethod())); this.updateById(order); //记录订单流水 storeFlowService.payOrder(orderSn); + //发送订单已付款消息 OrderMessage orderMessage = new OrderMessage(); orderMessage.setOrderSn(order.getSn()); orderMessage.setPaymentMethod(paymentMethod); @@ -272,7 +274,6 @@ public class OrderServiceImpl extends ServiceImpl implements OrderLog orderLog = new OrderLog(orderSn, "-1", UserEnums.SYSTEM.getRole(), "系统操作", message); orderLogService.save(orderLog); - } @Override @@ -355,6 +356,7 @@ public class OrderServiceImpl extends ServiceImpl implements } @Override + @OrderLogPoint(description = "'订单['+#orderSn+']核销,核销码['+#verificationCode+']'", orderSn = "#orderSn") public Order take(String orderSn,String verificationCode) { //获取订单信息