tashow/tashow-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加文件服务

Browse Source
This commit is contained in:
liwq
2025-11-04 16:13:28 +08:00
parent 6a59e27ebb
commit fd5a68c27e
112 changed files with 1245 additions and 741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/TradeOrderController.java
View File

@@ -3,8 +3,6 @@ package com.tashow.cloud.trade.controller.admin.order;
import cn.hutool.core.collection.CollUtil;
import com.tashow.cloud.common.pojo.CommonResult;
import com.tashow.cloud.common.pojo.PageResult;
import com.tashow.cloud.userapi.api.user.UserMemberApi;
import com.tashow.cloud.userapi.api.user.dto.UserMemberRespDTO;
import com.tashow.cloud.productapi.api.product.ProdApi;
import com.tashow.cloud.productapi.api.product.dto.ProdDO;
import com.tashow.cloud.trade.controller.admin.order.vo.*;
@@ -16,10 +14,12 @@ 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;
import com.tashow.cloud.userapi.api.user.UserMemberApi;
import com.tashow.cloud.userapi.api.user.dto.UserMemberRespDTO;
import jakarta.annotation.Resource;
import jakarta.annotation.security.PermitAll;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -48,7 +48,7 @@ public class TradeOrderController {
private TradeOrderLogService tradeOrderLogService;
@Resource
private UserMemberApi memberUserApi;
private UserMemberApi userMemberApi;
@Resource
private ProdApi prodApi;
@@ -59,8 +59,7 @@ public class TradeOrderController {
* @return
*/
@GetMapping("/page")
@PermitAll
// @PreAuthorize("@ss.hasPermission('trade:order:query')")
@PreAuthorize("@ss.hasPermission('trade:order:query')")
public CommonResult<PageResult<TradeOrderPageRespVO>> getOrderPage(@Valid TradeOrderPageReqVO reqVO) {
// 查询订单
PageResult<TradeOrderDO> pageResult = tradeOrderQueryService.getOrderPage(reqVO);
@@ -71,7 +70,7 @@ public class TradeOrderController {
List<TradeOrderItemDO> orderItems = tradeOrderQueryService.getOrderItemListByOrderId(
convertSet(pageResult.getList(), TradeOrderDO::getId));
//查询用户信息
Map<Long, UserMemberRespDTO> userMap = memberUserApi.getUserMap(convertList(pageResult.getList(), TradeOrderDO::getUserId));
Map<Long, UserMemberRespDTO> userMap = userMemberApi.getUserMap(convertList(pageResult.getList(), TradeOrderDO::getUserId));
// 最终组合
return success(TradeOrderConvert.INSTANCE.convertPage(pageResult, orderItems,userMap));
}
@@ -83,8 +82,7 @@ public class TradeOrderController {
* @return
*/
@GetMapping("/get-detail")
@PermitAll
// @PreAuthorize("@ss.hasPermission('trade:order:query')")
@PreAuthorize("@ss.hasPermission('trade:order:query')")
public CommonResult<TradeOrderDetailRespVO> getOrderDetail(@RequestParam("id") Long id) {
// 查询订单
TradeOrderDO order = tradeOrderQueryService.getOrder(id);
@@ -93,9 +91,11 @@ public class TradeOrderController {
}
// 查询订单项
List<TradeOrderItemDO> orderItems = tradeOrderQueryService.getOrderItemListByOrderId(id);
//查询订单日志
List<TradeOrderLogDO> orderLogs = tradeOrderLogService.getOrderLogListByOrderId(id);
return success(TradeOrderConvert.INSTANCE.convert(order, orderItems, orderLogs));
//查询用户信息
Map<Long, UserMemberRespDTO> userMap = userMemberApi.getUserMap(List.of(order.getId()));
return success(TradeOrderConvert.INSTANCE.convert(order, orderItems,userMap, orderLogs));
}
/**
@@ -104,8 +104,7 @@ public class TradeOrderController {
* @return
*/
@GetMapping("/summary")
@PermitAll
// @PreAuthorize("@ss.hasPermission('trade:order:query')")
@PreAuthorize("@ss.hasPermission('trade:order:query')")
public CommonResult<TradeOrderSummaryRespVO> getOrderSummary() {
return success(tradeOrderQueryService.getOrderSummary());
}
@@ -116,8 +115,7 @@ public class TradeOrderController {
* @return
*/
@PutMapping("/cancel")
@PermitAll
// @PreAuthorize("@ss.hasPermission('trade:order:query')")
@PreAuthorize("@ss.hasPermission('trade:order:update')")
public CommonResult<Boolean> cancel(@RequestBody TradeOrderCancelReqVo reqVO) {
return success(tradeOrderUpdateService.cancelOrderByAdmin(reqVO));
}
@@ -128,8 +126,7 @@ public class TradeOrderController {
*/
@PutMapping("/acceptConfirm")
@PermitAll
// @PreAuthorize("@ss.hasPermission('trade:order:query')")
@PreAuthorize("@ss.hasPermission('trade:order:update')")
public CommonResult<Boolean> acceptConfirm(@RequestParam("id") Long id) {
tradeOrderUpdateService.acceptConfirmOrderByAdmin(id);
return success(true);
@@ -141,8 +138,7 @@ public class TradeOrderController {
* @return
*/
@PutMapping("/reportServe")
@PermitAll
// @PreAuthorize("@ss.hasPermission('trade:order:query')")
@PreAuthorize("@ss.hasPermission('trade:order:update')")
public CommonResult<Boolean> reportServe(@RequestParam("id") Long id) {
tradeOrderUpdateService.reportServeOrderByAdmin(id);
return success(true);
@@ -150,8 +146,7 @@ public class TradeOrderController {
// 订单备注
@PutMapping("/update-remark")
@PermitAll
// @PreAuthorize("@ss.hasPermission('trade:order:update')")
@PreAuthorize("@ss.hasPermission('trade:order:update')")
public CommonResult<Boolean> updateOrderRemark(@Valid @RequestBody TradeOrderRemarkReqVO reqVO) {
tradeOrderUpdateService.updateOrderRemark(reqVO);
return success(true);
@@ -162,8 +157,7 @@ public class TradeOrderController {
* @return
*/
@GetMapping("/fastPhoto")
@PermitAll
// @PreAuthorize("@ss.hasPermission('trade:order:query')")
@PreAuthorize("@ss.hasPermission('trade:order:query')")
public CommonResult<TradeOrderFastPhotoRespVo> fastPhoto(@Valid TradeOrderFastPhotoReqVo reqVo) {
//获取交易订单详情
TradeOrderItemDO orderItem = tradeOrderQueryService.getOrderItem(reqVo.getItemId());
@@ -178,8 +172,7 @@ public class TradeOrderController {
* @return
*/
@GetMapping("/subTimeLog/{id}")
@PermitAll
// @PreAuthorize("@ss.hasPermission('trade:order:query')")
@PreAuthorize("@ss.hasPermission('trade:order:query')")
public CommonResult<List<TradeOrderSubLogDO>> subTimeLog(@PathVariable("id") Long id) {
//获取订单预约时间修改列表
List<TradeOrderSubLogDO> subLogDO = tradeOrderQueryService.getSubTimeLogList(id);

11
tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/vo/TradeOrderDetailRespVO.java
View File

@@ -29,10 +29,12 @@ public class TradeOrderDetailRespVO extends TradeOrderBaseVO{
//商家备注
private String merchantRemark;
//退款时间
@JsonSerialize(using = StringLocalDateTimeSerializer.class)
private LocalDateTime refundTime;
//保障时间
//售后保障时间
@JsonSerialize(using = StringLocalDateTimeSerializer.class)
private LocalDateTime propertyTime;
//保障状态
//售后保障状态
private Integer propertyStatus;
//订单金额
private Integer price;
@@ -81,14 +83,12 @@ public class TradeOrderDetailRespVO extends TradeOrderBaseVO{
private String shopName;
//店铺logo
private String shopLogo;
//商品id
private Long spuId;
//skuId
private Long skuId;
//商品图片
private String picUrl;
//商品名称
private String spuName;
//商品规格
@@ -97,8 +97,6 @@ public class TradeOrderDetailRespVO extends TradeOrderBaseVO{
private Long orderCategoryId;
//订单类目名称
private String orderCategoryName;
// 购买的商品数量
private Integer count;
// 订单总价
@@ -119,7 +117,6 @@ public class TradeOrderDetailRespVO extends TradeOrderBaseVO{
private Integer handedPrice;
//成本价
private Integer expensePrice;
//服务保障列表
private String properties;
//服务内容

12
tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/vo/TradeOrderSubTimeListRespVo.java
View File

@@ -1,12 +0,0 @@
package com.tashow.cloud.trade.controller.admin.order.vo;
import com.tashow.cloud.trade.dal.dataobject.order.TradeOrderSubLogDO;
import lombok.Data;
import java.util.List;
@Data
public class TradeOrderSubTimeListRespVo {
private List<TradeOrderSubLogDO> subTimeList;
}

12
tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/convert/order/TradeOrderConvert.java
View File

@@ -93,9 +93,9 @@ public interface TradeOrderConvert {
//endregion
//region 订单详情
default TradeOrderDetailRespVO convert(TradeOrderDO order, List<TradeOrderItemDO> orderItems, List<TradeOrderLogDO> orderLogs) {
default TradeOrderDetailRespVO convert(TradeOrderDO order, List<TradeOrderItemDO> orderItems,Map<Long, UserMemberRespDTO> userMap, List<TradeOrderLogDO> orderLogs) {
//订单基本信息
TradeOrderDetailRespVO orderVO = convert2(order, orderItems, orderLogs);
TradeOrderDetailRespVO orderVO = convertDetail(order,userMap.get(order.getUserId()), orderItems, orderLogs);
//计算商品到手价
orderVO.getItems().stream().forEach(item -> {
item.setHandedPrice(item.getPrice() - item.getDiscountPrice());
@@ -122,7 +122,13 @@ public interface TradeOrderConvert {
}
return orderVO;
}
TradeOrderDetailRespVO convert2(TradeOrderDO order, List<TradeOrderItemDO> items, List<TradeOrderLogDO> statusList);
@Mappings({
@Mapping(target = "id",source = "order.id"),
@Mapping(target = "createTime",source = "order.createTime"),
@Mapping(source = "userMemberRespDTO.nickname", target = "userNickName"),
@Mapping(source = "userMemberRespDTO.avatar", target = "userAvatar"),
})
TradeOrderDetailRespVO convertDetail(TradeOrderDO order,UserMemberRespDTO userMemberRespDTO,List<TradeOrderItemDO> items, List<TradeOrderLogDO> statusList);
//endregion

17
tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/dataobject/order/TradeOrderDO.java
View File

@@ -3,7 +3,7 @@ package com.tashow.cloud.trade.dal.dataobject.order;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
import com.tashow.cloud.tenant.core.db.TenantBaseDO;
import lombok.*;
import java.time.LocalDateTime;
@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class TradeOrderDO extends BaseDO {
public class TradeOrderDO extends TenantBaseDO {
/**
* 订单编号，主键自增
@@ -81,6 +81,10 @@ public class TradeOrderDO extends BaseDO {
* 取消原因
*/
private String cancelReason;
/**
* 取消备注
*/
private String cancelRemark;
/**
* 商家编号
*/
@@ -174,10 +178,19 @@ public class TradeOrderDO extends BaseDO {
* 退款状态 (枚举 TradeOrderRefundStatusEnum)
*/
private Integer refundStatus;
/**
* 订单金额，单位：分
*/
private Integer price;
/**
* 退款金额，单位：分
*/
private Integer refundPrice;
/**
* 退款金额，单位：分
*/
private Integer discountPrice;
/**
* 退款时间
*/

4
tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/dal/dataobject/order/TradeOrderItemDO.java
View File

@@ -3,7 +3,7 @@ package com.tashow.cloud.trade.dal.dataobject.order;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.tashow.cloud.mybatis.mybatis.core.dataobject.BaseDO;
import com.tashow.cloud.tenant.core.db.TenantBaseDO;
import lombok.*;
import java.time.LocalDateTime;
@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class TradeOrderItemDO extends BaseDO {
public class TradeOrderItemDO extends TenantBaseDO {
/**
* 编号