From 437027600391a245588e6f719717b2f27a4222dc Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 22 一月 2026 10:48:30 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java | 147 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 117 insertions(+), 30 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java
index d279e73..cfc54b2 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/WithdrawRecordServiceImpl.java
@@ -3,6 +3,7 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
@@ -11,6 +12,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.dto.MultiFileDTO;
import com.doumee.dao.web.request.DealIntegralRequest;
import com.doumee.dao.web.request.WithdrawApplyRequest;
@@ -20,15 +22,20 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.With;
import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.bouncycastle.cert.dane.DANEEntry;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -88,11 +95,58 @@
withdrawRecordMapper.deleteBatchIds(ids);
}
+ /**
+ * 鎵撴瀹℃牳
+ * @param withdrawRecord 瀹炰綋瀵硅薄
+ */
@Override
+ @Transactional
public void updateById(WithdrawRecord withdrawRecord) {
- withdrawRecordMapper.updateById(withdrawRecord);
- }
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(!Constants.equalsObject(withdrawRecord.getStatus(),Constants.ONE)
+ && !Constants.equalsObject(withdrawRecord.getStatus(),Constants.TWO)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ WithdrawRecord model = withdrawRecordMapper.selectById(withdrawRecord.getId());
+ if(model == null || Constants.equalsObject(model.getIsdeleted(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ if(!Constants.equalsObject(model.getStatus(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇峰凡瀹℃壒锛岃灏濊瘯鍒锋柊椤甸潰鏌ョ湅");
+ }
+ Date date = new Date();
+ model.setPayBank(withdrawRecord.getPayBank());
+ model.setEditor(user.getId());
+ model.setEditDate(date);
+ model.setAuditRemark(withdrawRecord.getAuditRemark());
+ model.setAuditTime(date);
+ model.setAuditUser(user.getId());
+ model.setStatus(withdrawRecord.getStatus());
+ model.setPayBank(withdrawRecord.getPayBank());
+ withdrawRecordMapper.updateById(model);
+ dealBatchMultiFiles(model,withdrawRecord.getPayFileList());
+ }
+ public void dealBatchMultiFiles(WithdrawRecord model, List<Multifile> fileList ) {
+ //娓呯┖鍘熸湁鐨�
+ if(fileList!=null && fileList.size()>0){
+ List<Multifile> multifileList = new ArrayList<>();
+ fileList.stream().forEach(s -> {
+ if(StringUtils.isNotBlank(s.getFileurl())){
+ s.setIsdeleted(Constants.ZERO);
+ s.setCreator(model.getAuditUser());
+ s.setCreateDate(model.getAuditTime());
+ s.setObjId(model.getId());
+ s.setType(Constants.ZERO);
+ s.setObjType(Constants.MultiFile.TRANSFER_FILE.getKey());
+ multifileList.add(s);
+ }
+ });
+ if(multifileList.size()>0){
+ multifileMapper.insert(multifileList);
+ }
+ }
+ }
@Override
public void updateByIdInBatch(List<WithdrawRecord> withdrawRecords) {
if (CollectionUtils.isEmpty(withdrawRecords)) {
@@ -105,8 +159,17 @@
@Override
public WithdrawRecord findById(Integer id) {
- WithdrawRecord withdrawRecord = withdrawRecordMapper.selectById(id);
- if (Objects.isNull(withdrawRecord)) {
+ MPJLambdaWrapper<WithdrawRecord> queryWrapper = new MPJLambdaWrapper<WithdrawRecord>()
+ .selectAll(WithdrawRecord.class)
+ .selectAs(SystemUser::getRealname,WithdrawRecord::getAuditUserName)
+ .selectAs(Shop::getName,WithdrawRecord::getShopName)
+ .selectAs(Shop::getCode,WithdrawRecord::getShopCode)
+ .leftJoin(Shop.class,Shop::getId,WithdrawRecord::getMemberId)
+ .leftJoin(SystemUser.class,SystemUser::getId,WithdrawRecord::getAuditUser)
+ .eq(WithdrawRecord::getId,id)
+ .eq(WithdrawRecord::getIsdeleted,Constants.ZERO);
+ WithdrawRecord withdrawRecord = withdrawRecordMapper.selectJoinOne(WithdrawRecord.class,queryWrapper);
+ if (Objects.isNull(withdrawRecord) ) {
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
if(!Constants.equalsInteger(withdrawRecord.getStatus(), Constants.ZERO)){
@@ -119,7 +182,9 @@
List<Multifile> filelist = multifileMapper.selectList(new QueryWrapper<>(queryfile));
if(filelist !=null && filelist.size()>0){
for (Multifile multifile:filelist) {
- multifile.setFileFullUrl(path + multifile.getFileurl());
+ if(StringUtils.isNotBlank(multifile.getFileurl())){
+ multifile.setFileFullUrl(path + multifile.getFileurl());
+ }
}
withdrawRecord.setPayFileList(filelist);
}
@@ -142,64 +207,86 @@
@Override
public PageData<WithdrawRecord> findPage(PageWrap<WithdrawRecord> pageWrap) {
IPage<WithdrawRecord> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<WithdrawRecord> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<WithdrawRecord> queryWrapper = new MPJLambdaWrapper<WithdrawRecord>()
+ .selectAll(WithdrawRecord.class)
+ .selectAs(Shop::getName,WithdrawRecord::getShopName)
+ .selectAs(Shop::getCode,WithdrawRecord::getShopCode)
+ .leftJoin(Shop.class,Shop::getId,WithdrawRecord::getMemberId);
Utils.MP.blankToNull(pageWrap.getModel());
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(WithdrawRecord::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(WithdrawRecord::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(WithdrawRecord::getCreator, pageWrap.getModel().getCreator());
+ queryWrapper.eq(WithdrawRecord::getCreator, pageWrap.getModel().getCreator());
}
if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(WithdrawRecord::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(WithdrawRecord::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ queryWrapper.ge(WithdrawRecord::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(WithdrawRecord::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
}
if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(WithdrawRecord::getEditor, pageWrap.getModel().getEditor());
+ queryWrapper.eq(WithdrawRecord::getEditor, pageWrap.getModel().getEditor());
}
if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(WithdrawRecord::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(WithdrawRecord::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ queryWrapper.ge(WithdrawRecord::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(WithdrawRecord::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(WithdrawRecord::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ queryWrapper.eq(WithdrawRecord::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(WithdrawRecord::getRemark, pageWrap.getModel().getRemark());
+ queryWrapper.eq(WithdrawRecord::getRemark, pageWrap.getModel().getRemark());
}
if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(WithdrawRecord::getMemberId, pageWrap.getModel().getMemberId());
+ queryWrapper.eq(WithdrawRecord::getMemberId, pageWrap.getModel().getMemberId());
}
if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(WithdrawRecord::getCode, pageWrap.getModel().getCode());
+ queryWrapper.eq(WithdrawRecord::getCode, pageWrap.getModel().getCode());
}
if (pageWrap.getModel().getBankId() != null) {
- queryWrapper.lambda().eq(WithdrawRecord::getBankId, pageWrap.getModel().getBankId());
+ queryWrapper.eq(WithdrawRecord::getBankId, pageWrap.getModel().getBankId());
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(WithdrawRecord::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(WithdrawRecord::getStatus, pageWrap.getModel().getStatus());
}
if (pageWrap.getModel().getAuditUser() != null) {
- queryWrapper.lambda().eq(WithdrawRecord::getAuditUser, pageWrap.getModel().getAuditUser());
+ queryWrapper.eq(WithdrawRecord::getAuditUser, pageWrap.getModel().getAuditUser());
}
if (pageWrap.getModel().getAuditTime() != null) {
- queryWrapper.lambda().ge(WithdrawRecord::getAuditTime, Utils.Date.getStart(pageWrap.getModel().getAuditTime()));
- queryWrapper.lambda().le(WithdrawRecord::getAuditTime, Utils.Date.getEnd(pageWrap.getModel().getAuditTime()));
+ queryWrapper.ge(WithdrawRecord::getAuditTime, Utils.Date.getStart(pageWrap.getModel().getAuditTime()));
+ queryWrapper.le(WithdrawRecord::getAuditTime, Utils.Date.getEnd(pageWrap.getModel().getAuditTime()));
}
if (pageWrap.getModel().getAuditRemark() != null) {
- queryWrapper.lambda().eq(WithdrawRecord::getAuditRemark, pageWrap.getModel().getAuditRemark());
+ queryWrapper.eq(WithdrawRecord::getAuditRemark, pageWrap.getModel().getAuditRemark());
}
if (pageWrap.getModel().getPayBank() != null) {
- queryWrapper.lambda().eq(WithdrawRecord::getPayBank, pageWrap.getModel().getPayBank());
+ queryWrapper.eq(WithdrawRecord::getPayBank, pageWrap.getModel().getPayBank());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
+ queryWrapper.ge(pageWrap.getModel().getStarttime() != null,WithdrawRecord::getCreateDate, pageWrap.getModel().getStarttime());
+ queryWrapper.le(pageWrap.getModel().getEndtime() != null,WithdrawRecord::getCreateDate, pageWrap.getModel().getEndtime());
+ queryWrapper.like(pageWrap.getModel().getShopName() != null,Shop::getName, pageWrap.getModel().getShopName());
+ queryWrapper.orderByDesc(WithdrawRecord::getCreateDate);
+
+ PageData<WithdrawRecord> rr = PageData.from(withdrawRecordMapper.selectJoinPage(page,WithdrawRecord.class, queryWrapper));
+ if(pageWrap.getPage() == 1){
+ //濡傛灉鏌ヨ绗竴椤碉紝鍋氱粡閿�鍟嗛攢鍞俊鎭粺璁′笟鍔℃煡璇�
+ WithdrawRecord count = withdrawRecordMapper.selectJoinOne(WithdrawRecord.class,new MPJLambdaWrapper<WithdrawRecord>()
+ .selectSum(WithdrawRecord::getAmount)
+ .leftJoin(Shop.class,Shop::getId,WithdrawRecord::getMemberId)
+ .ge(pageWrap.getModel().getStarttime() != null,WithdrawRecord::getCreateDate, pageWrap.getModel().getStarttime())
+ .le(pageWrap.getModel().getEndtime() != null,WithdrawRecord::getCreateDate, pageWrap.getModel().getEndtime())
+ .like(pageWrap.getModel().getShopName() != null,Shop::getName, pageWrap.getModel().getShopName())
+ .eq(WithdrawRecord::getIsdeleted,Constants.ZERO)
+ .eq(pageWrap.getModel().getStatus()!=null,WithdrawRecord::getStatus,pageWrap.getModel().getStatus())
+ );
+ if(count == null){
+ count = new WithdrawRecord();
}
+ count.setAmount(Constants.formatBigdecimal4Float(count.getAmount()));
+ rr.setCountData(count);
}
- return PageData.from(withdrawRecordMapper.selectPage(page, queryWrapper));
+
+ return rr;
}
--
Gitblit v1.9.3