From bcf03bef6680002560183cbf1f6c0819500fa0f1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 17 二月 2025 17:03:23 +0800
Subject: [PATCH] jtt808初始化
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 2 ++
server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 15 ++++-----------
server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java | 6 ++++++
server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java | 6 +++++-
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 10 +++++++++-
5 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java b/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
index 83c9768..d325187 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
@@ -60,11 +60,9 @@
private Integer objType;
@ApiModelProperty(value = "浜ゆ槗绫诲瀷 0绉熻溅鎶奸噾 1濂楅鍗¤喘涔�")
private Integer type;
-
@ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
@TableField(exist = false)
private String memberName;
-
@ApiModelProperty(value = "浜ゆ槗閲戦")
@ExcelColumn(name="鎶奸噾锛堝厓锛�",index = 4,width = 10,align = HorizontalAlignment.CENTER)
private BigDecimal money;
@@ -78,6 +76,7 @@
@ApiModelProperty(value = "鍦ㄧ嚎浜ゆ槗鍗曞彿")
@ExcelColumn(name="浜ゆ槗鍗曞彿",index = 3,width = 10,align = HorizontalAlignment.CENTER)
private String onlineOrderid;
+
@ApiModelProperty(value = "鏀粯鐘舵�� 0寰呮敮浠� 1宸叉敮浠�")
private Integer payStatus;
@@ -100,18 +99,14 @@
private Date closeDate;
@ApiModelProperty(value = "缁撶畻澶囨敞")
private String closeInfo;
-
@ApiModelProperty(value = "缁撶畻鎿嶄綔浜虹紪鐮侊紙鍏宠仈system_user)")
private String closeUserId;
-
@ApiModelProperty(value = "缁撶畻绫诲瀷 0鐢ㄦ埛鑷缁撶畻 1骞冲彴浜哄伐寮哄埗缁撶畻 2绯荤粺鑷姩缁撶畻")
private Integer closeType;
-
@ApiModelProperty(value = "鐢ㄦ埛openid" )
@TableField(exist = false)
@ExcelColumn(name="鐢ㄦ埛",index = 1 ,width = 10,align = HorizontalAlignment.CENTER)
private String openid;
-
@ApiModelProperty(value = "鏌ヨ寮�濮嬫棩鏈燂紙鍖呭惈锛�", example = "2023-10-01 15:12:01")
@TableField(exist = false)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -123,22 +118,20 @@
@ApiModelProperty(value = "浜ゆ槗绗旀暟", example = "0")
@TableField(exist = false)
private int countNum;
-
@ApiModelProperty(value = "閫�娆炬�婚(鍒嗭級")
@TableField(exist = false)
@ExcelColumn(name="閫�鎶奸噾(鍏�)",index = 6,width = 10,align = HorizontalAlignment.CENTER)
private BigDecimal refundMoney;
-
+ @ApiModelProperty(value = "楠戣鍗℃姷鎵�(鍒嗭級")
+ @TableField(exist = false)
+ private BigDecimal discountMoney;
@ApiModelProperty(value = "鏈�鍚庨��娆炬椂闂�")
@TableField(exist = false)
@ExcelColumn(name="閫�娆剧粨绠楁椂闂�",index = 9,width = 10,align = HorizontalAlignment.CENTER,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date refundDate;
-
@ApiModelProperty(value = "鏈�杩戦獞琛岀姸鎬�")
@TableField(exist = false)
private Integer memberRidesStatus;
-
-
@ApiModelProperty(value = "鏄惁缁撶畻 0 鏈粨绠� 1宸茬粨绠�")
@TableField(exist = false)
private Integer closeStatus;
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java
index a4c4ae3..ee0fb23 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java
@@ -1,10 +1,12 @@
package com.doumee.dao.business.web.response;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -53,6 +55,8 @@
@ExcelColumn(name="褰掕繕绔欑偣",index = 10,width = 10,align = HorizontalAlignment.CENTER)
private String backSiteId;
+ @ApiModelProperty(value = "楠戣鍗℃姷鎵�(鍒嗭級")
+ private BigDecimal discountPrice;
@ApiModelProperty(value = "杩樿溅閿佸ご缂栫爜")
@ExcelColumn(name="褰掕繕閿佸叿",index = 12,width = 10,align = HorizontalAlignment.CENTER)
private String backLockId;
@@ -64,6 +68,8 @@
@ApiModelProperty(value = "鐘舵�� 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞� 3寮�閿佸け璐�")
// @ExcelColumn(name="鐘舵�� ", valueMapping = "0=璇锋眰寮�閿佷腑;1=楠戣涓�;2=宸茶繕杞�;3=寮�閿佸け璐�;" ,width = 10,align = HorizontalAlignment.CENTER)
private Integer status;
+ @ApiModelProperty(value = "杞﹁締绫诲瀷 0鑷杞� 1鐢佃溅")
+ private Integer type;
@ApiModelProperty(value = "缁撶畻鐘舵��")
// @ExcelColumn(name="缁撶畻鐘舵�� ", valueMapping = "0=鏈粨绠�;1=宸茬粨绠�;" ,width = 10,align = HorizontalAlignment.CENTER)
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java b/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java
index 3600841..a346c3a 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java
@@ -6,6 +6,7 @@
import lombok.Data;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -26,10 +27,13 @@
@ExcelColumn(name="杞﹁締缂栧彿",index = 2,width = 10,align = HorizontalAlignment.CENTER)
private String bikeCode;
+ @ApiModelProperty(value = "杞﹁締绫诲瀷 0鑷杞� 1鐢佃溅")
+ private Integer type;
@ApiModelProperty(value = "杞﹁締绫诲瀷")
@ExcelColumn(name="杞﹁締绫诲瀷",index = 3,width = 10,align = HorizontalAlignment.CENTER)
private String bikeType;
-
+ @ApiModelProperty(value = "濂楅鎶垫墸浠锋牸锛堝垎锛�")
+ private BigDecimal discountPrice;
@ExcelColumn(name="缁撶畻鐘舵�� ", valueMapping = "0=鏈粨绠�;1=宸茬粨绠�;" ,index = 4,width = 10,align = HorizontalAlignment.CENTER)
private Integer closeStatus;
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index de6cd97..9facadf 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -317,7 +317,8 @@
IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
queryWrapper.orderByDesc(Goodsorder::getPayDate);
- queryWrapper.select("(select er.status from member_rides er where er.ordre_id=t.id order by er.create_date desc limit 1) as memberRidesStatus");
+ queryWrapper.select("(select sum(er.discount_price) from member_rides er where er.ordre_id=t.id and er.isdeleted=0) as discountMoney," +
+ "(select er.status from member_rides er where er.ordre_id=t.id order by er.create_date desc limit 1) as memberRidesStatus");
if(Objects.nonNull(pageWrap.getModel().getCloseStatus()) && pageWrap.getModel().getCloseStatus().equals(Constants.ZERO)){
queryWrapper.ne(Goodsorder::getStatus,Constants.GOODSORDER_STATUS.CLOSE.getKey());
}
@@ -330,6 +331,7 @@
s.setMoney(Constants.translateMoney(s.getMoney()));
s.setCloseMoney(Constants.translateMoney(s.getCloseMoney()));
s.setRefundMoney(Constants.translateMoney(s.getRefundMoney()));
+ s.setDiscountMoney(Constants.translateMoney(s.getDiscountMoney()));
});
}
return PageData.from(goodsorderIPage);
@@ -471,6 +473,12 @@
GoodsorderDetailDTO goodsorderDetailDTO = new GoodsorderDetailDTO();
goodsorderDetailDTO.setPayOrderDTOList(payOrderDTOList);//浜ゆ槗鏄庣粏
goodsorderDetailDTO.setMemberRidesList(memberRides);//楠戣璁板綍
+ if(memberRides!=null){
+ for(BikeLogDTO dd: memberRides){
+ goodsorder.setDiscountMoney(Constants.formatDecimalNum(goodsorder.getDiscountMoney()).add(Constants.formatDecimalNum(dd.getDiscountPrice())));
+ }
+ goodsorder.setDiscountMoney(Constants.translateMoney(goodsorder.getDiscountMoney()));
+ }
goodsorderDetailDTO.setModel(goodsorder);//璁㈠崟瀵硅薄
return goodsorderDetailDTO;
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
index c2b3bd0..1302e95 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -244,6 +244,8 @@
Arrays.asList(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()));
queryWrapper
.selectAs(MemberRides::getId,MemberRidesDTO::getId)
+ .selectAs(MemberRides::getDiscountPrice,MemberRidesDTO::getDiscountPrice)
+ .selectAs(MemberRides::getType,MemberRidesDTO::getType)
.selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
.selectAs(MemberRides::getBikeCode,MemberRidesDTO::getBikeCode)
.selectAs(MemberRides::getCloseStatus,MemberRidesDTO::getCloseStatus)
--
Gitblit v1.9.3