BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 92dbf093ead8fee50abab79f32e8d6faf406246a

Authored by YunaiV
1 parent 10f2dbc8

trade：增加管理员审批

Inline Side-by-side
Showing 19 changed files with 370 additions and 71 deletions
yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
  View file @92dbf09
... ... @@ -21,6 +21,7 @@ public interface ErrorCodeConstants {
21 21  
22 22 ErrorCode ORDER_ITEM_NOT_FOUND = new ErrorCode(1011000010, "交易订单项不存在");
23 23 ErrorCode ORDER_NOT_FOUND = new ErrorCode(1011000010, "交易订单不存在");
  24 + ErrorCode ORDER_ITEM_UPDATE_AFTER_SALE_STATUS_FAIL = new ErrorCode(1011000011, "交易订单项更新售后状态失败，请重试");
24 25  
25 26 // ========== After Sale 模块 1-011-000-000 ==========
26 27 ErrorCode AFTER_SALE_NOT_FOUND = new ErrorCode(1011000100, "售后单不存在");
... ... @@ -29,9 +30,10 @@ public interface ErrorCodeConstants {
29 30 ErrorCode AFTER_SALE_CREATE_FAIL_ORDER_STATUS_NO_PAID = new ErrorCode(1011000103, "订单未支付，无法申请售后");
30 31 ErrorCode AFTER_SALE_CREATE_FAIL_ORDER_STATUS_NO_DELIVERED = new ErrorCode(1011000104, "订单未发货，无法申请【退货退款】售后");
31 32 ErrorCode AFTER_SALE_CREATE_FAIL_ORDER_ITEM_APPLIED = new ErrorCode(1011000105, "订单项已申请售后，无法重复申请");
  33 + ErrorCode AFTER_SALE_AUDIT_FAIL_STATUS_NOT_APPLY = new ErrorCode(1011000106, "审批失败，售后状态不处于审批中");
  34 + ErrorCode AFTER_SALE_UPDATE_STATUS_FAIL = new ErrorCode(1011000106, "操作售后单失败，请刷新后重试");
32 35  
33 36 // ========== Cart 模块 1-011-001-000 ==========
34 37 ErrorCode CARD_ITEM_NOT_FOUND = new ErrorCode(1011002000, "购物车项不存在");
35 38  
36   -
37 39 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/aftersale/TradeAfterSaleController.java 0 → 100644
  View file @92dbf09
  1 +package cn.iocoder.yudao.module.trade.controller.admin.aftersale;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.module.trade.controller.admin.aftersale.vo.TradeAfterSaleAuditReqVO;
  5 +import cn.iocoder.yudao.module.trade.service.aftersale.TradeAfterSaleService;
  6 +import io.swagger.annotations.Api;
  7 +import io.swagger.annotations.ApiOperation;
  8 +import lombok.extern.slf4j.Slf4j;
  9 +import org.springframework.security.access.prepost.PreAuthorize;
  10 +import org.springframework.validation.annotation.Validated;
  11 +import org.springframework.web.bind.annotation.PutMapping;
  12 +import org.springframework.web.bind.annotation.RequestBody;
  13 +import org.springframework.web.bind.annotation.RequestMapping;
  14 +import org.springframework.web.bind.annotation.RestController;
  15 +
  16 +import javax.annotation.Resource;
  17 +
  18 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  19 +import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getClientIP;
  20 +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
  21 +
  22 +@Api(tags = "管理后台 - 交易售后")
  23 +@RestController
  24 +@RequestMapping("/trade/after-sale")
  25 +@Validated
  26 +@Slf4j
  27 +public class TradeAfterSaleController {
  28 +
  29 + @Resource
  30 + private TradeAfterSaleService afterSaleService;
  31 +
  32 + @PutMapping("/audit")
  33 + @ApiOperation("审批售后")
  34 + @PreAuthorize("@ss.hasPermission('trade:after-sale:audit')")
  35 + public CommonResult<Boolean> auditAfterSale(@RequestBody TradeAfterSaleAuditReqVO auditReqVO) {
  36 + afterSaleService.auditAfterSale(getLoginUserId(), getClientIP(), auditReqVO);
  37 + return success(true);
  38 + }
  39 +
  40 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/aftersale/vo/TradeAfterSaleAuditReqVO.java 0 → 100644
  View file @92dbf09
  1 +package cn.iocoder.yudao.module.trade.controller.admin.aftersale.vo;
  2 +
  3 +import io.swagger.annotations.ApiModel;
  4 +import io.swagger.annotations.ApiModelProperty;
  5 +import lombok.Data;
  6 +
  7 +import javax.validation.constraints.NotNull;
  8 +
  9 +@ApiModel("管理后台 - 交易售后审批 Request VO")
  10 +@Data
  11 +public class TradeAfterSaleAuditReqVO {
  12 +
  13 + @ApiModelProperty(value = "售后编号", required = true, example = "1024")
  14 + @NotNull(message = "售后编号不能为空")
  15 + private Long id;
  16 +
  17 + @ApiModelProperty(value = "审批结果", required = true, example = "true",
  18 + notes = "true - 通过；false - 不通过")
  19 + @NotNull(message = "审批结果不能为空")
  20 + private Boolean audit;
  21 +
  22 + @ApiModelProperty(value = "审批备注", example = "你猜")
  23 + private String auditReason;
  24 +
  25 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/AppAfterSaleController.java renamed to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/AppTradeAfterSaleController.java
  View file @92dbf09
1 1 package cn.iocoder.yudao.module.trade.controller.app.aftersale;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4   -import cn.iocoder.yudao.module.trade.controller.app.aftersale.vo.AppAfterSaleCreateReqVO;
  4 +import cn.iocoder.yudao.module.trade.controller.app.aftersale.vo.AppTradeAfterSaleCreateReqVO;
5 5 import cn.iocoder.yudao.module.trade.service.aftersale.TradeAfterSaleService;
6 6 import io.swagger.annotations.Api;
7 7 import io.swagger.annotations.ApiOperation;
... ... @@ -22,14 +22,14 @@ import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUti
22 22 @RequestMapping("/trade/after-sale")
23 23 @Validated
24 24 @Slf4j
25   -public class AppAfterSaleController {
  25 +public class AppTradeAfterSaleController {
26 26  
27 27 @Resource
28 28 private TradeAfterSaleService afterSaleService;
29 29  
30 30 @PostMapping(value = "/create")
31 31 @ApiOperation(value = "申请售后")
32   - private CommonResult<Long> createAfterSale(@RequestBody AppAfterSaleCreateReqVO createReqVO) {
  32 + private CommonResult<Long> createAfterSale(@RequestBody AppTradeAfterSaleCreateReqVO createReqVO) {
33 33 return success(afterSaleService.createAfterSale(getLoginUserId(), createReqVO));
34 34 }
35 35  
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/vo/AppAfterSaleCreateReqVO.java renamed to yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/vo/AppTradeAfterSaleCreateReqVO.java
  View file @92dbf09
... ... @@ -12,7 +12,7 @@ import java.util.List;
12 12  
13 13 @ApiModel("用户 App - 交易售后创建 Request VO")
14 14 @Data
15   -public class AppAfterSaleCreateReqVO {
  15 +public class AppTradeAfterSaleCreateReqVO {
16 16  
17 17 @ApiModelProperty(name = "订单项编号", required = true, example = "1024")
18 18 @NotNull(message = "订单项编号不能为空")
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/aftersale/TradeAfterSaleConvert.java
  View file @92dbf09
1 1 package cn.iocoder.yudao.module.trade.convert.aftersale;
2 2  
3   -import cn.iocoder.yudao.module.trade.controller.app.aftersale.vo.AppAfterSaleCreateReqVO;
  3 +import cn.iocoder.yudao.module.pay.api.refund.dto.PayRefundCreateReqDTO;
  4 +import cn.iocoder.yudao.module.trade.controller.app.aftersale.vo.AppTradeAfterSaleCreateReqVO;
4 5 import cn.iocoder.yudao.module.trade.dal.dataobject.aftersale.TradeAfterSaleDO;
5 6 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
  7 +import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderProperties;
6 8 import org.mapstruct.Mapper;
7 9 import org.mapstruct.Mapping;
8 10 import org.mapstruct.Mappings;
... ... @@ -20,6 +22,14 @@ public interface TradeAfterSaleConvert {
20 22 @Mapping(target = "creator", ignore = true),
21 23 @Mapping(target = "updater", ignore = true),
22 24 })
23   - TradeAfterSaleDO convert(AppAfterSaleCreateReqVO createReqVO, TradeOrderItemDO tradeOrderItem);
  25 + TradeAfterSaleDO convert(AppTradeAfterSaleCreateReqVO createReqVO, TradeOrderItemDO tradeOrderItem);
  26 +
  27 + @Mappings({
  28 + @Mapping(source = "afterSale.orderId", target = "merchantOrderId"),
  29 + @Mapping(source = "afterSale.applyReason", target = "reason"),
  30 + @Mapping(source = "afterSale.refundPrice", target = "amount")
  31 + })
  32 + PayRefundCreateReqDTO convert(String userIp, TradeAfterSaleDO afterSale,
  33 + TradeOrderProperties orderProperties);
24 34  
25 35 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
  View file @92dbf09
... ... @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.trade.convert.order;
2 2  
3 3 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
4 4 import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
5   -import cn.iocoder.yudao.module.pay.api.order.PayOrderInfoCreateReqDTO;
  5 +import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderCreateReqDTO;
6 6 import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
7 7 import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuUpdateStockReqDTO;
8 8 import cn.iocoder.yudao.module.product.api.spu.dto.ProductSpuRespDTO;
... ... @@ -71,9 +71,9 @@ public interface TradeOrderConvert {
71 71 ProductSkuUpdateStockReqDTO.Item convert(TradeOrderItemDO bean);
72 72 List<ProductSkuUpdateStockReqDTO.Item> convertList(List<TradeOrderItemDO> list);
73 73  
74   - default PayOrderInfoCreateReqDTO convert(TradeOrderDO tradeOrderDO, List<TradeOrderItemDO> tradeOrderItemDOs,
75   - List<ProductSpuRespDTO> spus, TradeOrderProperties tradeOrderProperties) {
76   - PayOrderInfoCreateReqDTO createReqDTO = new PayOrderInfoCreateReqDTO()
  74 + default PayOrderCreateReqDTO convert(TradeOrderDO tradeOrderDO, List<TradeOrderItemDO> tradeOrderItemDOs,
  75 + List<ProductSpuRespDTO> spus, TradeOrderProperties tradeOrderProperties) {
  76 + PayOrderCreateReqDTO createReqDTO = new PayOrderCreateReqDTO()
77 77 .setAppId(tradeOrderProperties.getAppId()).setUserIp(tradeOrderDO.getUserIp());
78 78 // 商户相关字段
79 79 createReqDTO.setMerchantOrderId(String.valueOf(tradeOrderDO.getId()));
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/aftersale/TradeAfterSaleMapper.java
  View file @92dbf09
... ... @@ -2,9 +2,15 @@ package cn.iocoder.yudao.module.trade.dal.mysql.aftersale;
2 2  
3 3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
4 4 import cn.iocoder.yudao.module.trade.dal.dataobject.aftersale.TradeAfterSaleDO;
5   -import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
  5 +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
6 6 import org.apache.ibatis.annotations.Mapper;
7 7  
8 8 @Mapper
9 9 public interface TradeAfterSaleMapper extends BaseMapperX<TradeAfterSaleDO> {
  10 +
  11 + default int updateByIdAndStatus(Long id, Integer status, TradeAfterSaleDO update) {
  12 + return update(update, new LambdaUpdateWrapper<TradeAfterSaleDO>()
  13 + .eq(TradeAfterSaleDO::getId, id).eq(TradeAfterSaleDO::getStatus, status));
  14 + }
  15 +
10 16 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderItemMapper.java
  View file @92dbf09
... ... @@ -2,8 +2,15 @@ package cn.iocoder.yudao.module.trade.dal.mysql.order;
2 2  
3 3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
4 4 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
  5 +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
5 6 import org.apache.ibatis.annotations.Mapper;
6 7  
7 8 @Mapper
8 9 public interface TradeOrderItemMapper extends BaseMapperX<TradeOrderItemDO> {
  10 +
  11 + default int updateAfterSaleStatus(Long id, Integer oldAfterSaleStatus, Integer newAfterSaleStatus) {
  12 + return update(new TradeOrderItemDO().setAfterSaleStatus(newAfterSaleStatus),
  13 + new LambdaUpdateWrapper<>(new TradeOrderItemDO().setId(id).setAfterSaleStatus(oldAfterSaleStatus)));
  14 + }
  15 +
9 16 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleService.java
  View file @92dbf09
1 1 package cn.iocoder.yudao.module.trade.service.aftersale;
2 2  
3   -import cn.iocoder.yudao.module.trade.controller.app.aftersale.vo.AppAfterSaleCreateReqVO;
  3 +import cn.iocoder.yudao.module.trade.controller.admin.aftersale.vo.TradeAfterSaleAuditReqVO;
  4 +import cn.iocoder.yudao.module.trade.controller.app.aftersale.vo.AppTradeAfterSaleCreateReqVO;
4 5  
5 6 /**
6 7 * 交易售后 Service 接口
... ... @@ -14,10 +15,18 @@ public interface TradeAfterSaleService {
14 15 * <p>
15 16 * 一般是用户发起售后请求
16 17 *
17   - * @param userId 用户编号
18   - * @param createReqVO 交易售后 Request 信息
  18 + * @param userId 会员用户编号
  19 + * @param createReqVO 创建 Request 信息
19 20 * @return 交易售后编号
20 21 */
21   - Long createAfterSale(Long userId, AppAfterSaleCreateReqVO createReqVO);
  22 + Long createAfterSale(Long userId, AppTradeAfterSaleCreateReqVO createReqVO);
22 23  
  24 + /**
  25 + * 审批交易售后
  26 + *
  27 + * @param userId 管理员用户编号
  28 + * @param userIp 操作 IP
  29 + * @param auditReqVO 审批 Request 信息
  30 + */
  31 + void auditAfterSale(Long userId, String userIp, TradeAfterSaleAuditReqVO auditReqVO);
23 32 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/TradeAfterSaleServiceImpl.java
  View file @92dbf09
1 1 package cn.iocoder.yudao.module.trade.service.aftersale;
2 2  
3 3 import cn.hutool.core.util.RandomUtil;
4   -import cn.iocoder.yudao.module.trade.controller.app.aftersale.vo.AppAfterSaleCreateReqVO;
  4 +import cn.iocoder.yudao.module.pay.api.refund.PayRefundApi;
  5 +import cn.iocoder.yudao.module.pay.api.refund.dto.PayRefundCreateReqDTO;
  6 +import cn.iocoder.yudao.module.trade.controller.admin.aftersale.vo.TradeAfterSaleAuditReqVO;
  7 +import cn.iocoder.yudao.module.trade.controller.app.aftersale.vo.AppTradeAfterSaleCreateReqVO;
5 8 import cn.iocoder.yudao.module.trade.convert.aftersale.TradeAfterSaleConvert;
6 9 import cn.iocoder.yudao.module.trade.dal.dataobject.aftersale.TradeAfterSaleDO;
7 10 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
... ... @@ -11,12 +14,18 @@ import cn.iocoder.yudao.module.trade.enums.aftersale.TradeAfterSaleStatusEnum;
11 14 import cn.iocoder.yudao.module.trade.enums.aftersale.TradeAfterSaleTypeEnum;
12 15 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderItemAfterSaleStatusEnum;
13 16 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum;
  17 +import cn.iocoder.yudao.module.trade.framework.order.config.TradeOrderProperties;
14 18 import cn.iocoder.yudao.module.trade.service.order.TradeOrderService;
15 19 import org.springframework.stereotype.Service;
  20 +import org.springframework.transaction.annotation.Transactional;
  21 +import org.springframework.transaction.support.TransactionSynchronization;
  22 +import org.springframework.transaction.support.TransactionSynchronizationManager;
16 23 import org.springframework.validation.annotation.Validated;
17 24  
18 25 import javax.annotation.Resource;
19 26  
  27 +import java.time.LocalDateTime;
  28 +
20 29 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
21 30 import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*;
22 31  
... ... @@ -35,8 +44,15 @@ public class TradeAfterSaleServiceImpl implements TradeAfterSaleService {
35 44 @Resource
36 45 private TradeAfterSaleMapper tradeAfterSaleMapper;
37 46  
  47 + @Resource
  48 + private PayRefundApi payRefundApi;
  49 +
  50 + @Resource
  51 + private TradeOrderProperties tradeOrderProperties;
  52 +
38 53 @Override
39   - public Long createAfterSale(Long userId, AppAfterSaleCreateReqVO createReqVO) {
  54 + @Transactional(rollbackFor = Exception.class)
  55 + public Long createAfterSale(Long userId, AppTradeAfterSaleCreateReqVO createReqVO) {
40 56 // 第一步，前置校验
41 57 TradeOrderItemDO tradeOrderItem = validateOrderItemApplicable(userId, createReqVO);
42 58  
... ... @@ -45,7 +61,7 @@ public class TradeAfterSaleServiceImpl implements TradeAfterSaleService {
45 61 return afterSale.getId();
46 62 }
47 63  
48   - private TradeOrderItemDO validateOrderItemApplicable(Long userId, AppAfterSaleCreateReqVO createReqVO) {
  64 + private TradeOrderItemDO validateOrderItemApplicable(Long userId, AppTradeAfterSaleCreateReqVO createReqVO) {
49 65 // 校验订单项存在
50 66 TradeOrderItemDO orderItem = tradeOrderService.getOrderItem(userId, createReqVO.getOrderItemId());
51 67 if (orderItem == null) {
... ... @@ -84,7 +100,7 @@ public class TradeAfterSaleServiceImpl implements TradeAfterSaleService {
84 100 return orderItem;
85 101 }
86 102  
87   - private TradeAfterSaleDO createAfterSale(AppAfterSaleCreateReqVO createReqVO,
  103 + private TradeAfterSaleDO createAfterSale(AppTradeAfterSaleCreateReqVO createReqVO,
88 104 TradeOrderItemDO tradeOrderItem) {
89 105 // 创建售后单
90 106 TradeAfterSaleDO afterSale = TradeAfterSaleConvert.INSTANCE.convert(createReqVO, tradeOrderItem);
... ... @@ -93,10 +109,94 @@ public class TradeAfterSaleServiceImpl implements TradeAfterSaleService {
93 109 // TODO 退还积分
94 110 tradeAfterSaleMapper.insert(afterSale);
95 111  
96   - // 更新交易订单项的售后状态 TODO
  112 + // 更新交易订单项的售后状态
  113 + tradeOrderService.updateOrderItemAfterSaleStatus(tradeOrderItem.getId(),
  114 + TradeOrderItemAfterSaleStatusEnum.NONE.getStatus(), TradeOrderItemAfterSaleStatusEnum.APPLY.getStatus());
  115 +
  116 + // TODO 记录售后日志
97 117  
98   - // 发送售后消息
  118 + // TODO 发送售后消息
99 119 return afterSale;
100 120 }
101 121  
  122 + @Override
  123 + @Transactional
  124 + public void auditAfterSale(Long userId, String userIp,
  125 + TradeAfterSaleAuditReqVO auditReqVO) {
  126 + // 校验售后单存在，并状态未审批
  127 + TradeAfterSaleDO afterSale = tradeAfterSaleMapper.selectById(auditReqVO.getId());
  128 + if (afterSale == null) {
  129 + throw exception(AFTER_SALE_NOT_FOUND);
  130 + }
  131 + if (afterSale.getStatus().equals(TradeAfterSaleStatusEnum.APPLY.getStatus())) {
  132 + throw exception(AFTER_SALE_AUDIT_FAIL_STATUS_NOT_APPLY);
  133 + }
  134 +
  135 + // 进行审批
  136 + if (auditReqVO.getAudit()) {
  137 + auditAfterSalePass(userId, userIp, auditReqVO, afterSale);
  138 + } else {
  139 + auditAfterSaleReject(userId, auditReqVO, afterSale);
  140 + }
  141 + }
  142 +
  143 + private void auditAfterSalePass(Long userId, String userIp,
  144 + TradeAfterSaleAuditReqVO auditReqVO, TradeAfterSaleDO afterSale) {
  145 + // 更新售后单的状态
  146 + // 情况一：退款：标记为 WAIT_REFUND 状态。后续等退款发起成功后，在标记为 COMPLETE 状态
  147 + // 情况二：退货退款：需要等用户退货后，才能发起退款
  148 + Integer newStatus = afterSale.getType().equals(TradeAfterSaleTypeEnum.REFUND.getType()) ?
  149 + TradeAfterSaleStatusEnum.WAIT_REFUND.getStatus() : TradeAfterSaleStatusEnum.SELLER_PASS.getStatus();
  150 + updateAfterSaleStatus(afterSale.getId(), TradeAfterSaleStatusEnum.APPLY.getStatus(), new TradeAfterSaleDO()
  151 + .setStatus(newStatus).setAuditUserId(userId)
  152 + .setAuditReason(auditReqVO.getAuditReason()).setAuditTime(LocalDateTime.now()));
  153 +
  154 + // 如果直接退款，则发起售后退款
  155 + if (afterSale.getType().equals(TradeAfterSaleTypeEnum.REFUND.getType())) {
  156 + createPayRefund(userIp, afterSale);
  157 + }
  158 +
  159 + // TODO 记录售后日志
  160 +
  161 + // TODO 发送售后消息
  162 + }
  163 +
  164 + private void auditAfterSaleReject(Long userId,
  165 + TradeAfterSaleAuditReqVO auditReqVO, TradeAfterSaleDO afterSale) {
  166 + // 更新售后单的状态
  167 + Integer newStatus = TradeAfterSaleStatusEnum.SELLER_REFUSE.getStatus();
  168 + updateAfterSaleStatus(afterSale.getId(), TradeAfterSaleStatusEnum.APPLY.getStatus(), new TradeAfterSaleDO()
  169 + .setStatus(newStatus).setAuditUserId(userId)
  170 + .setAuditReason(auditReqVO.getAuditReason()).setAuditTime(LocalDateTime.now()));
  171 +
  172 + // 更新交易订单项的售后状态为【未申请】
  173 + tradeOrderService.updateOrderItemAfterSaleStatus(afterSale.getOrderItemId(),
  174 + TradeOrderItemAfterSaleStatusEnum.APPLY.getStatus(), TradeOrderItemAfterSaleStatusEnum.NONE.getStatus());
  175 +
  176 + // TODO 记录售后日志
  177 +
  178 + // TODO 发送售后消息
  179 + }
  180 +
  181 + private void createPayRefund(String userIp, TradeAfterSaleDO afterSale) {
  182 + TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
  183 +
  184 + @Override
  185 + public void afterCommit() {
  186 + // 创建退款单
  187 + PayRefundCreateReqDTO createReqDTO = TradeAfterSaleConvert.INSTANCE.convert(userIp, afterSale, tradeOrderProperties);
  188 + Long payRefundId = payRefundApi.createPayRefund(createReqDTO);
  189 + // 更新售后单的退款单号
  190 + tradeAfterSaleMapper.updateById(new TradeAfterSaleDO().setId(afterSale.getId()).setPayRefundId(payRefundId));
  191 + }
  192 + });
  193 + }
  194 +
  195 + private void updateAfterSaleStatus(Long id, Integer status, TradeAfterSaleDO updateObj) {
  196 + int updateCount = tradeAfterSaleMapper.updateByIdAndStatus(id, status, updateObj);
  197 + if (updateCount == 0) {
  198 + throw exception(AFTER_SALE_UPDATE_STATUS_FAIL);
  199 + }
  200 + }
  201 +
102 202 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderService.java
  View file @92dbf09
... ... @@ -12,6 +12,8 @@ import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderItemDO;
12 12 */
13 13 public interface TradeOrderService {
14 14  
  15 + // =================== Order ===================
  16 +
15 17 /**
16 18 * 创建交易订单
17 19 *
... ... @@ -23,6 +25,17 @@ public interface TradeOrderService {
23 25 Long createOrder(Long userId, String userIp, AppTradeOrderCreateReqVO createReqVO);
24 26  
25 27 /**
  28 + * 获得指定用户，指定的交易订单
  29 + *
  30 + * @param userId 用户编号
  31 + * @param orderId 交易订单编号
  32 + * @return 交易订单
  33 + */
  34 + TradeOrderDO getOrder(Long userId, Long orderId);
  35 +
  36 + // =================== Order Item ===================
  37 +
  38 + /**
26 39 * 获得指定用户，指定的交易订单项
27 40 *
28 41 * @param userId 用户编号
... ... @@ -32,12 +45,11 @@ public interface TradeOrderService {
32 45 TradeOrderItemDO getOrderItem(Long userId, Long itemId);
33 46  
34 47 /**
35   - * 获得指定用户，指定的交易订单
  48 + * 更新交易订单项的售后状态
36 49 *
37   - * @param userId 用户编号
38   - * @param orderId 交易订单编号
39   - * @return 交易订单
  50 + * @param id 交易订单项编号
  51 + * @param oldAfterSaleStatus 当前售后状态；如果不符，更新后会抛出异常
  52 + * @param newAfterSaleStatus 目标售后状态
40 53 */
41   - TradeOrderDO getOrder(Long userId, Long orderId);
42   -
  54 + void updateOrderItemAfterSaleStatus(Long id, Integer oldAfterSaleStatus, Integer newAfterSaleStatus);
43 55 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
  View file @92dbf09
... ... @@ -8,7 +8,7 @@ import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
8 8 import cn.iocoder.yudao.module.member.api.address.AddressApi;
9 9 import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
10 10 import cn.iocoder.yudao.module.pay.api.order.PayOrderApi;
11   -import cn.iocoder.yudao.module.pay.api.order.PayOrderInfoCreateReqDTO;
  11 +import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderCreateReqDTO;
12 12 import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi;
13 13 import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
14 14 import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuUpdateStockReqDTO;
... ... @@ -42,8 +42,7 @@ import java.util.Set;
42 42  
43 43 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
44 44 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
45   -import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.ORDER_CREATE_SKU_NOT_SALE;
46   -import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.ORDER_CREATE_SPU_NOT_FOUND;
  45 +import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*;
47 46  
48 47 /**
49 48 * 交易订单 Service 实现类
... ... @@ -75,6 +74,8 @@ public class TradeOrderServiceImpl implements TradeOrderService {
75 74 @Resource
76 75 private TradeOrderProperties tradeOrderProperties;
77 76  
  77 + // =================== Order ===================
  78 +
78 79 @Override
79 80 @Transactional(rollbackFor = Exception.class)
80 81 public Long createOrder(Long userId, String userIp, AppTradeOrderCreateReqVO createReqVO) {
... ... @@ -100,16 +101,6 @@ public class TradeOrderServiceImpl implements TradeOrderService {
100 101 }
101 102  
102 103 @Override
103   - public TradeOrderItemDO getOrderItem(Long userId, Long itemId) {
104   - TradeOrderItemDO orderItem = tradeOrderItemMapper.selectById(itemId);
105   - if (orderItem != null
106   - && ObjectUtil.notEqual(orderItem.getUserId(), userId)) {
107   - return null;
108   - }
109   - return orderItem;
110   - }
111   -
112   - @Override
113 104 public TradeOrderDO getOrder(Long userId, Long orderId) {
114 105 TradeOrderDO order = tradeOrderMapper.selectById(orderId);
115 106 if (order != null
... ... @@ -240,7 +231,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
240 231 private void createPayOrder(TradeOrderDO tradeOrderDO, List<TradeOrderItemDO> tradeOrderItemDOs,
241 232 List<ProductSpuRespDTO> spus) {
242 233 // 创建支付单，用于后续的支付
243   - PayOrderInfoCreateReqDTO payOrderCreateReqDTO = TradeOrderConvert.INSTANCE.convert(
  234 + PayOrderCreateReqDTO payOrderCreateReqDTO = TradeOrderConvert.INSTANCE.convert(
244 235 tradeOrderDO, tradeOrderItemDOs, spus, tradeOrderProperties);
245 236 Long payOrderId = payOrderApi.createPayOrder(payOrderCreateReqDTO);
246 237  
... ... @@ -248,4 +239,24 @@ public class TradeOrderServiceImpl implements TradeOrderService {
248 239 tradeOrderMapper.updateById(new TradeOrderDO().setId(tradeOrderDO.getId()).setPayOrderId(payOrderId));
249 240 }
250 241  
  242 + // =================== Order ===================
  243 +
  244 + @Override
  245 + public TradeOrderItemDO getOrderItem(Long userId, Long itemId) {
  246 + TradeOrderItemDO orderItem = tradeOrderItemMapper.selectById(itemId);
  247 + if (orderItem != null
  248 + && ObjectUtil.notEqual(orderItem.getUserId(), userId)) {
  249 + return null;
  250 + }
  251 + return orderItem;
  252 + }
  253 +
  254 + @Override
  255 + public void updateOrderItemAfterSaleStatus(Long id, Integer oldAfterSaleStatus, Integer newAfterSaleStatus) {
  256 + int updateCount = tradeOrderItemMapper.updateAfterSaleStatus(id, oldAfterSaleStatus, newAfterSaleStatus);
  257 + if (updateCount <= 0) {
  258 + throw exception(ORDER_ITEM_UPDATE_AFTER_SALE_STATUS_FAIL);
  259 + }
  260 + }
  261 +
251 262 }
... ...
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/PayOrderApi.java
  View file @92dbf09
1 1 package cn.iocoder.yudao.module.pay.api.order;
2 2  
  3 +import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderCreateReqDTO;
  4 +
3 5 import javax.validation.Valid;
4 6  
5 7 /**
... ... @@ -16,6 +18,6 @@ public interface PayOrderApi {
16 18 * @param reqDTO 创建请求
17 19 * @return 支付单编号
18 20 */
19   - Long createPayOrder(@Valid PayOrderInfoCreateReqDTO reqDTO);
  21 + Long createPayOrder(@Valid PayOrderCreateReqDTO reqDTO);
20 22  
21 23 }
... ...
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/PayOrderInfoCreateReqDTO.java renamed to yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/dto/PayOrderCreateReqDTO.java
  View file @92dbf09
1   -package cn.iocoder.yudao.module.pay.api.order;
  1 +package cn.iocoder.yudao.module.pay.api.order.dto;
2 2  
3 3 import lombok.Data;
4 4 import org.hibernate.validator.constraints.Length;
... ... @@ -15,7 +15,7 @@ import java.time.LocalDateTime;
15 15 * @author LeeYan9
16 16 */
17 17 @Data
18   -public class PayOrderInfoCreateReqDTO implements Serializable {
  18 +public class PayOrderCreateReqDTO implements Serializable {
19 19  
20 20 /**
21 21 * 应用编号
... ...
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/refund/PayRefundApi.java 0 → 100644
  View file @92dbf09
  1 +package cn.iocoder.yudao.module.pay.api.refund;
  2 +
  3 +import cn.iocoder.yudao.module.pay.api.refund.dto.PayRefundCreateReqDTO;
  4 +
  5 +import javax.validation.Valid;
  6 +
  7 +/**
  8 + * 退款单 API 接口
  9 + *
  10 + * @author 芋道源码
  11 + */
  12 +public interface PayRefundApi {
  13 +
  14 + /**
  15 + * 创建退款单
  16 + *
  17 + * @param reqDTO 创建请求
  18 + * @return 退款单编号
  19 + */
  20 + Long createPayRefund(@Valid PayRefundCreateReqDTO reqDTO);
  21 +
  22 +}
... ...
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/refund/dto/PayRefundCreateReqDTO.java 0 → 100644
  View file @92dbf09
  1 +package cn.iocoder.yudao.module.pay.api.refund.dto;
  2 +
  3 +import lombok.Data;
  4 +import org.hibernate.validator.constraints.Length;
  5 +
  6 +import javax.validation.constraints.Min;
  7 +import javax.validation.constraints.NotEmpty;
  8 +import javax.validation.constraints.NotNull;
  9 +
  10 +/**
  11 + * 退款单创建 Request DTO
  12 + *
  13 + * @author 芋道源码
  14 + */
  15 +@Data
  16 +public class PayRefundCreateReqDTO {
  17 +
  18 + /**
  19 + * 应用编号
  20 + */
  21 + @NotNull(message = "应用编号不能为空")
  22 + private Long appId;
  23 + /**
  24 + * 用户 IP
  25 + */
  26 + @NotEmpty(message = "用户 IP 不能为空")
  27 + private String userIp;
  28 +
  29 + // ========== 商户相关字段 ==========
  30 +
  31 + /**
  32 + * 商户订单编号
  33 + */
  34 + @NotEmpty(message = "商户订单编号不能为空")
  35 + private String merchantOrderId;
  36 +
  37 + /**
  38 + * 退款描述
  39 + */
  40 + @NotEmpty(message = "退款描述不能为空")
  41 + @Length(max = 128, message = "退款描述长度不能超过128")
  42 + private String reason;
  43 +
  44 + // ========== 订单相关字段 ==========
  45 +
  46 + /**
  47 + * 退款金额，单位：分
  48 + */
  49 + @NotNull(message = "退款金额不能为空")
  50 + @Min(value = 1, message = "退款金额必须大于零")
  51 + private Integer amount;
  52 +}
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/api/order/PayOrderApiImpl.java
  View file @92dbf09
1   -//package cn.iocoder.yudao.module.pay.api.order;
2   -//
3   -//import org.springframework.stereotype.Service;
4   -//import org.springframework.transaction.annotation.Transactional;
5   -//
6   -///**
7   -// * @author LeeYan9
8   -// * @since 2022-09-06
9   -// */
10   -//@Service
11   -//public class PayOrderApiImpl implements PayOrderApi {
12   -//
13   -// @Override
14   -// @Transactional(rollbackFor = Exception.class)
15   -// public Long createPayOrder(PayOrderInfoCreateReqDTO reqDTO) {
16   -// return null;
17   -// }
18   -//
19   -//}
  1 +package cn.iocoder.yudao.module.pay.api.order;
  2 +
  3 +import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderCreateReqDTO;
  4 +import org.springframework.stereotype.Service;
  5 +
  6 +/**
  7 + * TODO 注释
  8 + */
  9 +@Service
  10 +public class PayOrderApiImpl implements PayOrderApi {
  11 +
  12 + @Override
  13 + public Long createPayOrder(PayOrderCreateReqDTO reqDTO) {
  14 + return null;
  15 + }
  16 +
  17 +}
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/api/PayOrderApiImpl.java renamed to yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/api/refund/PayRefundApiImpl.java
  View file @92dbf09
1   -package cn.iocoder.yudao.module.pay.api;
  1 +package cn.iocoder.yudao.module.pay.api.refund;
2 2  
3   -import cn.iocoder.yudao.module.pay.api.order.PayOrderApi;
4   -import cn.iocoder.yudao.module.pay.api.order.PayOrderInfoCreateReqDTO;
  3 +import cn.iocoder.yudao.module.pay.api.refund.dto.PayRefundCreateReqDTO;
5 4 import org.springframework.stereotype.Service;
  5 +import org.springframework.validation.annotation.Validated;
6 6  
7 7 /**
8   - * TODO 注释
  8 + * 退款单 API 实现类
  9 + *
  10 + * @author 芋道源码
9 11 */
10 12 @Service
11   -public class PayOrderApiImpl implements PayOrderApi {
  13 +@Validated
  14 +public class PayRefundApiImpl implements PayRefundApi {
12 15  
13 16 @Override
14   - public Long createPayOrder(PayOrderInfoCreateReqDTO reqDTO) {
  17 + public Long createPayRefund(PayRefundCreateReqDTO reqDTO) {
  18 + // TODO 芋艿：暂未实现
15 19 return null;
16 20 }
17   -
18 21 }
... ...