diff --git a/README.MD b/README.MD index ea6c8d89..3c26795d 100644 --- a/README.MD +++ b/README.MD @@ -26,6 +26,17 @@ mall-im "sslkey_name": "apiclient_key.pem" } +手动备份数据库 + +```shell +进入 docker 控制台 +cd /var/lib/mysql +mysqldump -u root -p mall_prod | gzip > mall_prod_20250630.sql.gz + +在宿主机找到: +/data/mysql/data/mall_prod_20250630.sql.gz +``` + 清除 docker 日志 查看哪个文件夹占空间 diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java index 4a54206c..574f4949 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java @@ -229,7 +229,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl orderItemQueryWrapper = new QueryWrapper<>(); orderItemQueryWrapper.eq("order_id", order_id); List orderItemList = shopOrderItemService.find(orderItemQueryWrapper); + // 累计订单项支付总金额 BigDecimal order_item_payment_amount = orderItemList.stream().map(s -> s.getOrder_item_payment_amount()).reduce(BigDecimal::add).get(); // 当前已经同意退款额度 = 所有单品退款额度 @@ -1403,7 +1425,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl 0) { - // todo 执行退运费操作, 有两种方案,1、生成退运费售后服务单; 2、直接执行退款 + // 运费大于0的, 执行退运费操作, 有两种方案,1、生成退运费售后服务单; 2、直接执行退款 // 1、生成退运费售后服务单 UserDto user = getCurrentUser(); @@ -1437,6 +1459,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl + * TODO 拉卡拉退款 + * + * @param return_id + * @return + */ @Override public boolean doOnlineRefund(String return_id) { ShopOrderReturn shopOrderReturn = get(return_id); String return_channel_code = shopOrderReturn.getReturn_channel_code(); if (StrUtil.equals(return_channel_code, "alipay")) { + shopOrderReturn = payService.aliPayRefund(shopOrderReturn); if (shopOrderReturn == null) { return false; } return updateRefundOrderReturn(shopOrderReturn); + } else if (StrUtil.equals(return_channel_code, "wx_native")) { + shopOrderReturn = payService.wxPayRefund(get(return_id)); if (shopOrderReturn == null) { return false; } return updateRefundOrderReturn(shopOrderReturn); + } return false; } @@ -1757,6 +1800,18 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl