From 98e8b6427b73efc44dbd9511e8291afea6c188d8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 24 Aug 2023 11:44:26 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/AdminMallGoodsService.java | 89 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 85 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminMallGoodsService.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminMallGoodsService.java
index 6e8a935..b5da304 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminMallGoodsService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminMallGoodsService.java
@@ -2,10 +2,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
-import cc.mrbird.febs.dapp.dto.AddMallGoodsDto;
-import cc.mrbird.febs.dapp.dto.HlmBasicPerkDto;
-import cc.mrbird.febs.dapp.dto.MallGoodsUpdateDto;
-import cc.mrbird.febs.dapp.dto.MallOrderInfoDto;
+import cc.mrbird.febs.dapp.dto.*;
import cc.mrbird.febs.dapp.entity.*;
import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
import cc.mrbird.febs.dapp.mapper.*;
@@ -13,10 +10,13 @@
import cc.mrbird.febs.dapp.vo.AdminMallGoodsCategoryTreeVo;
import cc.mrbird.febs.dapp.vo.AdminMallGoodsCategoryVo;
import cc.mrbird.febs.dapp.vo.AdminMallMoneyFlowVo;
+import cc.mrbird.febs.dapp.vo.AdminMallOrderVo;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -45,6 +45,7 @@
private final PlatformBannerMapper platformBannerMapper;
private final MallGoodsImagesMapper mallGoodsImagesMapper;
+ private final DappMemberDao dappMemberDao;
@Override
public IPage<MallGoods> getCategoryListInPage(MallGoods mallGoods, QueryRequest request) {
@@ -252,6 +253,12 @@
updateDataDic(DataDictionaryEnum.WITHDRAW_FEE.getType(),
DataDictionaryEnum.WITHDRAW_FEE.getCode(),
hlmBasicPerkDto.getWithDrawFee());
+ updateDataDic(DataDictionaryEnum.MIN_WITHDRAW_AMOUNT.getType(),
+ DataDictionaryEnum.MIN_WITHDRAW_AMOUNT.getCode(),
+ hlmBasicPerkDto.getMinWithdraw());
+ updateDataDic(DataDictionaryEnum.MAX_WITHDRAW_AMOUNT.getType(),
+ DataDictionaryEnum.MAX_WITHDRAW_AMOUNT.getCode(),
+ hlmBasicPerkDto.getMaxWithdraw());
}
@Override
@@ -418,6 +425,11 @@
}
+ @Override
+ public AdminMallOrderVo getMallOrderInfoById(long id) {
+ return this.baseMapper.getMallOrderInfoById(id);
+ }
+
public void updateDataDic(String type, String code, String value) {
DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(type, code);
if (dic != null) {
@@ -426,4 +438,73 @@
}
}
+ @Override
+ public FebsResponse deliverGoods(DeliverGoodsDto deliverGoodsDto) {
+ MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(deliverGoodsDto.getId());
+ if(ObjectUtil.isEmpty(mallOrderInfo)){
+ return new FebsResponse().fail().message("订单不存在，刷新后重试");
+ }
+ Integer status = mallOrderInfo.getStatus();
+ if(2 != status){
+ return new FebsResponse().fail().message("订单不是已完成状态");
+ }
+ Integer deliverState = mallOrderInfo.getDeliverState();
+ if(1 != deliverState){
+ return new FebsResponse().fail().message("订单不是待发货状态");
+ }
+ String expressNo = deliverGoodsDto.getExpressNo();
+ if(StrUtil.isEmpty(expressNo)){
+ return new FebsResponse().fail().message("请输入物流单号");
+ }
+ String expressCom = deliverGoodsDto.getExpressCom();
+ if(StrUtil.isEmpty(expressCom)){
+ return new FebsResponse().fail().message("请输入物流公司");
+ }
+ mallOrderInfo.setDeliverState(2);
+ mallOrderInfo.setDeliverName(expressCom);
+ mallOrderInfo.setDeliverCode(expressNo);
+ mallOrderInfoMapper.updateById(mallOrderInfo);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public FebsResponse delOrder(Long id) {
+ MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallOrderInfo)){
+ return new FebsResponse().fail().message("订单不存在，请刷新重试");
+ }
+ mallOrderInfoMapper.deleteById(id);
+ dappMemberDao.deleteByOrderId(id);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public void deliverGoodsByOrderNo(DeliverGoodsDto deliverGoods) {
+
+ MallOrderInfo mallOrderInfo = dappMemberDao.selectOrderByOrderNo(deliverGoods.getOrderNo());
+ if(ObjectUtil.isEmpty(mallOrderInfo)){
+ return;
+ }
+ Integer status = mallOrderInfo.getStatus();
+ if(2 != status){
+ return;
+ }
+ Integer deliverState = mallOrderInfo.getDeliverState();
+ if(1 != deliverState){
+ return;
+ }
+ String expressNo = deliverGoods.getExpressNo();
+ if(StrUtil.isEmpty(expressNo)){
+ return;
+ }
+ String expressCom = deliverGoods.getExpressCom();
+ if(StrUtil.isEmpty(expressCom)){
+ return;
+ }
+ mallOrderInfo.setDeliverState(2);
+ mallOrderInfo.setDeliverName(expressCom);
+ mallOrderInfo.setDeliverCode(expressNo);
+ mallOrderInfoMapper.updateById(mallOrderInfo);
+ }
+
}
--
Gitblit v1.9.1