From 20d471063e03b9925ae296bf76a20035378bb5be Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Sep 2021 11:42:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/vo/OrderRefundVo.java | 5 ++
src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java | 7 +++
src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java | 3 +
src/main/java/cc/mrbird/febs/mall/dto/ModifyMemberInfoDto.java | 20 ++++++++++
src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefund.java | 4 ++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 4 ++
src/main/resources/mapper/modules/MallOrderInfoMapper.xml | 3 +
sql/xc_mall.sql | 2
src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java | 3 +
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 17 ++++++++
10 files changed, 67 insertions(+), 1 deletions(-)
diff --git a/sql/xc_mall.sql b/sql/xc_mall.sql
index 4877700..d459688 100644
--- a/sql/xc_mall.sql
+++ b/sql/xc_mall.sql
@@ -278,6 +278,6 @@
alter table mall_order_refund add type int null comment '1-仅退款不退货2-退款退货';
alter table mall_order_refund add before_status int null comment '订单退款前状态';
-
+alter table mall_order_refund add refund_time datetime null comment '退款时间';
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 16c98e2..d62b898 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
@@ -2,6 +2,7 @@
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.service.IApiMallMemberService;
import cc.mrbird.febs.mall.vo.MallMemberVo;
import io.swagger.annotations.Api;
@@ -51,4 +52,10 @@
public FebsResponse setTradePwd(@RequestBody ForgetPwdDto forgetPwdDto) {
return memberService.setTradePwd(forgetPwdDto);
}
+
+ @ApiOperation(value = "修改用户信息")
+ @PostMapping(value = "/modifyInfo")
+ public FebsResponse modifyInfo(ModifyMemberInfoDto modifyMemberInfoDto) {
+ return memberService.modifyMemberInfo(modifyMemberInfoDto);
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/ModifyMemberInfoDto.java b/src/main/java/cc/mrbird/febs/mall/dto/ModifyMemberInfoDto.java
new file mode 100644
index 0000000..f595a4b
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/dto/ModifyMemberInfoDto.java
@@ -0,0 +1,20 @@
+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 = "ModifyMemberInfoDto", description = "修改用户信息参数接收类")
+public class ModifyMemberInfoDto {
+
+ @ApiModelProperty(value = "昵称", example = "123")
+ private String name;
+
+ @ApiModelProperty(value = "头像", example = "123")
+ private String photo;
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java b/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java
index 401d64d..d0907cb 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java
@@ -23,4 +23,7 @@
@ApiModelProperty(value = "订单状态", example = "0-全部 1-待付款 2-待发货 3-待收货 4-退款或退款中")
private Integer status;
+
+ @ApiModelProperty(hidden = true)
+ private Long memberId;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefund.java b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefund.java
index 853977e..25de594 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefund.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallOrderRefund.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
+import java.util.Date;
+
/**
* @author wzy
* @date 2021-09-23
@@ -40,4 +42,6 @@
* 退款前订单状态
*/
private Integer beforeStatus;
+
+ private Date refundTime;
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java b/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java
index 3458ca3..1c6997f 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java
@@ -3,6 +3,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.mall.dto.ForgetPwdDto;
import cc.mrbird.febs.mall.dto.LoginDto;
+import cc.mrbird.febs.mall.dto.ModifyMemberInfoDto;
import cc.mrbird.febs.mall.dto.RegisterDto;
import cc.mrbird.febs.mall.entity.MallMember;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -21,4 +22,6 @@
FebsResponse findMemberMarkCnt();
FebsResponse setTradePwd(ForgetPwdDto forgetPwdDto);
+
+ FebsResponse modifyMemberInfo(ModifyMemberInfoDto modifyMemberInfoDto);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 1b4fbc8..ca6e862 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -9,6 +9,7 @@
import cc.mrbird.febs.mall.conversion.MallMemberConversion;
import cc.mrbird.febs.mall.dto.ForgetPwdDto;
import cc.mrbird.febs.mall.dto.LoginDto;
+import cc.mrbird.febs.mall.dto.ModifyMemberInfoDto;
import cc.mrbird.febs.mall.dto.RegisterDto;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallMemberWallet;
@@ -247,4 +248,20 @@
this.baseMapper.updateById(mallMember);
return new FebsResponse().success().message("设置成功");
}
+
+ @Override
+ public FebsResponse modifyMemberInfo(ModifyMemberInfoDto modifyMemberInfoDto) {
+ MallMember member = LoginUserUtil.getLoginUser();
+ MallMember mallMember = this.baseMapper.selectById(member.getId());
+ if (StrUtil.isNotBlank(modifyMemberInfoDto.getName())) {
+ mallMember.setName(modifyMemberInfoDto.getName());
+ }
+
+ if (StrUtil.isNotBlank(modifyMemberInfoDto.getPhoto())) {
+ mallMember.setAvatar(modifyMemberInfoDto.getPhoto());
+ }
+
+ this.baseMapper.updateById(mallMember);
+ return new FebsResponse().success().message("修改成功");
+ }
}
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 36a7159..22fbcc3 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
@@ -204,8 +204,10 @@
@Override
public List<OrderListVo> findOrderList(OrderListDto orderListDto) {
+ MallMember member = LoginUserUtil.getLoginUser();
IPage<MallOrderInfo> page = new Page<>(orderListDto.getPageNum(), orderListDto.getPageSize());
+ orderListDto.setMemberId(member.getId());
IPage<MallOrderInfo> mallOrderInfos = this.baseMapper.selectApiOrderListInPage(page, orderListDto);
return MallOrderInfoConversion.INSTANCE.entitysToVos(mallOrderInfos.getRecords());
}
@@ -298,6 +300,7 @@
orderRefund.setDesp(addRefundDto.getDesp());
orderRefund.setReason(addRefundDto.getReason());
orderRefund.setType(addRefundDto.getType());
+ orderRefund.setRefundTime(new Date());
orderRefund.setBeforeStatus(orderInfo.getStatus());
orderRefund.setStatus(OrderRefundStatusEnum.REFUND_APPLY.getValue());
mallOrderRefundMapper.insert(orderRefund);
@@ -305,6 +308,7 @@
orderRefund.setDesp(addRefundDto.getDesp());
orderRefund.setReason(addRefundDto.getReason());
orderRefund.setType(addRefundDto.getType());
+ orderRefund.setRefundTime(new Date());
orderRefund.setBeforeStatus(orderInfo.getStatus());
orderRefund.setStatus(OrderRefundStatusEnum.REFUND_APPLY.getValue());
mallOrderRefundMapper.updateById(orderRefund);
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 7e00d5c..3c25cdc 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderRefundVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderRefundVo.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
+
/**
* @author wzy
* @date 2021-09-23
@@ -32,4 +34,7 @@
@ApiModelProperty(value = "物流公司")
private String expressCom;
+
+ @ApiModelProperty(value = "退款时间")
+ private Date refundTime;
}
diff --git a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
index a519661..85d9104 100644
--- a/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -96,6 +96,9 @@
<if test="record.status != 4 and record.status != 0">
and a.status = #{record.status}
</if>
+ <if test="record.memberId != null">
+ and a.member_id=#{record.memberId}
+ </if>
</where>
order by a.created_time desc
</select>
--
Gitblit v1.9.1