From 4ebe4f9ac6cbef90b0b5e56f254bad4abdd101c6 Mon Sep 17 00:00:00 2001 From: liwq <122639653@qq.com> Date: Tue, 28 Oct 2025 09:34:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tradeapi/enums/ErrorCodeConstants.java | 1 + .../enums/order/TradeOrderStatusEnum.java | 9 ++++ .../service/dialog/AiDialogServiceImpl.java | 12 +++--- .../admin/order/TradeOrderController.java | 40 ++++++++++++++---- .../order/vo/TradeOrderSubTimeListRespVo.java | 10 +++++ .../convert/order/TradeOrderConvert.java | 6 +++ ...eSubLogDO.java => TradeOrderSubLogDO.java} | 2 +- ...apper.java => TradeOrderSubLogMapper.java} | 4 +- .../service/order/TradeOrderQueryService.java | 8 ++-- .../order/TradeOrderQueryServiceImpl.java | 14 +++---- .../order/TradeOrderSubLogService.java | 14 +++++++ .../order/TradeOrderSubLogServiceImpl.java | 20 +++++++++ .../order/TradeOrderUpdateService.java | 14 +++++++ .../order/TradeOrderUpdateServiceImpl.java | 20 +++++++++ .../service/order/TradeSubLogService.java | 28 ------------- .../service/order/TradeSubLogServiceImpl.java | 41 ------------------- 16 files changed, 146 insertions(+), 97 deletions(-) create mode 100644 tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/vo/TradeOrderSubTimeListRespVo.java rename tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/dataobject/order/{TradeSubLogDO.java => TradeOrderSubLogDO.java} (95%) rename tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/mysql/order/{TradeSubLogMapper.java => TradeOrderSubLogMapper.java} (61%) create mode 100644 tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderSubLogService.java create mode 100644 tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderSubLogServiceImpl.java delete mode 100644 tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeSubLogService.java delete mode 100644 tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeSubLogServiceImpl.java diff --git a/tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/ErrorCodeConstants.java b/tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/ErrorCodeConstants.java index 3f0a983..89f66e4 100644 --- a/tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/ErrorCodeConstants.java +++ b/tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/ErrorCodeConstants.java @@ -16,6 +16,7 @@ public interface ErrorCodeConstants { ErrorCode ORDER_ITEM_NOT_FOUND = new ErrorCode(1_011_000_010, "交易订单项不存在"); ErrorCode ORDER_NOT_FOUND = new ErrorCode(1_011_000_011, "交易订单不存在"); ErrorCode ORDER_ITEM_UPDATE_AFTER_SALE_STATUS_FAIL = new ErrorCode(1_011_000_012, "交易订单项更新售后状态失败，请重试"); + ErrorCode ORDER_UPDATE_UNWAITACCEPT_FAIL = new ErrorCode(1_011_000_012, "交易订单更新状态失败，当前订单不处于待验收状态"); ErrorCode ORDER_UPDATE_PAID_STATUS_NOT_UNPAID = new ErrorCode(1_011_000_013, "交易订单更新支付状态失败，订单不是【未支付】状态"); ErrorCode ORDER_UPDATE_PAID_FAIL_PAY_ORDER_ID_ERROR = new ErrorCode(1_011_000_014, "交易订单更新支付状态失败，支付单编号不匹配"); ErrorCode ORDER_UPDATE_PAID_FAIL_PAY_ORDER_STATUS_NOT_SUCCESS = new ErrorCode(1_011_000_015, "交易订单更新支付状态失败，支付单状态不是【支付成功】状态"); diff --git a/tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/order/TradeOrderStatusEnum.java b/tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/order/TradeOrderStatusEnum.java index 689e834..b9e36aa 100644 --- a/tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/order/TradeOrderStatusEnum.java +++ b/tashow-feign/tashow-trade-api/src/main/java/com/tashow/cloud/tradeapi/enums/order/TradeOrderStatusEnum.java @@ -55,6 +55,15 @@ public enum TradeOrderStatusEnum implements ArrayValuable { public static boolean isUnpaid(Integer status) { return ObjectUtil.equal(WAITPAID.getStatus(), status); } + /** + * 判断指定状态，是否正处于【待验收】状态 + * + * @param status 指定状态 + * @return 是否 + */ + public static boolean isWaitAccept(Integer status) { + return ObjectUtil.equal(WAITACCEPT.getStatus(), status); + } /** * 判断指定状态，是否正处于【待发货】状态 diff --git a/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/service/dialog/AiDialogServiceImpl.java b/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/service/dialog/AiDialogServiceImpl.java index e1d8e9a..1cd2ee0 100644 --- a/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/service/dialog/AiDialogServiceImpl.java +++ b/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/service/dialog/AiDialogServiceImpl.java @@ -195,6 +195,11 @@ public class AiDialogServiceImpl extends ServiceImpl //解析翻译结果 JSONObject intentResult = translateResult.getJSONObject("intent_result"); + //宠物档案 todo + messageDO.setPetId(1l); + messageDO.setPetName(petName.get(speciesLabels)); + messageDO.setPetAvatar(petAvatars.get(speciesLabels)); + messageDO.setPetType(speciesLabels); //识别物种，无法翻译音频 if (intentResult.getDouble("confidence")<0.7){ messageDO.setTransStatus(0); @@ -205,7 +210,6 @@ public class AiDialogServiceImpl extends ServiceImpl messageDO.setTransResult(petFailResult.get(RandomUtil.randomInt(petFailResult.size()))); return messageDO; } - //都识别成功后 也有不同的翻译结果 JSONObject probabilities = intentResult.getJSONObject("probabilities"); String resultKey = probabilities.entrySet().stream() @@ -217,11 +221,7 @@ public class AiDialogServiceImpl extends ServiceImpl List emoList = successMap.get(emo); messageDO.setTransStatus(1); messageDO.setTransResult(emoList.get(RandomUtil.randomInt(emoList.size()))); - //宠物档案 todo - messageDO.setPetId(1l); - messageDO.setPetName(petName.get(speciesLabels)); - messageDO.setPetAvatar(petAvatars.get(speciesLabels)); - messageDO.setPetType(speciesLabels); + return messageDO; } diff --git a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/TradeOrderController.java b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/TradeOrderController.java index ef8a55e..4fcd38f 100644 --- a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/TradeOrderController.java +++ b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/TradeOrderController.java @@ -11,6 +11,7 @@ import com.tashow.cloud.trade.convert.order.TradeOrderConvert; import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderDO; import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderItemDO; import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderLogDO; +import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderSubLogDO; import com.tashow.cloud.trade.service.order.TradeOrderLogService; import com.tashow.cloud.trade.service.order.TradeOrderQueryService; import com.tashow.cloud.trade.service.order.TradeOrderUpdateService; @@ -116,6 +117,32 @@ public class TradeOrderController { return success(tradeOrderUpdateService.cancelOrderByAdmin(id)); } + /** + * 接单确认 + * + * @return + */ + @PutMapping("/acceptConfirm") + @PermitAll +// @PreAuthorize("@ss.hasPermission('trade:order:query')") + public CommonResult acceptConfirm(@RequestParam("id") Long id) { + tradeOrderUpdateService.acceptConfirmOrderByAdmin(id); + return success(true); + } + + /** + * 服务上报 + * + * @return + */ + @PutMapping("/reportServe") + @PermitAll +// @PreAuthorize("@ss.hasPermission('trade:order:query')") + public CommonResult reportServe(@RequestParam("id") Long id) { + tradeOrderUpdateService.reportServeOrderByAdmin(id); + return success(true); + } + // 订单备注 @PutMapping("/update-remark") @PermitAll @@ -127,7 +154,6 @@ public class TradeOrderController { /** * 交易快照 - * * @return */ @GetMapping("/fastPhoto") @@ -146,15 +172,13 @@ public class TradeOrderController { * * @return */ - @GetMapping("/subTimeLog") + @GetMapping("/subTimeLog/{id}") @PermitAll // @PreAuthorize("@ss.hasPermission('trade:order:query')") - public CommonResult subTimeLog(TradeOrderFastPhotoReqVo reqVo) { - //获取交易订单详情 - TradeOrderItemDO orderItem = tradeOrderQueryService.getOrderItem(reqVo.getItemId()); - //获取产品详情 - - return success(TradeOrderConvert.INSTANCE.convert(orderItem,null)); + public CommonResult subTimeLog(@PathVariable("id") Long id) { + //获取订单预约时间修改列表 + List subLogDO = tradeOrderQueryService.getSubTimeLogList(id); + return success(TradeOrderConvert.INSTANCE.convertToSubTimeList(subLogDO)); } } diff --git a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/vo/TradeOrderSubTimeListRespVo.java b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/vo/TradeOrderSubTimeListRespVo.java new file mode 100644 index 0000000..80e73e7 --- /dev/null +++ b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/vo/TradeOrderSubTimeListRespVo.java @@ -0,0 +1,10 @@ +package com.tashow.cloud.trade.controller.admin.order.vo; + +import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderSubLogDO; + +import java.util.List; + +public class TradeOrderSubTimeListRespVo { + + private List subTimeList; +} diff --git a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/convert/order/TradeOrderConvert.java b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/convert/order/TradeOrderConvert.java index 6edbd1d..9b5d233 100644 --- a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/convert/order/TradeOrderConvert.java +++ b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/convert/order/TradeOrderConvert.java @@ -26,6 +26,7 @@ import com.tashow.cloud.trade.dal.dataobject.delivery.DeliveryExpressDO; import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderDO; import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderItemDO; import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderLogDO; +import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderSubLogDO; import com.tashow.cloud.trade.framework.delivery.core.client.dto.ExpressTrackRespDTO; import com.tashow.cloud.trade.framework.order.config.TradeOrderProperties; import com.tashow.cloud.trade.service.brokerage.bo.BrokerageAddReqBO; @@ -119,6 +120,11 @@ public interface TradeOrderConvert { TradeOrderFastPhotoRespVo convert(TradeOrderItemDO itemDO, ProdDO prodDO); //endregion + //region 订单预约时间修改列表 + TradeOrderSubTimeListRespVo convertToSubTimeList(List subTimeList); + //endregion + + @Mappings({ @Mapping(target = "id", ignore = true), @Mapping(source = "userId", target = "userId"), diff --git a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/dataobject/order/TradeSubLogDO.java b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/dataobject/order/TradeOrderSubLogDO.java similarity index 95% rename from tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/dataobject/order/TradeSubLogDO.java rename to tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/dataobject/order/TradeOrderSubLogDO.java index 432bb64..0b8115b 100644 --- a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/dataobject/order/TradeSubLogDO.java +++ b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/dataobject/order/TradeOrderSubLogDO.java @@ -21,7 +21,7 @@ import java.time.LocalDateTime; @Builder @NoArgsConstructor @AllArgsConstructor -public class TradeSubLogDO extends BaseDO { +public class TradeOrderSubLogDO extends BaseDO { /** * 编号 diff --git a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/mysql/order/TradeSubLogMapper.java b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/mysql/order/TradeOrderSubLogMapper.java similarity index 61% rename from tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/mysql/order/TradeSubLogMapper.java rename to tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/mysql/order/TradeOrderSubLogMapper.java index c5f96e4..9615b52 100644 --- a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/mysql/order/TradeSubLogMapper.java +++ b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/mysql/order/TradeOrderSubLogMapper.java @@ -1,7 +1,7 @@ package com.tashow.cloud.trade.dal.mysql.order; import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX; -import com.tashow.cloud.trade.dal.dataobject.order.TradeSubLogDO; +import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderSubLogDO; import org.apache.ibatis.annotations.Mapper; /** @@ -10,6 +10,6 @@ import org.apache.ibatis.annotations.Mapper; * @author 芋道源码 */ @Mapper -public interface TradeSubLogMapper extends BaseMapperX { +public interface TradeOrderSubLogMapper extends BaseMapperX { } \ No newline at end of file diff --git a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderQueryService.java b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderQueryService.java index ce9de66..c2c336e 100644 --- a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderQueryService.java +++ b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderQueryService.java @@ -2,12 +2,12 @@ package com.tashow.cloud.trade.service.order; import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.trade.controller.admin.order.vo.TradeOrderFastPhotoReqVo; import com.tashow.cloud.trade.controller.admin.order.vo.TradeOrderPageReqVO; import com.tashow.cloud.trade.controller.admin.order.vo.TradeOrderSummaryRespVO; import com.tashow.cloud.trade.controller.app.order.vo.AppTradeOrderPageReqVO; import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderDO; import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderItemDO; +import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderSubLogDO; import com.tashow.cloud.trade.framework.delivery.core.client.dto.ExpressTrackRespDTO; import com.tashow.cloud.tradeapi.enums.order.TradeOrderTypeEnum; @@ -159,9 +159,9 @@ public interface TradeOrderQueryService { List getOrderItemListByOrderId(Collection orderIds); /** - * 获取订单交易快照 - * @param reqVo + * 获取订单预约时间修改列表 + * @param id * @return */ - TradeOrderItemDO getFastPhoto(TradeOrderFastPhotoReqVo reqVo); + List getSubTimeLogList(Long id); } diff --git a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderQueryServiceImpl.java b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderQueryServiceImpl.java index c14deef..5d0deb5 100644 --- a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderQueryServiceImpl.java +++ b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderQueryServiceImpl.java @@ -1,25 +1,25 @@ package com.tashow.cloud.trade.service.order; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.extra.spring.SpringUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.tashow.cloud.common.pojo.PageResult; -import com.tashow.cloud.trade.controller.admin.order.vo.TradeOrderFastPhotoReqVo; import com.tashow.cloud.trade.controller.admin.order.vo.TradeOrderPageReqVO; import com.tashow.cloud.trade.controller.admin.order.vo.TradeOrderSummaryRespVO; import com.tashow.cloud.trade.controller.app.order.vo.AppTradeOrderPageReqVO; import com.tashow.cloud.trade.dal.dataobject.delivery.DeliveryExpressDO; import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderDO; import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderItemDO; +import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderSubLogDO; import com.tashow.cloud.trade.dal.mysql.order.TradeOrderItemMapper; import com.tashow.cloud.trade.dal.mysql.order.TradeOrderMapper; +import com.tashow.cloud.trade.dal.mysql.order.TradeOrderSubLogMapper; import com.tashow.cloud.trade.dal.redis.RedisKeyConstants; import com.tashow.cloud.trade.framework.delivery.core.client.ExpressClientFactory; import com.tashow.cloud.trade.framework.delivery.core.client.dto.ExpressTrackQueryReqDTO; import com.tashow.cloud.trade.framework.delivery.core.client.dto.ExpressTrackRespDTO; import com.tashow.cloud.trade.service.delivery.DeliveryExpressService; -import com.tashow.cloud.tradeapi.enums.order.TradeOrderRefundStatusEnum; import com.tashow.cloud.tradeapi.enums.order.TradeOrderStatusEnum; import com.tashow.cloud.tradeapi.enums.order.TradeOrderTypeEnum; import jakarta.annotation.Resource; @@ -49,6 +49,8 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService { private TradeOrderMapper tradeOrderMapper; @Resource private TradeOrderItemMapper tradeOrderItemMapper; + @Resource + private TradeOrderSubLogMapper tradeOrderSubLogMapper; @Resource private DeliveryExpressService deliveryExpressService; @@ -242,9 +244,7 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService { } @Override - public TradeOrderItemDO getFastPhoto(TradeOrderFastPhotoReqVo reqVo) { - - - return null; + public List getSubTimeLogList(Long id) { + return tradeOrderSubLogMapper.selectList(new LambdaQueryWrapper().eq(TradeOrderSubLogDO::getOrderId,id)); } } diff --git a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderSubLogService.java b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderSubLogService.java new file mode 100644 index 0000000..5c50850 --- /dev/null +++ b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderSubLogService.java @@ -0,0 +1,14 @@ +package com.tashow.cloud.trade.service.order; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderSubLogDO; + +/** + * 订单预约时间修改记录 Service 接口 + * + * @author 芋道源码 + */ +public interface TradeOrderSubLogService extends IService { + + +} \ No newline at end of file diff --git a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderSubLogServiceImpl.java b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderSubLogServiceImpl.java new file mode 100644 index 0000000..5eaa772 --- /dev/null +++ b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderSubLogServiceImpl.java @@ -0,0 +1,20 @@ +package com.tashow.cloud.trade.service.order; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderSubLogDO; +import com.tashow.cloud.trade.dal.mysql.order.TradeOrderSubLogMapper; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +/** + * 订单预约时间修改记录 Service 实现类 + * + * @author 芋道源码 + */ +@Service +@Validated +public class TradeOrderSubLogServiceImpl extends ServiceImpl implements TradeOrderSubLogService { + + + +} \ No newline at end of file diff --git a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderUpdateService.java b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderUpdateService.java index 562f063..1d3044a 100644 --- a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderUpdateService.java +++ b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderUpdateService.java @@ -41,6 +41,19 @@ public interface TradeOrderUpdateService { */ TradeOrderDO createOrder(Long userId, AppTradeOrderCreateReqVO createReqVO); + + /** + * 确认接单 + * @param id + */ + void acceptConfirmOrderByAdmin(Long id); + + /** + * 服务上报 + * @param id + */ + void reportServeOrderByAdmin(Long id); + /** * 更新交易订单已支付 * @@ -224,4 +237,5 @@ public interface TradeOrderUpdateService { */ void updateOrderGiveCouponIds(Long userId, Long orderId, List giveCouponIds); + } diff --git a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderUpdateServiceImpl.java b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderUpdateServiceImpl.java index a256cb4..87080c1 100644 --- a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderUpdateServiceImpl.java +++ b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeOrderUpdateServiceImpl.java @@ -246,6 +246,26 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService { order.setPayOrderId(payOrderId); } + + @Override + public void acceptConfirmOrderByAdmin(Long id) { + // 1.1 校验订单是否存在 + TradeOrderDO order = validateOrderExists(id); + order.setOrderStatus(TradeOrderStatusEnum.WAITSERVE.getStatus()); + tradeOrderMapper.updateById(order); + } + + @Override + public void reportServeOrderByAdmin(Long id) { + // 1.1 校验订单是否存在 + TradeOrderDO order = validateOrderExists(id); + if (!TradeOrderStatusEnum.isWaitAccept(order.getOrderStatus())){ + throw exception(ORDER_UPDATE_UNWAITACCEPT_FAIL); + } + order.setFinishTime(LocalDateTime.now()); + tradeOrderMapper.updateById(order); + } + @Override @Transactional(rollbackFor = Exception.class) @TradeOrderLog(operateType = TradeOrderOperateTypeEnum.MEMBER_PAY) diff --git a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeSubLogService.java b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeSubLogService.java deleted file mode 100644 index e666703..0000000 --- a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeSubLogService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.tashow.cloud.trade.service.order; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.tashow.cloud.trade.dal.dataobject.order.TradeSubLogDO; - -/** - * 订单预约时间修改记录 Service 接口 - * - * @author 芋道源码 - */ -public interface TradeSubLogService extends IService { - - - /** - * 删除订单预约时间修改记录 - * - * @param id 编号 - */ - void deleteTradeSubLog(Long id); - - /** - * 获得订单预约时间修改记录 - * - * @param id 编号 - * @return 订单预约时间修改记录 - */ - TradeSubLogDO getTradeSubLog(Long id); -} \ No newline at end of file diff --git a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeSubLogServiceImpl.java b/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeSubLogServiceImpl.java deleted file mode 100644 index 93ba804..0000000 --- a/tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/service/order/TradeSubLogServiceImpl.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.tashow.cloud.trade.service.order; - -import com.tashow.cloud.trade.dal.dataobject.order.TradeSubLogDO; -import com.tashow.cloud.trade.dal.mysql.order.TradeSubLogMapper; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -/** - * 订单预约时间修改记录 Service 实现类 - * - * @author 芋道源码 - */ -@Service -@Validated -public class TradeSubLogServiceImpl implements TradeSubLogService { - - @Resource - private TradeSubLogMapper tradeSubLogMapper; - - - @Override - public void deleteTradeSubLog(Long id) { - // 校验存在 - validateTradeSubLogExists(id); - // 删除 - tradeSubLogMapper.deleteById(id); - } - - private void validateTradeSubLogExists(Long id) { - if (tradeSubLogMapper.selectById(id) == null) { -// throw exception(TRADE_SUB_LOG_NOT_EXISTS); - } - } - - @Override - public TradeSubLogDO getTradeSubLog(Long id) { - return tradeSubLogMapper.selectById(id); - } - -} \ No newline at end of file