From 7b4027c1ca254f7ab192cef2b40cbbbfa090e0d2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 26 Sep 2021 14:44:18 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
index 3416ef8..8d8e930 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
@@ -41,6 +41,8 @@
private final IApiMallMemberWalletService iApiMallMemberWalletService;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+
@Override
public IPage<AdminMallOrderInfoVo> getOrderListInPage(MallOrderInfoDto mallOrderInfo, QueryRequest request) {
Page<AdminMallOrderInfoVo> page = new Page<>(request.getPageNum(), request.getPageSize());
@@ -125,6 +127,10 @@
if(ObjectUtil.isEmpty(mallOrderRefund)){
return new FebsResponse().fail().message("系统繁忙，请刷新重试");
}
+ Integer status = mallOrderRefund.getStatus();
+ if(status != 1){
+ return new FebsResponse().fail().message("申请记录不是已申请状态，请刷新页面");
+ }
mallOrderRefund.setStatus(2);
mallOrderRefundMapper.updateById(mallOrderRefund);
@@ -143,6 +149,10 @@
if(ObjectUtil.isEmpty(mallOrderRefund)){
return new FebsResponse().fail().message("系统繁忙，请刷新重试");
}
+ Integer status = mallOrderRefund.getStatus();
+ if(status != 1){
+ return new FebsResponse().fail().message("申请记录不是已申请状态，请刷新页面");
+ }
mallOrderRefund.setStatus(3);
mallOrderRefundMapper.updateById(mallOrderRefund);
@@ -151,6 +161,10 @@
mallOrderRefundOperation.setOrderId(mallOrderRefund.getOrderId());
mallOrderRefundOperation.setContent("不同意退款申请");
mallOrderRefundOperationMapper.insert(mallOrderRefundOperation);
+ //恢复订单状态
+ MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(mallOrderRefund.getOrderId());
+ mallOrderInfo.setStatus(mallOrderRefund.getBeforeStatus());
+ mallOrderInfoMapper.updateById(mallOrderInfo);
return new FebsResponse().success();
}
@@ -160,6 +174,10 @@
MallOrderRefund mallOrderRefund = mallOrderRefundMapper.selectById(id);
if(ObjectUtil.isEmpty(mallOrderRefund)){
return new FebsResponse().fail().message("系统繁忙，请刷新重试");
+ }
+ Integer status = mallOrderRefund.getStatus();
+ if(status != 4){
+ return new FebsResponse().fail().message("申请记录不是已申请状态，请刷新页面");
}
mallOrderRefund.setStatus(5);
mallOrderRefundMapper.updateById(mallOrderRefund);
@@ -246,6 +264,10 @@
if(ObjectUtil.isEmpty(mallOrderRefund)){
return new FebsResponse().fail().message("系统繁忙，请刷新重试");
}
+ Integer status = mallOrderRefund.getStatus();
+ if(status != 4){
+ return new FebsResponse().fail().message("申请记录不是已申请状态，请刷新页面");
+ }
mallOrderRefund.setStatus(2);
mallOrderRefund.setName(mallOrderRefundAddress.getName());
mallOrderRefund.setPhone(mallOrderRefundAddress.getPhone());
@@ -266,5 +288,30 @@
return mallOrderRefundMapper.getMallOrderRefundInfoById(id);
}
+ @Override
+ public IPage<AdminPayMethodVo> getPayMethodListInPage(PayMethodDto payMethodDto, QueryRequest request) {
+ payMethodDto.setType("PAYMENT_METHOD");
+ Page<AdminPayMethodVo> page = new Page<>(request.getPageNum(), request.getPageSize());
+ IPage<AdminPayMethodVo> adminPayMethodVos = dataDictionaryCustomMapper.getPayMethodListInPage(page, payMethodDto);
+ return adminPayMethodVos;
+ }
+
+ @Override
+ public AdminMallPayMethodEditVo getMallPayMethodEditInfoById(long id) {
+ AdminMallPayMethodEditVo adminMallPayMethodEditVo = dataDictionaryCustomMapper.getMallPayMethodEditInfoById(id);
+ return adminMallPayMethodEditVo;
+ }
+
+ @Override
+ public FebsResponse payMethodEdit(PayMethodEditDto payMethodEditDto) {
+ DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectById(payMethodEditDto.getId());
+ if(ObjectUtil.isEmpty(dataDictionaryCustom)){
+ return new FebsResponse().fail().message("系统繁忙，请刷新重试");
+ }
+ dataDictionaryCustom.setValue(payMethodEditDto.getValue());
+ dataDictionaryCustomMapper.updateById(dataDictionaryCustom);
+ return new FebsResponse().success();
+ }
+
}
--
Gitblit v1.9.1