caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单付款后添加是否支持原路退款。

Browse Source
This commit is contained in:
lifenlong 2021-05-31 08:37:15 +08:00
parent 3639ed731b
commit 7fa0fb75b1
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,6 +66,8 @@ public interface OrderService extends IService<Order> {
/** /**
* 订单付款 * 订单付款
* 修改订单付款信息
* 记录订单流水
* *
* @param orderSn 订单编号 * @param orderSn 订单编号
* @param paymentMethod 支付方法 * @param paymentMethod 支付方法
@ -118,14 +120,14 @@ public interface OrderService extends IService<Order> {
/** /**
* 订单核验 * 订单核验
* *
* @param verificationCode 验证码 * @param verificationCode 验证码
*/ */
Order take(String orderSn,String verificationCode); Order take(String orderSn, String verificationCode);
/** /**
* 根据核验码获取订单信息 * 根据核验码获取订单信息
* *
* @param verificationCode 验证码 * @param verificationCode 验证码
*/ */
Order getOrderByVerificationCode(String verificationCode); Order getOrderByVerificationCode(String verificationCode);
@ -186,8 +188,9 @@ public interface OrderService extends IService<Order> {
/** /**
* 获取待发货订单编号列表 * 获取待发货订单编号列表
*
* @param response * @param response
* @param orderIds 订单ID列表 * @param orderIds 订单ID列表
* @param logisticsName 店铺已选择物流公司列表 * @param logisticsName 店铺已选择物流公司列表
* @return 待发货订单编号列表 * @return 待发货订单编号列表
*/ */
@ -195,6 +198,7 @@ public interface OrderService extends IService<Order> {
/** /**
* 订单批量发货 * 订单批量发货
*
* @param list 批量发货列表 * @param list 批量发货列表
*/ */
void batchDeliver(List<OrderBatchDeliverDTO> list); void batchDeliver(List<OrderBatchDeliverDTO> list);

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

@ -257,11 +257,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
order.setPayStatus(PayStatusEnum.PAID.name()); order.setPayStatus(PayStatusEnum.PAID.name());
order.setOrderStatus(OrderStatusEnum.PAID.name()); order.setOrderStatus(OrderStatusEnum.PAID.name());
order.setReceivableNo(receivableNo); order.setReceivableNo(receivableNo);
order.setCanReturn(!PaymentMethodEnum.BANK_TRANSFER.name().equals(order.getPaymentMethod()));
this.updateById(order); this.updateById(order);
//记录订单流水 //记录订单流水
storeFlowService.payOrder(orderSn); storeFlowService.payOrder(orderSn);
//发送订单已付款消息
OrderMessage orderMessage = new OrderMessage(); OrderMessage orderMessage = new OrderMessage();
orderMessage.setOrderSn(order.getSn()); orderMessage.setOrderSn(order.getSn());
orderMessage.setPaymentMethod(paymentMethod); orderMessage.setPaymentMethod(paymentMethod);
@ -272,7 +274,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
OrderLog orderLog = new OrderLog(orderSn, "-1", UserEnums.SYSTEM.getRole(), "系统操作", message); OrderLog orderLog = new OrderLog(orderSn, "-1", UserEnums.SYSTEM.getRole(), "系统操作", message);
orderLogService.save(orderLog); orderLogService.save(orderLog);
} }
@Override @Override
@ -355,6 +356,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
} }
@Override @Override
@OrderLogPoint(description = "'订单['+#orderSn+']核销，核销码['+#verificationCode+']'", orderSn = "#orderSn")
public Order take(String orderSn,String verificationCode) { public Order take(String orderSn,String verificationCode) {
//获取订单信息 //获取订单信息