From b9fab1949820f1d40dda87ded364bc162d06e5ac Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十月 2023 12:12:02 +0800
Subject: [PATCH] 订单相关接口
---
server/services/src/main/java/com/doumee/service/business/impl/PricingRuleServiceImpl.java | 5 -
server/services/src/main/java/com/doumee/dao/business/model/WxBill.java | 4
server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java | 54 ++--------
server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 49 ++++-----
server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java | 9 +
server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java | 5 +
server/services/src/main/java/com/doumee/service/business/GoodsorderService.java | 3
server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderExportVO.java | 60 ++++++++++++
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 72 +++++++++-----
server/platform/src/main/java/com/doumee/api/business/WxBillDetailController.java | 10 +
10 files changed, 169 insertions(+), 102 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java b/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java
index 46e2aa6..d1e8e29 100644
--- a/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/GoodsorderController.java
@@ -6,7 +6,10 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.Goodsorder;
+import com.doumee.dao.business.model.WxBillDetail;
+import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.dao.business.vo.GoodsorderTotalDataVO;
import com.doumee.service.business.GoodsorderService;
import com.doumee.service.business.GoodsorderService;
@@ -91,6 +94,12 @@
ExcelExporter.build(Goodsorder.class).export(goodsorderService.findPage(pageWrap).getRecords(), "鑷杞︿俊鎭〃", response);
}
+ @ApiOperation("璐﹀崟鏀舵鏄庣粏_瀵煎嚭Excel")
+ @PostMapping("/exportNotBikeExcel")
+ @RequiresPermissions("business:wxbilldetail:exportExcel")
+ public void exportNotBikeExcel (@RequestBody PageWrap<Goodsorder> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(GoodsorderExportVO.class).exportWithFirstAndEnd(goodsorderService.findExportNotBikPage(pageWrap.getModel()), "璐﹀崟鏀舵鏄庣粏_"+System.currentTimeMillis(),"璐﹀崟鏀舵鏄庣粏_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
+ }
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:goodsorder:query")
diff --git a/server/platform/src/main/java/com/doumee/api/business/WxBillDetailController.java b/server/platform/src/main/java/com/doumee/api/business/WxBillDetailController.java
index 3855286..5b82ada 100644
--- a/server/platform/src/main/java/com/doumee/api/business/WxBillDetailController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/WxBillDetailController.java
@@ -6,6 +6,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.WxBill;
import com.doumee.dao.business.model.WxBillDetail;
import com.doumee.service.business.WxBillDetailService;
@@ -79,7 +80,14 @@
@PostMapping("/exportExcel")
@RequiresPermissions("business:wxbilldetail:exportExcel")
public void exportExcel (@RequestBody PageWrap<WxBillDetail> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(WxBillDetail.class).export(wxBillDetailService.findPage(pageWrap).getRecords(), "WxBillDetailController", response);
+ ExcelExporter.build(WxBillDetail.class).exportWithFirstAndEnd(wxBillDetailService.findPage(pageWrap).getRecords(), "瀵硅处鏄庣粏_"+System.currentTimeMillis(),"瀵硅处鏄庣粏_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
+// ExcelExporter.build(WxBillDetail.class).exportWithFirstAndEnd(wxBillDetailService.findPage(pageWrap).getRecords(), "WxBillDetailController", response);
+ }
+ @ApiOperation("闈炶嚜琛岃溅鏀跺叆_瀵煎嚭Excel")
+ @PostMapping("/exportNotBikeExcel")
+ @RequiresPermissions("business:wxbilldetail:exportExcel")
+ public void exportNotBikeExcel (@RequestBody PageWrap<WxBillDetail> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(WxBillDetail.class).exportWithFirstAndEnd(wxBillDetailService.findPage(pageWrap).getRecords(), "闈炶嚜琛岃溅鏀跺叆_"+System.currentTimeMillis(),"闈炶嚜琛岃溅鏀跺叆_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
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 4d2c14c..b1d4831 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
@@ -9,6 +9,7 @@
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.Data;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
import java.math.BigDecimal;
import java.util.Date;
@@ -24,30 +25,25 @@
public class Goodsorder {
@ApiModelProperty(value = "缂栫爜")
- @ExcelColumn(name="缂栫爜")
+ @ExcelColumn(name="璁㈠崟缂栧彿",width = 10,align = HorizontalAlignment.CENTER)
private String id;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
//@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
- @ExcelColumn(name="鍒涘缓浜�")
private String creator;
@ApiModelProperty(value = "缂栬緫鏃堕棿")
- @ExcelColumn(name="缂栬緫鏃堕棿")
//@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
- @ExcelColumn(name="缂栬緫浜�")
private String editor;
@ApiModelProperty(value = "鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�", example = "1")
- @ExcelColumn(name="鏄惁宸插垹闄� 0鏈垹闄� 1宸插垹闄�")
- @TableLogic
+ @TableLogic(value = "0",delval ="1")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
@@ -55,80 +51,66 @@
private String info;
@ApiModelProperty(value = "璁㈠崟缂栫爜")
- @ExcelColumn(name="璁㈠崟缂栫爜")
private String code;
@ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
- @ExcelColumn(name="鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
private String memberId;
@ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
- @ExcelColumn(name="鐢ㄦ埛鍚嶇О锛堝叧鑱攎ember琛級")
@TableField(exist = false)
private String memberName;
@ApiModelProperty(value = "浜ゆ槗閲戦")
- @ExcelColumn(name="浜ゆ槗閲戦")
+ @ExcelColumn(name="鎶奸噾锛堝厓锛�",width = 10,align = HorizontalAlignment.CENTER)
private BigDecimal money;
@ApiModelProperty(value = "鐘舵�� 0寰呮敮浠� 1宸叉敮浠� 2宸插彇娑� 3鏀粯澶辫触 4宸茬粨绠�")
- @ExcelColumn(name="鐘舵�� 0寰呮敮浠� 1宸叉敮浠� 2宸插彇娑� 3鏀粯澶辫触 4宸茬粨绠�")
private Integer status;
@ApiModelProperty(value = "浜ゆ槗棰勮鍗曞彿")
- @ExcelColumn(name="浜ゆ槗棰勮鍗曞彿")
private String preOrderid;
@ApiModelProperty(value = "鍦ㄧ嚎浜ゆ槗鍗曞彿")
- @ExcelColumn(name="鍦ㄧ嚎浜ゆ槗鍗曞彿")
+ @ExcelColumn(name="浜ゆ槗鍗曞彿",width = 10,align = HorizontalAlignment.CENTER)
private String onlineOrderid;
-
@ApiModelProperty(value = "鏀粯鐘舵�� 0寰呮敮浠� 1宸叉敮浠�")
- @ExcelColumn(name="鏀粯鐘舵�� 0寰呮敮浠� 1宸叉敮浠�")
private Integer payStatus;
@ApiModelProperty(value = "鏀粯鏂瑰紡 0寰俊 1鏀粯瀹�")
- @ExcelColumn(name="鏀粯鏂瑰紡 0寰俊 1鏀粯瀹�")
private Integer payWay;
@ApiModelProperty(value = "鏀粯鏃堕棿")
- @ExcelColumn(name="鏀粯鏃堕棿")
+ @ExcelColumn(name="浜ゆ娂閲戞椂闂�",width = 10,align = HorizontalAlignment.CENTER)
private Date payDate;
@ApiModelProperty(value = "浜ゆ槗绫诲瀷 0绉熻溅鎶奸噾")
- @ExcelColumn(name="浜ゆ槗绫诲瀷 0绉熻溅鎶奸噾")
private Integer type;
@ApiModelProperty(value = "缁撶畻閲戦(鍒嗭級")
- @ExcelColumn(name="缁撶畻閲戦(鍒嗭級")
+ @ExcelColumn(name="缁撶畻閲戦",width = 10,align = HorizontalAlignment.CENTER)
private BigDecimal closeMoney;
@ApiModelProperty(value = "缁撶畻閫�娆惧崟鍙�(鍏宠仈refund)")
- @ExcelColumn(name="缁撶畻閫�娆惧崟鍙�(鍏宠仈refund)")
private String closeId;
@ApiModelProperty(value = "缁撶畻鏃堕棿")
- @ExcelColumn(name="缁撶畻鏃堕棿")
+// @ExcelColumn(name="閫�娆剧粨绠楁椂闂�",width = 10,align = HorizontalAlignment.CENTER)
private Date closeDate;
-
@ApiModelProperty(value = "缁撶畻澶囨敞")
- @ExcelColumn(name="缁撶畻澶囨敞")
private String closeInfo;
@ApiModelProperty(value = "缁撶畻鎿嶄綔浜虹紪鐮侊紙鍏宠仈system_user)")
- @ExcelColumn(name="缁撶畻鎿嶄綔浜虹紪鐮侊紙鍏宠仈system_user)")
private String closeUserId;
@ApiModelProperty(value = "缁撶畻绫诲瀷 0鑷姩缁撶畻 1骞冲彴浜哄伐缁撶畻 2绯荤粺鑷姩缁撶畻")
- @ExcelColumn(name="缁撶畻绫诲瀷 0鑷姩缁撶畻 1骞冲彴浜哄伐缁撶畻 2绯荤粺鑷姩缁撶畻")
private Integer closeType;
-
-
-
@ApiModelProperty(value = "鏌ヨ寮�濮嬫棩鏈燂紙鍖呭惈锛�", example = "2023-10-01 15:12:01")
@TableField(exist = false)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date startDate;
+ @ApiModelProperty(value = "鐢ㄦ埛openid" )
+ @TableField(exist = false)
+ private String memberOpenid;
@ApiModelProperty(value = "鏌ヨ鎴鏃ユ湡锛堝寘鍚級", example = "2023-10-09 15:12:05")
@TableField(exist = false)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -136,4 +118,13 @@
@ApiModelProperty(value = "浜ゆ槗绗旀暟", example = "0")
@TableField(exist = false)
private int countNum;
+ @ApiModelProperty(value = "閫�娆炬�婚(鍒嗭級")
+ @TableField(exist = false)
+ @ExcelColumn(name="閫�娆炬�婚锛堝厓锛�",width = 10,align = HorizontalAlignment.CENTER)
+ private BigDecimal refundMoney;
+
+ @ApiModelProperty(value = "鏈�鍚庨��娆炬椂闂�")
+ @TableField(exist = false)
+ @ExcelColumn(name="閫�娆剧粨绠楁椂闂�",width = 10,align = HorizontalAlignment.CENTER)
+ private Date refundDate;
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/WxBill.java b/server/services/src/main/java/com/doumee/dao/business/model/WxBill.java
index 9bfcd66..e3385c6 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/WxBill.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/WxBill.java
@@ -75,11 +75,11 @@
private Date createDate;
@ApiModelProperty(value = "鏌ヨ寮�濮嬫棩鏈燂紙鍖呭惈锛�", example = "20231008")
@TableField(exist = false)
- @JsonFormat(pattern = "yyyyMMdd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:sss")
private Date startDate;
@ApiModelProperty(value = "鏌ヨ鎴鏃ユ湡锛堝寘鍚級", example = "20231008")
@TableField(exist = false)
- @JsonFormat(pattern = "yyyyMMdd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:sss")
private Date endDate;
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java b/server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java
index c0146c5..5c8d7c5 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/WxBillDetail.java
@@ -4,11 +4,11 @@
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+
import java.util.Date;
import java.math.BigDecimal;
@@ -23,143 +23,117 @@
public class WxBillDetail {
@ApiModelProperty(value = "")
- @ExcelColumn(name="")
private String id;
@ApiModelProperty(value = "瀵硅处鍗旾D")
- @ExcelColumn(name="瀵硅处鍗旾D")
private String pid;
@ApiModelProperty(value = "浜ゆ槗鏃堕棿")
- @ExcelColumn(name="浜ゆ槗鏃堕棿")
+ @ExcelColumn(name="浜ゆ槗鏃堕棿",width = 10,align = HorizontalAlignment.CENTER)
//@JsonFormat(pattern = "yyyy-MM-dd")
private Date billDate;
@ApiModelProperty(value = "鍏紬璐﹀彿ID")
- @ExcelColumn(name="鍏紬璐﹀彿ID")
private String appid;
@ApiModelProperty(value = "鍟嗘埛鍙�")
- @ExcelColumn(name="鍟嗘埛鍙�")
private String mchId;
@ApiModelProperty(value = "鐗圭害鍟嗘埛鍙�")
- @ExcelColumn(name="鐗圭害鍟嗘埛鍙�")
private String subMchid;
@ApiModelProperty(value = "璁惧鍙�")
- @ExcelColumn(name="璁惧鍙�")
private String deviceInfo;
- @ApiModelProperty(value = "寰俊璁㈠崟鍙�")
- @ExcelColumn(name="寰俊璁㈠崟鍙�")
+ @ApiModelProperty(value = "寰俊浜ゆ槗鍙�")
+ @ExcelColumn(name="寰俊浜ゆ槗鍙�",width = 10,align = HorizontalAlignment.CENTER)
private String transactionId;
@ApiModelProperty(value = "鍟嗘埛璁㈠崟鍙�")
- @ExcelColumn(name="鍟嗘埛璁㈠崟鍙�")
+ @ExcelColumn(name="璁㈠崟缂栧彿",width = 10,align = HorizontalAlignment.CENTER)
private String outTradeNo;
@ApiModelProperty(value = "鐢ㄦ埛鏍囪瘑")
- @ExcelColumn(name="鐢ㄦ埛鏍囪瘑")
+ @ExcelColumn(name="鐢ㄦ埛",width = 10,align = HorizontalAlignment.CENTER)
private String openid;
@ApiModelProperty(value = "浜ゆ槗绫诲瀷")
- @ExcelColumn(name="浜ゆ槗绫诲瀷")
private String billType;
@ApiModelProperty(value = "浜ゆ槗鐘舵��")
- @ExcelColumn(name="浜ゆ槗鐘舵��")
private String billStatus;
@ApiModelProperty(value = "浠樻閾惰")
- @ExcelColumn(name="浠樻閾惰")
private String bankType;
@ApiModelProperty(value = "璐у竵绉嶇被")
- @ExcelColumn(name="璐у竵绉嶇被")
private String feeType;
@ApiModelProperty(value = "搴旂粨璁㈠崟閲戦", example = "1")
- @ExcelColumn(name="搴旂粨璁㈠崟閲戦")
+ @ExcelColumn(name="浜ゆ槗閲戦",width = 10,align = HorizontalAlignment.CENTER)
private BigDecimal settlementTotalFee;
@ApiModelProperty(value = "浠ｉ噾鍒搁噾棰�", example = "1")
- @ExcelColumn(name="浠ｉ噾鍒搁噾棰�")
private BigDecimal couponFee;
@ApiModelProperty(value = "寰俊閫�娆惧崟鍙�")
- @ExcelColumn(name="寰俊閫�娆惧崟鍙�")
private String refundId;
@ApiModelProperty(value = "鍟嗘埛閫�娆惧崟鍙�")
- @ExcelColumn(name="鍟嗘埛閫�娆惧崟鍙�")
private String outRefundNo;
@ApiModelProperty(value = "閫�娆鹃噾棰�", example = "1")
- @ExcelColumn(name="閫�娆鹃噾棰�")
private BigDecimal refundFee;
@ApiModelProperty(value = "鍏呭�煎埜閫�娆鹃噾棰�", example = "1")
- @ExcelColumn(name="鍏呭�煎埜閫�娆鹃噾棰�")
private BigDecimal couponRefundFee;
@ApiModelProperty(value = "閫�娆剧被鍨�")
- @ExcelColumn(name="閫�娆剧被鍨�")
private String refundType;
@ApiModelProperty(value = "閫�娆剧敵璇锋椂闂�")
- @ExcelColumn(name="閫�娆剧敵璇锋椂闂�")
- //@JsonFormat(pattern = "yyyy-MM-dd")
private Date refundApplyDate;
@ApiModelProperty(value = "閫�娆炬垚鍔熸椂闂�")
- @ExcelColumn(name="閫�娆炬垚鍔熸椂闂�")
- //@JsonFormat(pattern = "yyyy-MM-dd")
private Date refundSuccessDate;
@ApiModelProperty(value = "閫�娆剧姸鎬�")
- @ExcelColumn(name="閫�娆剧姸鎬�")
private String refundSuccessStatus;
@ApiModelProperty(value = "鍟嗗搧鍚嶇О")
- @ExcelColumn(name="鍟嗗搧鍚嶇О")
private String body;
@ApiModelProperty(value = "鍟嗘埛鏁版嵁鍖�")
- @ExcelColumn(name="鍟嗘埛鏁版嵁鍖�")
private String attach;
@ApiModelProperty(value = "鎵嬬画璐�", example = "1")
- @ExcelColumn(name="鎵嬬画璐�")
private BigDecimal cmmsAmt;
@ApiModelProperty(value = "璐圭巼", example = "1")
- @ExcelColumn(name="璐圭巼")
private BigDecimal rate;
@ApiModelProperty(value = "璁㈠崟閲戦", example = "1")
- @ExcelColumn(name="璁㈠崟閲戦")
private BigDecimal totalFee;
@ApiModelProperty(value = "鐢宠閫�娆鹃噾棰�", example = "1")
- @ExcelColumn(name="鐢宠閫�娆鹃噾棰�")
private BigDecimal applyRefundFee;
@ApiModelProperty(value = "璐圭巼澶囨敞")
- @ExcelColumn(name="璐圭巼澶囨敞")
private String rateRemark;
@ApiModelProperty(value = "鏌ヨ寮�濮嬫棩鏈燂紙鍖呭惈锛�", example = "20231008")
@TableField(exist = false)
- @JsonFormat(pattern = "yyyyMMdd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:sss")
private Date startDate;
@ApiModelProperty(value = "鏌ヨ鎴鏃ユ湡锛堝寘鍚級", example = "20231008")
@TableField(exist = false)
- @JsonFormat(pattern = "yyyyMMdd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:sss")
private Date endDate;
@ApiModelProperty(value = "鎬讳氦鏄撳崟鏁�", example = "1")
- @ExcelColumn(name="鏀舵浜ゆ槗鍗曟暟")
@TableField(exist = false)
private Integer sumBill;
- ;
+
+ @ApiModelProperty(value = "鏄惁闈炶嚜琛岃溅浜ゆ槗鏄庣粏 0鑷杞︿氦鏄� 1闈炶嚜琛岃溅浜ゆ槗,null琛ㄧず鎵�鏈�", example = "0")
+ @TableField(exist = false)
+ private Integer isBikeFee;
}
diff --git a/server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderExportVO.java b/server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderExportVO.java
new file mode 100644
index 0000000..792124a
--- /dev/null
+++ b/server/services/src/main/java/com/doumee/dao/business/vo/GoodsorderExportVO.java
@@ -0,0 +1,60 @@
+package com.doumee.dao.business.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.doumee.core.annotation.excel.ExcelColumn;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 璁㈠崟淇℃伅琛�
+ * @author 姹熻箘韫�
+ * @date 2023/09/27 18:06
+ */
+@Data
+@ApiModel("璐﹀崟瀵煎叆鏄庣粏")
+public class GoodsorderExportVO {
+
+ @ApiModelProperty(value = "缂栫爜")
+ @ExcelColumn(name="璁㈠崟缂栧彿",width = 10,align = HorizontalAlignment.CENTER)
+ private String id;
+ @ApiModelProperty(value = "璁㈠崟缂栫爜")
+// @ExcelColumn(name="璁㈠崟缂栫爜")
+ private String code;
+ @ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember琛級")
+ @ExcelColumn(name="鐢ㄦ埛",width = 10,align = HorizontalAlignment.CENTER)
+ private String openid;
+
+ @ApiModelProperty(value = "浜ゆ槗閲戦")
+ @ExcelColumn(name="鏀粯閲戦",width = 10,align = HorizontalAlignment.CENTER)
+ private BigDecimal money;
+
+
+ @ApiModelProperty(value = "鏀粯鏃堕棿")
+ @ExcelColumn(name="鏀粯鏃堕棿",width = 10,align = HorizontalAlignment.CENTER)
+ private Date payDate;
+
+ @ApiModelProperty(value = "缁撶畻閲戦(鍒嗭級")
+ @ExcelColumn(name="缁撶畻閲戦",width = 10,align = HorizontalAlignment.CENTER)
+ private BigDecimal closeMoney;
+
+ @ApiModelProperty(value = "缁撶畻鏃堕棿")
+ @ExcelColumn(name="缁撶畻鏃堕棿",width = 10,align = HorizontalAlignment.CENTER)
+ private Date closeDate;
+
+ @ApiModelProperty(value = "閫�娆鹃噾棰�(鍒嗭級")
+ @ExcelColumn(name="閫�娆鹃噾棰�",width = 10,align = HorizontalAlignment.CENTER)
+ private BigDecimal refundMoney;
+
+ @ApiModelProperty(value = "閫�娆炬椂闂�")
+ @ExcelColumn(name="閫�娆炬椂闂�",width = 10,align = HorizontalAlignment.CENTER)
+ private Date refundDate;
+
+}
diff --git a/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java b/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
index b33930c..87d8377 100644
--- a/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
+++ b/server/services/src/main/java/com/doumee/service/business/GoodsorderService.java
@@ -5,6 +5,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Goodsorder;
+import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.dao.business.vo.GoodsorderTotalDataVO;
import com.doumee.dao.business.web.response.HomeResponse;
import com.doumee.dao.business.web.response.GoodsorderDetailDTO;
@@ -146,4 +147,6 @@
RidesDetailResponse getRidesDetailResponse(String id);
GoodsorderTotalDataVO getTotalData(Goodsorder pageWrap);
+
+ List<GoodsorderExportVO> findExportNotBikPage(Goodsorder model);
}
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 2245919..2c9fff5 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
@@ -23,6 +23,7 @@
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRides;
+import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.dao.business.vo.GoodsorderTotalDataVO;
import com.doumee.dao.business.web.response.*;
import com.doumee.dao.business.join.MemberRidesJoinMapper;
@@ -141,35 +142,56 @@
QueryWrapper<Goodsorder> wrapper = new QueryWrapper<>(goodsorder);
return goodsorderMapper.selectList(wrapper);
}
+ @Override
+ public List<GoodsorderExportVO> findExportNotBikPage(Goodsorder model){
+ List<GoodsorderExportVO> list = new ArrayList<>();
+ MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(model);
+
+ List<Goodsorder> goodsorderList = goodsorderJoinMapper.selectJoinList(Goodsorder.class,queryWrapper);
+ if(goodsorderList!=null){
+ for(Goodsorder order : goodsorderList){
+ GoodsorderExportVO vo = new GoodsorderExportVO();
+ vo.setId(order.getId());
+ vo.setOpenid(order.getMemberName());
+ vo.setPayDate(order.getPayDate());
+ vo.setCloseDate(order.getCloseDate());
+ vo.setCloseDate(order.getCloseDate());
+ vo.setCloseMoney(Constants.formatDecimalNum(order.getCloseMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_UP));
+ vo.setRefundDate(order.getRefundDate());
+ vo.setRefundMoney(Constants.formatDecimalNum(order.getRefundMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_UP));
+ list.add(vo);
+ }
+ }
+ return list;
+ }
+ private MPJLambdaWrapper<Goodsorder> initQueryParamByModel(Goodsorder model) {
+ MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(model);
+ //鍙煡璇㈡敮浠樻垚鍔熺殑
+ model.setPayStatus(Constants.ONE);
+ queryWrapper.selectAll(Goodsorder.class);
+ queryWrapper.selectAs(Member::getOpenid, Goodsorder::getMemberOpenid);
+ queryWrapper.leftJoin(Member.class, Member::getId ,Goodsorder::getMemberId);
+ queryWrapper.select("select max(r.done_date) from refund r where t1.obj_id=t.id and r.status=2 ) as refund_date");
+ queryWrapper.select("select sum(r.money) from refund r where t1.obj_id=t.id and r.status=2) as refund_money");
+ //鏃堕棿娈电瓫閫�
+ queryWrapper.ge(model.getStartDate()!=null, Goodsorder::getPayDate, model.getStartDate());
+ queryWrapper.le(model.getEndDate()!=null, Goodsorder::getPayDate, model.getEndDate());
+ queryWrapper.eq(model.getPayStatus() !=null,Goodsorder::getPayStatus,model.getPayStatus());
+ queryWrapper.eq(model.getCode() !=null,Goodsorder::getCode,model.getCode());
+ queryWrapper.eq(model.getStatus() !=null,Goodsorder::getStatus,model.getStatus());
+ queryWrapper.eq(model.getOnlineOrderid() !=null,Goodsorder::getOnlineOrderid,model.getOnlineOrderid());
+ queryWrapper.like(model.getMemberOpenid() !=null,Member::getOpenid,model.getMemberOpenid());
+ queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO);
+ queryWrapper.orderByDesc(Goodsorder::getPayDate);
+ return queryWrapper;
+ }
+
@Override
public PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap) {
IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
- Utils.MP.blankToNull(pageWrap.getModel());
-
- if (pageWrap.getModel().getCode() != null) {
- queryWrapper.like(Goodsorder::getCode, pageWrap.getModel().getCode());
- }
-
- if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.eq(Goodsorder::getStatus, pageWrap.getModel().getStatus());
- }
-
- if (pageWrap.getModel().getOnlineOrderid() != null) {
- queryWrapper.eq(Goodsorder::getOnlineOrderid, pageWrap.getModel().getOnlineOrderid());
- }
-
- if (pageWrap.getModel().getPayDate() != null) {
- queryWrapper.ge(Goodsorder::getPayDate, Utils.Date.getStart(pageWrap.getModel().getPayDate()));
- queryWrapper.le(Goodsorder::getPayDate, Utils.Date.getEnd(pageWrap.getModel().getPayDate()));
- }
-
- queryWrapper.orderByDesc(Goodsorder::getCreateDate);
- queryWrapper.selectAll(Goodsorder.class)
- .selectAs(Member::getName,Goodsorder::getMemberName)
- .leftJoin(Member.class,Member::getId,Goodsorder::getMemberId)
- .like(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()),Member::getName,pageWrap.getModel().getMemberName());
+ MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
return PageData.from(goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class,queryWrapper));
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/PricingRuleServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/PricingRuleServiceImpl.java
index 1b294d1..6750ced 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/PricingRuleServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/PricingRuleServiceImpl.java
@@ -30,18 +30,14 @@
@Service
public class PricingRuleServiceImpl implements PricingRuleService {
-
@Autowired
PricingParamMapper pricingParamMapper;
-
@Autowired
MemberRidesMapper memberRidesMapper;
-
@Autowired
BaseParamMapper baseParamMapper;
-
@Override
public PricingRuleDTO getPricingRule(String goodaorderId) {
@@ -55,7 +51,6 @@
PricingRuleDTO pricingRule = getPricingRule(memberRides);
return pricingRule;
}
-
@Override
public PricingRuleDTO getPricingRule(List<MemberRides> memberRidesList) {
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java
index 6e0e3a2..11bd97d 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java
@@ -4,6 +4,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
+import com.doumee.core.wx.WxMiniConfig;
import com.doumee.dao.business.WxBillDetailMapper;
import com.doumee.dao.business.model.WxBill;
import com.doumee.dao.business.model.WxBillDetail;
@@ -189,6 +190,10 @@
}
queryWrapper.lambda().ge(pageWrap.getModel().getStartDate() !=null, WxBillDetail::getPid,DateUtil.getShortDateStr(pageWrap.getModel().getStartDate()));
queryWrapper.lambda().le(pageWrap.getModel().getEndDate() !=null,WxBillDetail::getPid, DateUtil.getShortDateStr(pageWrap.getModel().getEndDate()));
+ //鑷杞︿氦鏄�
+ queryWrapper.lambda().eq(pageWrap.getModel().getIsBikeFee() != null&&pageWrap.getModel().getIsBikeFee().intValue() ==0, WxBillDetail::getAppid, WxMiniConfig.wxPayService.getConfig().getAppId());
+ //闈炶嚜琛岃溅浜ゆ槗
+ queryWrapper.lambda().ne(pageWrap.getModel().getIsBikeFee() != null&&pageWrap.getModel().getIsBikeFee().intValue() ==1, WxBillDetail::getAppid, WxMiniConfig.wxPayService.getConfig().getAppId());
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
--
Gitblit v1.9.3