From ce83c0e973d3a46ee4997e6a6261728e8c99ff20 Mon Sep 17 00:00:00 2001 From: admin <1752476835@qq.com> Date: Sun, 9 Jun 2024 21:56:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PlayClerkUserInfoServiceImpl.java | 25 ++++++----- .../controller/PlayOrderInfoController.java | 37 +++++++++++++++- .../entity/PlayOrderComplaintInfoEntity.java | 2 +- .../entity/PlayOrderEvaluateInfoEntity.java | 2 +- .../module/entity/PlayOrderInfoEntity.java | 13 +++++- .../module/vo/PlayOrderComplaintReturnVo.java | 5 ++- .../module/vo/PlayOrderEditAcceptByVo.java | 39 +++++++++++++++++ .../vo/PlayOrderEvaluateEditStateVo.java | 2 +- .../module/vo/PlayOrderEvaluateQueryVo.java | 2 +- .../module/vo/PlayOrderEvaluateReturnVo.java | 2 +- .../module/vo/PlayOrderInfoReturnVo.java | 7 ++- .../order/module/vo/PlayOrderRefundAddVo.java | 43 +++++++++++++++++++ .../module/vo/PlayOrderRewardQueryVo.java | 2 +- .../PlayOrderComplaintInfoServiceImpl.java | 34 ++++++--------- .../PlayOrderEvaluateInfoServiceImpl.java | 35 +++++++-------- .../impl/PlayOrderInfoServiceImpl.java | 1 + .../entity/PlayClerkUserLoginResponseVo.java | 5 --- 17 files changed, 189 insertions(+), 67 deletions(-) create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEditAcceptByVo.java create mode 100644 play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRefundAddVo.java diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java index cf4a56e..62880c5 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java @@ -118,6 +118,21 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl images; /** - * 数据是否隐藏（0:未隐藏，1:隐藏） + * 数据是否隐藏（0:显示，1:隐藏） */ private String hidden; diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderEvaluateInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderEvaluateInfoEntity.java index 3346d49..0512d2e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderEvaluateInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/entity/PlayOrderEvaluateInfoEntity.java @@ -75,7 +75,7 @@ public class PlayOrderEvaluateInfoEntity extends BaseEntity { * 2：已开始（服务中） * 3：已完成 * 4：已取消 + * 5：已退款 */ private String orderStatus; @@ -70,10 +71,20 @@ public class PlayOrderInfoEntity extends BaseEntity { private String firstOrder; /** - * 退款类型【0：未退款，1：部分退款，2：全部退款】 + * 退款类型【0：未退款，1：已退款】 */ private String refundType; + /** + * 退款金额 + */ + private BigDecimal refundAmount; + + /** + * 退款原因 + */ + private String refundReason; + /** * 商品ID */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderComplaintReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderComplaintReturnVo.java index 4aa9f00..b16e585 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderComplaintReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderComplaintReturnVo.java @@ -7,6 +7,7 @@ import lombok.Data; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * 订单投诉查询返回对象 @@ -76,10 +77,10 @@ public class PlayOrderComplaintReturnVo { * 图片列表 */ @TableField(typeHandler = StringTypeHandler.class) - private String images; + private List images; /** - * 数据是否隐藏（0:未隐藏，1:隐藏） + * 数据是否隐藏（0:显示，1:隐藏） */ private String hidden; diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEditAcceptByVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEditAcceptByVo.java new file mode 100644 index 0000000..387cf92 --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEditAcceptByVo.java @@ -0,0 +1,39 @@ +package com.starry.admin.modules.order.module.vo; + +import com.starry.common.domain.BasePageEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotNull; + +/** + * 订单查询对象 + * + * @author admin + * @since 2024-03-20 + */ +@Data +@EqualsAndHashCode(callSuper = false) +public class PlayOrderEditAcceptByVo extends BasePageEntity { + + + /** + * uuid + */ + @NotNull(message = "orderId不能为空") + private String orderId; + + + /** + * 店员ID + */ + @NotNull(message = "店员不能为空") + private String acceptBy; + + /** + * 备注 + */ + private String remark; + + +} \ No newline at end of file diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateEditStateVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateEditStateVo.java index 8b72c1d..3ea192a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateEditStateVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateEditStateVo.java @@ -21,7 +21,7 @@ public class PlayOrderEvaluateEditStateVo { private String id; /** - * 数据是否隐藏（0:未隐藏，1:隐藏） + * 数据是否隐藏（0:显示，1:隐藏） */ @NotBlank(message = "是否隐藏不能为空") @Pattern(regexp = "[01]", message = "是否隐藏数据错误,只能位0或者1") diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateQueryVo.java index 58579fc..b52a4f1 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateQueryVo.java @@ -47,7 +47,7 @@ public class PlayOrderEvaluateQueryVo extends BasePageEntity { private List evaluateTime; /** - * 数据是否隐藏（0:未隐藏，1:隐藏） + * 数据是否隐藏（0:显示，1:隐藏） */ private String hidden; } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateReturnVo.java index 77e9f0a..55937d8 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderEvaluateReturnVo.java @@ -52,7 +52,7 @@ public class PlayOrderEvaluateReturnVo { private Date evaluateTime; /** - * 数据是否隐藏（0:未隐藏，1:隐藏） + * 数据是否隐藏（0:显示，1:隐藏） */ private String hidden; diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoReturnVo.java index 16e8c91..c653a90 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoReturnVo.java @@ -88,7 +88,7 @@ public class PlayOrderInfoReturnVo { private BigDecimal orderMoney; /** - * 退款类型【0：未退款，1：部分退款，2：全部退款】 + * 退款类型【0：未退款，1：已退款】 */ private String refundType; @@ -154,6 +154,11 @@ public class PlayOrderInfoReturnVo { */ private BigDecimal finalAmount; + /** + * 店员收入 + */ + private BigDecimal estimatedRevenue = BigDecimal.ZERO; + /** * 订单备注 diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRefundAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRefundAddVo.java new file mode 100644 index 0000000..d118e3e --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRefundAddVo.java @@ -0,0 +1,43 @@ +package com.starry.admin.modules.order.module.vo; + +import com.starry.common.domain.BasePageEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; + +/** + * 订单查询对象 + * + * @author admin + * @since 2024-03-20 + */ +@Data +@EqualsAndHashCode(callSuper = false) +public class PlayOrderRefundAddVo extends BasePageEntity { + + + /** + * uuid + */ + @NotNull(message = "orderId不能为空") + private String orderId; + + + /** + * 退款金额 + */ + @NotNull(message = "退款金额不能为空") + private BigDecimal refundAmount; + + /** + * 退款原因 + */ + @NotNull(message = "退款原因不能为空") + @Length(min = 1, max = 100, message = "退款原因必须在1-100个字符之间") + private String refundReason; + + +} \ No newline at end of file diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRewardQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRewardQueryVo.java index 25d315b..af88013 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRewardQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderRewardQueryVo.java @@ -51,7 +51,7 @@ public class PlayOrderRewardQueryVo extends BasePageEntity { private List purchaserTime; /** - * 数据是否隐藏（0:未隐藏，1:隐藏） + * 数据是否隐藏（0:显示，1:隐藏） */ private String hidden; diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderComplaintInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderComplaintInfoServiceImpl.java index 0172310..76a0e28 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderComplaintInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderComplaintInfoServiceImpl.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.starry.admin.common.exception.CustomException; -import com.starry.admin.modules.clerk.module.entity.PlayClerkCommodityEntity; import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity; import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity; import com.starry.admin.modules.order.mapper.PlayOrderComplaintInfoMapper; @@ -53,25 +52,18 @@ public class PlayOrderComplaintInfoServiceImpl extends ServiceImpl selectByPage(PlayOrderComplaintQueryVo vo) { - MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper() - // 查询主表全部字段 - .selectAll(PlayOrderComplaintInfoEntity.class) - // 查询顾客表字段 - .selectAs(PlayCustomUserInfoEntity::getId, "customId").selectAs(PlayCustomUserInfoEntity::getAvatar, "customAvatar").selectAs(PlayCustomUserInfoEntity::getNickname, "customNickname") - // 查询陪聊表字典 - .selectAs(PlayClerkUserInfoEntity::getId, "clerkId").selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname") - //查询订单表 - .selectAs(PlayOrderInfoEntity::getOrderNo, "orderNo").selectAs(PlayOrderInfoEntity::getPlaceType, "placeType").selectAs(PlayOrderInfoEntity::getFinalAmount, "finalAmount").selectAs(PlayOrderInfoEntity::getCommodityNumber, "commodityNumber") - //查询商品表 - .selectAll(PlayClerkCommodityEntity.class) - // 顾客表 - .leftJoin(PlayCustomUserInfoEntity.class, PlayCustomUserInfoEntity::getId, PlayOrderComplaintInfoEntity::getCustomId) - //店员表 - .leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayOrderComplaintInfoEntity::getClerkId) - // 商品表 - .leftJoin(PlayClerkCommodityEntity.class, PlayClerkCommodityEntity::getId, PlayOrderEvaluateInfoEntity::getCommodityId) - //订单表 - .leftJoin(PlayOrderInfoEntity.class, PlayOrderInfoEntity::getId, PlayOrderEvaluateInfoEntity::getOrderId); + MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper(); + // 查询主表全部字段 + lambdaQueryWrapper.selectAll(PlayOrderComplaintInfoEntity.class); + //查询订单表 + lambdaQueryWrapper.selectAs(PlayOrderInfoEntity::getOrderNo, "orderNo").selectAs(PlayOrderInfoEntity::getPlaceType, "placeType").selectAs(PlayOrderInfoEntity::getFinalAmount, "finalAmount").selectAs(PlayOrderInfoEntity::getCommodityPrice, "commodityPrice").selectAs(PlayOrderInfoEntity::getServiceDuration, "serviceDuration").selectAs(PlayOrderInfoEntity::getCommodityName, "commodityName").selectAs(PlayOrderInfoEntity::getCommodityType, "commodityType").selectAs(PlayOrderInfoEntity::getCommodityId, "commodityId").selectAs(PlayOrderInfoEntity::getCommodityNumber, "commodityNumber"); + lambdaQueryWrapper.leftJoin(PlayOrderInfoEntity.class, PlayOrderInfoEntity::getId, PlayOrderEvaluateInfoEntity::getOrderId); + // 查询顾客表字段 + lambdaQueryWrapper.selectAs(PlayCustomUserInfoEntity::getId, "customId").selectAs(PlayCustomUserInfoEntity::getAvatar, "customAvatar").selectAs(PlayCustomUserInfoEntity::getNickname, "customNickname"); + lambdaQueryWrapper.leftJoin(PlayCustomUserInfoEntity.class, PlayCustomUserInfoEntity::getId, PlayOrderComplaintInfoEntity::getCustomId); + // 查询陪聊表 + lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId").selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname"); + lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayOrderComplaintInfoEntity::getClerkId); if (StrUtil.isNotBlank(vo.getClerkId())) { lambdaQueryWrapper.eq(PlayOrderComplaintInfoEntity::getClerkId, vo.getClerkId()); } @@ -82,7 +74,7 @@ public class PlayOrderComplaintInfoServiceImpl extends ServiceImpl selectByPage(PlayOrderEvaluateQueryVo vo) { - MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper() - // 查询主表全部字段 - .selectAll(PlayOrderEvaluateInfoEntity.class) - // 查询顾客表字段 - .selectAs(PlayCustomUserInfoEntity::getId, "customId").selectAs(PlayCustomUserInfoEntity::getAvatar, "customAvatar").selectAs(PlayCustomUserInfoEntity::getNickname, "customNickname") - // 查询陪聊表字典 - .selectAs(PlayClerkUserInfoEntity::getId, "clerkId").selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname") - //查询订单表 - .selectAs(PlayOrderInfoEntity::getOrderNo, "orderNo").selectAs(PlayOrderInfoEntity::getPlaceType, "placeType").selectAs(PlayOrderInfoEntity::getFinalAmount, "finalAmount").selectAs(PlayOrderInfoEntity::getCommodityNumber, "commodityNumber") - // 查询商品表全部字段（陪聊服务项目表） - .selectAll(PlayClerkCommodityEntity.class) - // 顾客表 - .leftJoin(PlayCustomUserInfoEntity.class, PlayCustomUserInfoEntity::getId, PlayOrderEvaluateInfoEntity::getCustomId) - // 店员表 - .leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayOrderEvaluateInfoEntity::getClerkId) - // 商品表 - .leftJoin(PlayClerkCommodityEntity.class, PlayClerkCommodityEntity::getId, PlayOrderEvaluateInfoEntity::getCommodityId) - //订单表 - .leftJoin(PlayOrderInfoEntity.class, PlayOrderInfoEntity::getId, PlayOrderEvaluateInfoEntity::getOrderId); + MPJLambdaWrapper lambdaQueryWrapper = new MPJLambdaWrapper(); + // 查询主表全部字段 + lambdaQueryWrapper.selectAll(PlayOrderEvaluateInfoEntity.class); + + // 查询顾客表字段 + lambdaQueryWrapper.selectAs(PlayCustomUserInfoEntity::getId, "customId").selectAs(PlayCustomUserInfoEntity::getAvatar, "customAvatar").selectAs(PlayCustomUserInfoEntity::getNickname, "customNickname"); + lambdaQueryWrapper.leftJoin(PlayCustomUserInfoEntity.class, PlayCustomUserInfoEntity::getId, PlayOrderEvaluateInfoEntity::getCustomId); + // 查询店员表字典 + lambdaQueryWrapper.selectAs(PlayClerkUserInfoEntity::getId, "clerkId").selectAs(PlayClerkUserInfoEntity::getAvatar, "clerkAvatar").selectAs(PlayClerkUserInfoEntity::getNickname, "clerkNickname"); + lambdaQueryWrapper.leftJoin(PlayClerkUserInfoEntity.class, PlayClerkUserInfoEntity::getId, PlayOrderEvaluateInfoEntity::getClerkId); + //查询订单表 + lambdaQueryWrapper.selectAs(PlayOrderInfoEntity::getOrderNo, "orderNo").selectAs(PlayOrderInfoEntity::getPlaceType, "placeType").selectAs(PlayOrderInfoEntity::getFinalAmount, "finalAmount").selectAs(PlayOrderInfoEntity::getCommodityPrice, "commodityPrice").selectAs(PlayOrderInfoEntity::getServiceDuration, "serviceDuration").selectAs(PlayOrderInfoEntity::getCommodityName, "commodityName").selectAs(PlayOrderInfoEntity::getCommodityType, "commodityType").selectAs(PlayOrderInfoEntity::getCommodityId, "commodityId").selectAs(PlayOrderInfoEntity::getCommodityNumber, "commodityNumber"); + lambdaQueryWrapper.leftJoin(PlayOrderInfoEntity.class, PlayOrderInfoEntity::getId, PlayOrderEvaluateInfoEntity::getOrderId); + + if (StrUtil.isNotBlank(vo.getClerkId())) { lambdaQueryWrapper.eq(PlayOrderEvaluateInfoEntity::getClerkId, vo.getClerkId()); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java index bb383f8..225a1ea 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java @@ -553,6 +553,7 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl