From 0c001d14de8a29465e2dff166d6cb92fc681e75f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 14 七月 2025 18:12:02 +0800
Subject: [PATCH] 前端
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRevenueServiceImpl.java | 90 ++++++++---------------------
admin/src/api/business/orders.js | 5 +
server/services/src/main/java/com/doumee/core/constants/Constants.java | 7 ++
server/services/src/main/java/com/doumee/dao/business/MemberRevenueMapper.java | 3
server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java | 48 +++++++++-------
5 files changed, 66 insertions(+), 87 deletions(-)
diff --git a/admin/src/api/business/orders.js b/admin/src/api/business/orders.js
index 5456648..b35da85 100644
--- a/admin/src/api/business/orders.js
+++ b/admin/src/api/business/orders.js
@@ -6,6 +6,11 @@
trim: true
})
}
+export function commentList (data) {
+ return request.post('/business/orders/commentList', data, {
+ trim: true
+ })
+}
// 鍒涘缓
export function create (data) {
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index f801c57..f579819 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -3,6 +3,7 @@
import lombok.AllArgsConstructor;
import lombok.Getter;
+import java.math.BigDecimal;
import java.util.*;
/**
@@ -115,6 +116,12 @@
}
return d.intValue();
}
+ public static double getFormatMoney(Long d) {
+ BigDecimal r = new BigDecimal(formatLongNum(d));
+ r = r.divide(new BigDecimal(100),2,BigDecimal.ROUND_HALF_UP);
+
+ return r.doubleValue();
+ }
public static long formatLongNum(Long d) {
if (d == null) {
diff --git a/server/services/src/main/java/com/doumee/dao/business/MemberRevenueMapper.java b/server/services/src/main/java/com/doumee/dao/business/MemberRevenueMapper.java
index 68db80e..99df414 100644
--- a/server/services/src/main/java/com/doumee/dao/business/MemberRevenueMapper.java
+++ b/server/services/src/main/java/com/doumee/dao/business/MemberRevenueMapper.java
@@ -2,11 +2,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.MemberRevenue;
+import com.github.yulichang.base.MPJBaseMapper;
/**
* @author 姹熻箘韫�
* @date 2025/07/09 12:00
*/
-public interface MemberRevenueMapper extends BaseMapper<MemberRevenue> {
+public interface MemberRevenueMapper extends MPJBaseMapper<MemberRevenue> {
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java b/server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java
index 5369aea..fa4b570 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/MemberRevenue.java
@@ -23,74 +23,60 @@
public class MemberRevenue {
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
- @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
private Integer deleted;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer createUser;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
+ @ExcelColumn(name="浜ゆ槗鏃堕棿",index = 8,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer updateUser;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
private Date updateTime;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "浼氬憳涓婚敭", example = "1")
- @ExcelColumn(name="浼氬憳涓婚敭")
private Integer memberId;
@ApiModelProperty(value = "鍙樺姩绫诲瀷:0=鐢ㄥ伐鍗曟敹鍏ワ紱1=璐ц繍鍗曟敹鍏ワ紱2=渚涢鍗曟敹鍏ワ紱3=鎻愮幇鐢宠锛�", example = "1")
- @ExcelColumn(name="鍙樺姩绫诲瀷:0=鐢ㄥ伐鍗曟敹鍏ワ紱1=璐ц繍鍗曟敹鍏ワ紱2=渚涢鍗曟敹鍏ワ紱3=鎻愮幇鐢宠锛�")
private Integer type;
@ApiModelProperty(value = "鏀舵敮绫诲瀷:1=鏀跺叆锛�-1=鏀嚭锛�", example = "1")
- @ExcelColumn(name="鏀舵敮绫诲瀷:1=鏀跺叆锛�-1=鏀嚭锛�")
+ @ExcelColumn(name="鏀舵敮绫诲瀷", valueMapping="1=鏀跺叆;-1=鏀嚭;",index = 5,width = 5)
private Integer optType;
@ApiModelProperty(value = "鍙樺姩閲戦", example = "1")
- @ExcelColumn(name="鍙樺姩閲戦")
- private BigDecimal amount;
+ private Long amount;
@ApiModelProperty(value = "鍙樺姩鍓嶉噾棰�", example = "1")
- @ExcelColumn(name="鍙樺姩鍓嶉噾棰�")
- private BigDecimal beforeAmount;
+ private Long beforeAmount;
@ApiModelProperty(value = "鍙樺姩鍚庨噾棰�", example = "1")
- @ExcelColumn(name="鍙樺姩鍚庨噾棰�")
- private BigDecimal afterAmount;
+ private Long afterAmount;
@ApiModelProperty(value = "涓氬姟璁板綍涓婚敭", example = "1")
- @ExcelColumn(name="涓氬姟璁板綍涓婚敭")
private Integer objId;
@ApiModelProperty(value = "涓氬姟绫诲瀷:0=璁㈠崟涓氬姟锛�1=鎻愮幇涓氬姟锛�", example = "1")
- @ExcelColumn(name="涓氬姟绫诲瀷:0=璁㈠崟涓氬姟锛�1=鎻愮幇涓氬姟锛�")
private Integer objType;
@ApiModelProperty(value = "涓氬姟鐘舵��:0=鎴愬姛锛�1=澶辫触锛�2=澶勭悊涓紱", example = "1")
- @ExcelColumn(name="涓氬姟鐘舵��:0=鎴愬姛锛�1=澶辫触锛�2=澶勭悊涓紱")
private Integer status;
@ApiModelProperty(value = "鍙樺姩绫诲瀷:0=鐢ㄥ伐鍗曟敹鍏ワ紱1=璐ц繍鍗曟敹鍏ワ紱2=渚涢鍗曟敹鍏ワ紱3=鎻愮幇鐢宠锛�", example = "1")
@TableField(exist = false)
- @ExcelColumn(name="鍙樺姩绫诲瀷:0=鐢ㄥ伐鍗曟敹鍏ワ紱1=璐ц繍鍗曟敹鍏ワ紱2=渚涢鍗曟敹鍏ワ紱3=鎻愮幇鐢宠锛�")
+ @ExcelColumn(name="鍙樺姩涓氬姟绫诲瀷",index = 7,width = 8)
private String typeName;
@ApiModelProperty(value = "寰俊浜ゆ槗娴佹按鍙�", example = "1")
- @ExcelColumn(name="寰俊浜ゆ槗娴佹按鍙�")
+ @ExcelColumn(name="寰俊浜ゆ槗娴佹按鍙�",index = 9,width = 8)
private String transactionNo;
@ApiModelProperty(value = "鍙樻煡璇㈠紑濮嬫椂闂�", example = "1")
@@ -99,4 +85,24 @@
@ApiModelProperty(value = "鍙樻煡璇㈢粨鏉熸椂闂�", example = "1")
@TableField(exist = false)
private Date endTime;
+ @ApiModelProperty(value = "鍙樺姩閲戦(鍏冿級", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="鍙樺姩閲戦(鍏�)",index = 6,width = 8)
+ private Double amountInfo;
+ @ApiModelProperty(value = "鐢ㄦ埛濮撳悕", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="鐢ㄦ埛濮撳悕",index = 3,width = 5)
+ private String memberName;
+ @ApiModelProperty(value = "鐢ㄦ埛鏄电О", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="鐢ㄦ埛鏄电О",index = 2,width = 5)
+ private String memberNickname;
+ @ApiModelProperty(value = "鐢ㄦ埛鎵嬫満鍙�", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="鐢ㄦ埛鎵嬫満鍙�",index = 4,width = 6)
+ private String memberPhone;
+ @ApiModelProperty(value = "鐢ㄦ埛openId", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="鐢ㄦ埛openid" ,index = 1,width = 6)
+ private String openid;
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRevenueServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRevenueServiceImpl.java
index fee0839..2763bf4 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRevenueServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRevenueServiceImpl.java
@@ -5,12 +5,14 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.MemberRevenueMapper;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRevenue;
import com.doumee.service.business.MemberRevenueService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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 org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -89,76 +91,34 @@
@Override
public PageData<MemberRevenue> findPage(PageWrap<MemberRevenue> pageWrap) {
IPage<MemberRevenue> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<MemberRevenue> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<MemberRevenue> queryWrapper = new MPJLambdaWrapper<MemberRevenue>()
+ .selectAll(MemberRevenue.class)
+ .selectAs(Member::getOpenid,MemberRevenue::getOpenid)
+ .selectAs(Member::getName,MemberRevenue::getMemberName)
+ .selectAs(Member::getNickName,MemberRevenue::getMemberNickname)
+ .selectAs(Member::getTelephone,MemberRevenue::getMemberPhone)
+ .leftJoin(Member.class,Member::getId,MemberRevenue::getMemberId);
Utils.MP.blankToNull(pageWrap.getModel());
pageWrap.getModel().setDeleted(Constants.ZERO);
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getId, pageWrap.getModel().getId());
- }
- if (pageWrap.getModel().getDeleted() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getDeleted, pageWrap.getModel().getDeleted());
- }
- if (pageWrap.getModel().getCreateUser() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getCreateUser, pageWrap.getModel().getCreateUser());
- }
- if (pageWrap.getModel().getCreateTime() != null) {
- queryWrapper.lambda().ge(MemberRevenue::getCreateTime, Utils.Date.getStart(pageWrap.getModel().getCreateTime()));
- queryWrapper.lambda().le(MemberRevenue::getCreateTime, Utils.Date.getEnd(pageWrap.getModel().getCreateTime()));
- }
- if (pageWrap.getModel().getUpdateUser() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getUpdateUser, pageWrap.getModel().getUpdateUser());
- }
- if (pageWrap.getModel().getUpdateTime() != null) {
- queryWrapper.lambda().ge(MemberRevenue::getUpdateTime, Utils.Date.getStart(pageWrap.getModel().getUpdateTime()));
- queryWrapper.lambda().le(MemberRevenue::getUpdateTime, Utils.Date.getEnd(pageWrap.getModel().getUpdateTime()));
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getMemberId, pageWrap.getModel().getMemberId());
- }
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getType, pageWrap.getModel().getType());
- }
- if (pageWrap.getModel().getOptType() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getOptType, pageWrap.getModel().getOptType());
- }
- if (pageWrap.getModel().getAmount() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getAmount, pageWrap.getModel().getAmount());
- }
- if (pageWrap.getModel().getBeforeAmount() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getBeforeAmount, pageWrap.getModel().getBeforeAmount());
- }
- if (pageWrap.getModel().getAfterAmount() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getAfterAmount, pageWrap.getModel().getAfterAmount());
- }
- if (pageWrap.getModel().getObjId() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getObjId, pageWrap.getModel().getObjId());
- }
- if (pageWrap.getModel().getObjType() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getObjType, pageWrap.getModel().getObjType());
- }
- if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(MemberRevenue::getStatus, pageWrap.getModel().getStatus());
- }
- if (StringUtils.isNotBlank(pageWrap.getModel().getTransactionNo())) {
- queryWrapper.lambda().like(MemberRevenue::getTransactionNo, pageWrap.getModel().getTransactionNo());
- }
- queryWrapper.lambda().ge(pageWrap.getModel().getStartTime()!=null,MemberRevenue::getCreateTime,pageWrap.getModel().getStartTime());
- queryWrapper.lambda().ne(pageWrap.getModel().getEndTime()!=null,MemberRevenue::getCreateTime,pageWrap.getModel().getEndTime());
-
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
- PageData<MemberRevenue> result = PageData.from(memberRevenueMapper.selectPage(page, queryWrapper));
+ queryWrapper.eq(pageWrap.getModel().getId() != null,MemberRevenue::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(pageWrap.getModel().getDeleted() != null,MemberRevenue::getDeleted, pageWrap.getModel().getDeleted());
+ queryWrapper.eq(pageWrap.getModel().getCreateUser() != null,MemberRevenue::getCreateUser, pageWrap.getModel().getCreateUser());
+ queryWrapper.eq(pageWrap.getModel().getRemark() != null,MemberRevenue::getRemark, pageWrap.getModel().getRemark());
+ queryWrapper.eq(pageWrap.getModel().getMemberId() != null,MemberRevenue::getMemberId, pageWrap.getModel().getMemberId());
+ queryWrapper.eq(pageWrap.getModel().getType() != null,MemberRevenue::getType, pageWrap.getModel().getType());
+ queryWrapper.eq(pageWrap.getModel().getOptType() != null,MemberRevenue::getOptType, pageWrap.getModel().getOptType());
+ queryWrapper.eq(pageWrap.getModel().getObjId() != null,MemberRevenue::getObjId, pageWrap.getModel().getObjId());
+ queryWrapper.eq(pageWrap.getModel().getObjType() != null,MemberRevenue::getObjType, pageWrap.getModel().getObjType());
+ queryWrapper.eq(pageWrap.getModel().getStatus() != null,MemberRevenue::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getTransactionNo()),MemberRevenue::getTransactionNo, pageWrap.getModel().getTransactionNo());
+ queryWrapper.ge(pageWrap.getModel().getStartTime()!=null,MemberRevenue::getCreateTime,pageWrap.getModel().getStartTime());
+ queryWrapper.ne(pageWrap.getModel().getEndTime()!=null,MemberRevenue::getCreateTime,pageWrap.getModel().getEndTime());
+ queryWrapper.orderByDesc(MemberRevenue::getCreateTime);
+ PageData<MemberRevenue> result = PageData.from(memberRevenueMapper.selectJoinPage(page,MemberRevenue.class, queryWrapper));
if(result!=null && result.getRecords()!=null){
for(MemberRevenue model :result.getRecords()){
model.setTypeName(Constants.RevenueType.getObjName(model.getType()));
+ model.setAmountInfo(Constants.getFormatMoney(model.getAmount()));
}
}
return result;
--
Gitblit v1.9.3