From 462d7cf7fc4a4dd2ba7060832f6fd007ee1618c4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Sep 2021 16:38:56 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java | 28 ++++++++++++++++++++++++++++
src/main/java/cc/mrbird/febs/mall/vo/OrderRefundVo.java | 2 ++
src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java | 7 ++++++-
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 1 +
src/main/java/cc/mrbird/febs/mall/dto/TeamListDto.java | 17 +++++++++++++++++
5 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
index 0012e03..1031f9f 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
@@ -3,8 +3,10 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.mall.dto.ForgetPwdDto;
import cc.mrbird.febs.mall.dto.ModifyMemberInfoDto;
+import cc.mrbird.febs.mall.dto.TeamListDto;
import cc.mrbird.febs.mall.service.IApiMallMemberService;
import cc.mrbird.febs.mall.vo.MallMemberVo;
+import cc.mrbird.febs.mall.vo.TeamListVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -60,8 +62,11 @@
}
@ApiOperation(value = "我的团队列表")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = TeamListVo.class)
+ })
@PostMapping(value = "/teamList")
- public FebsResponse teamList() {
+ public FebsResponse teamList(@RequestBody TeamListDto teamListDto) {
return null;
}
}
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/TeamListDto.java b/src/main/java/cc/mrbird/febs/mall/dto/TeamListDto.java
new file mode 100644
index 0000000..76842ea
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/dto/TeamListDto.java
@@ -0,0 +1,17 @@
+package cc.mrbird.febs.mall.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wzy
+ * @date 2021-09-24
+ **/
+@Data
+@ApiModel(value = "TeamListDto", description = "我的团队接收参数类")
+public class TeamListDto {
+
+ @ApiModelProperty(value = "用户ID", example = "1")
+ private Long id;
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 22fbcc3..dee52ce 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -333,6 +333,7 @@
orderRefund.setExpressNo(refundExpressDto.getExpressNo());
orderRefund.setExpressCom(refundExpressDto.getExpressCom());
+ orderRefund.setStatus(OrderRefundStatusEnum.EXPRESS_SUBMIT.getValue());
mallOrderRefundMapper.updateById(orderRefund);
MallOrderRefundOperation operation = new MallOrderRefundOperation();
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/OrderRefundVo.java b/src/main/java/cc/mrbird/febs/mall/vo/OrderRefundVo.java
index be3cd64..e2eb562 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderRefundVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderRefundVo.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -36,6 +37,7 @@
private String expressCom;
@ApiModelProperty(value = "退款时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date refundTime;
@ApiModelProperty(value = "收货联系人")
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java b/src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java
index 901df1c..2584c2f 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/TeamListVo.java
@@ -1,7 +1,12 @@
package cc.mrbird.febs.mall.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
/**
* @author wzy
@@ -11,6 +16,29 @@
@ApiModel(value = "TeamListVo", description = "团队列表返回参数类")
public class TeamListVo {
+ @ApiModelProperty(value = "用户ID")
private Long id;
+ @ApiModelProperty(value = "邀请码")
+ private String inviteId;
+
+ @ApiModelProperty(value = "昵称")
+ private String name;
+
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ @ApiModelProperty(value = "金额")
+ private BigDecimal amount;
+
+ @ApiModelProperty(value = "数量")
+ private Integer cnt;
+
+ @ApiModelProperty(value = "注册时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createdTime;
+
+ @ApiModelProperty(value = "是否当前用户 1-是")
+ private Integer isCurrent;
+
}
--
Gitblit v1.9.1