- {{orderStatistics.balanceCount?orderStatistics.balanceCount:0}}/0
+
+ {{orderStatistics.discountMoneyIntegral?orderStatistics.discountMoneyIntegral:0}}
+ /{{orderStatistics.discountMoneyIntegralNo?orderStatistics.discountMoneyIntegralNo:0}}
@@ -154,15 +150,15 @@
其他
-
-
- 收银台
- POS机
- 平台
- 小程序
- 其他
-
-
+
+
+
+
+
+
+
+
+
油品
@@ -272,8 +268,13 @@ import {
exportExcelTradingApi, getmyDataApi,
getRunningWaterByTissueApi,
getTissueByDataApi,
- getTradingPageApi
+ getTradingPageApi,
+ getDicts,
+ getStaffByStorId,
+ getTradingNewPageApi,
+ getTissueByDataNewsApi
} from "@/api/allOrder";
+import {getTissueByDataNewApi} from "../../../../api/allOrder";
export default {
name: "reconciliation-trading",
@@ -320,6 +321,14 @@ export default {
balanceCount:"0",
refBalance:"0",
refBalanceCount:"0",
+ discountMoneyAll:"0",
+ discountMoneyAllNo:"0",
+ discountMoneyOil:"0",
+ discountMoneyOilNo:"0",
+ discountMoneyStore:"0",
+ discountMoneyStoreNo:"0",
+ discountMoneyIntegral:"0",
+ discountMoneyIntegralNo:"0",
},
total:0,
}
@@ -347,7 +356,9 @@ export default {
await getmyDataApi(this.addDateRange(this.queryParams)).then( response => {
this.queryParams.deptId = response.data.deptId;
this.getList()
-
+ this.getDicts()
+ this.getStaffByStorId()
+ this.getOrderStatistics()
})
},
exportExcelCashier() {
@@ -362,35 +373,34 @@ export default {
})
},
// 获取订单统计信息
-
+ async getStaffByStorId() {
+ getStaffByStorId().then(response => {
+ this.staffList = response.data;
+ })
+ },
+ // 获取字典
+ async getDicts() {
+ getDicts("payment_channel").then(response => {
+ this.dict = response.data;
+ })
+ getDicts("payment_type").then(response => {
+ this.dictPayType = response.data;
+ })
+ },
async getOrderStatistics() {
- // await this.getDeptList()
- let dateRange = []
- if (this.beginTime && this.endTime) {
- dateRange.push(this.beginTime.toLocaleDateString())
- dateRange.push(this.endTime.toLocaleDateString())
- }
- getTissueByDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
+ getTissueByDataNewsApi(this.queryParams).then(res=>{
this.orderStatistics = res.data
})
},
// 获取列表信息
async getList(val){
- // await this.getDeptList()
- let dateRange = []
- if (this.beginTime && this.endTime) {
- dateRange.push(this.beginTime.toLocaleDateString())
- dateRange.push(this.endTime.toLocaleDateString())
- }
- getTradingPageApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
+
+ getTradingNewPageApi(this.queryParams).then( response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false
- // this.getDeptList()
- this.getOrderStatistics()
-
})
},
getOrdersInfo(data) {
diff --git a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
index fa68574fb..6cf05c7f0 100644
--- a/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
+++ b/fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
@@ -80,7 +80,7 @@
搜索
重置
- 导出
+ 导出
@@ -251,7 +251,8 @@ import {
getTradingPageApi,
getDicts,
getStaffByStorId,
- getTradingOnsPageApi
+ getTradingOnsPageApi,
+ exportExcelBackOrderMsgsApi
} from "@/api/allOrder";
import {getTradingOnPageApi} from "../../../../api/allOrder";
@@ -342,12 +343,7 @@ export default {
})
},
exportExcelCashier() {
- let dateRange = []
- if (this.beginTime && this.endTime) {
- dateRange.push(this.beginTime.toLocaleDateString())
- dateRange.push(this.endTime.toLocaleDateString())
- }
- exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
+ exportExcelBackOrderMsgsApi(this.queryParams).then(res=>{
const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
this.$download.saveAs(blob,'交易明细统计.xLsx')
})
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
index 826dd9390..757e43014 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
@@ -453,4 +453,34 @@ public class AllOrderInfoController extends BaseController {
public void exportExcelOrderMsgApi(HttpServletResponse response, @RequestBody AllOrderInfoRes allOrderInfoRes) {
this.allOrderInfoService.exportExcelOrderMsgApi(response, allOrderInfoRes);
}
+ /**
+ * 导出退款明细
+ * @param response
+ */
+ @PostMapping("exportExcelBackOrderMsgsApi")
+ public void exportExcelBackOrderMsgsApi(HttpServletResponse response, @RequestBody AllOrderInfoRes allOrderInfoRes) {
+ this.allOrderInfoService.exportExcelBackOrderMsgsApi(response, allOrderInfoRes);
+ }
+
+
+ /**
+ * 交易对账
+ * 交易明细分页查询
+ */
+ @GetMapping("tradingNewList")
+ public ResponseObject tradingNewList(AllOrderInfoDto allOrderInfo,
+ @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+ @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+ Page page =new Page(pageNo,pageSize);
+ IPage list = allOrderInfoService.tradingNewList(page, allOrderInfo);
+ return getSuccessResult(list);
+ }
+
+ @GetMapping("getTradingNewData")
+ public ResponseObject getTradingNewData(AllOrderInfoDto allOrderInfo,
+ @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+ @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+ AllOrderInfoVo list = allOrderInfoService.getTradingNewData(allOrderInfo);
+ return getSuccessResult(list);
+ }
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
index 5e0450671..b8e00a2f7 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
@@ -15,6 +15,7 @@ import com.fuint.business.order.vo.AllOrderActivityVo;
import com.fuint.business.order.vo.AllOrderInfoUniVo;
import com.fuint.business.order.vo.AllOrderInfoVo;
import com.fuint.business.order.vo.CardBalanceChangeVo;
+import com.fuint.business.order.vo.Excel.TradingBackOrderExcel;
import com.fuint.business.order.vo.Excel.allorderVOo;
import com.fuint.business.store.entity.MtStore;
import com.fuint.business.userManager.vo.UserBalanceVo;
@@ -121,4 +122,14 @@ public interface AllOrderInfoMapper extends BaseMapper {
IPage gettradingListPage(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfo allOrderInfo,
@Param("beginTime") String beginTime,@Param("endTime") String endTime);
+
+ List transactionBackAllList(@Param("obj") AllOrderInfoRes allOrderInfoRes,
+ @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+
+ IPage tradingNewList(Page page,@Param("obj") AllOrderInfoDto allOrderInfo,
+ @Param("beginTime") String beginTime, @Param("endTime") String endTime);
+
+ AllOrderInfoVo getTradingNewData(@Param("obj") AllOrderInfoDto allOrderInfo,
+ @Param("beginTime") String beginTime,@Param("endTime") String endTime);
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
index 085e5b390..13f1f5c25 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
@@ -1197,4 +1197,187 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java
index d1dfedbaa..b28292061 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java
@@ -208,4 +208,8 @@ AllOrderActivityVo getOneByOrderId(Integer orderId);
List getStaffByStorId();
void exportExcelOrderMsgApi(HttpServletResponse response, AllOrderInfoRes allOrderInfoRes);
+ void exportExcelBackOrderMsgsApi(HttpServletResponse response, AllOrderInfoRes allOrderInfoRes);
+
+ IPage tradingNewList(Page page, AllOrderInfoDto allOrderInfo);
+ AllOrderInfoVo getTradingNewData(AllOrderInfoDto allOrderInfo);
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
index 1606049fa..d815f9fa5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
@@ -2557,5 +2557,66 @@ public class AllOrderInfoServiceImpl extends ServiceImpl list= transactionBackAllList(allOrderInfoRes);
+ List tradingExcel = new ArrayList<>();
+ for (TradingBackOrderExcel record : list) {
+ TradingBackOrderExcel excel1 = new TradingBackOrderExcel();
+ BeanUtils.copyProperties(record, excel1);
+ tradingExcel.add(excel1);
+ }
+ // 设置响应头信息
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ response.setHeader("Content-disposition", "attachment;filename=demo.xlsx");
+ try {
+ // 写入文件数据
+ EasyExcel.write(response.getOutputStream(), TradingBackOrderExcel.class).sheet("download").doWrite(tradingExcel);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ }
+ }
+
+
+ /**
+ * 查询退单订单数据
+ * @param
+ * @param allOrderInfoRes
+ * @return
+ */
+ public List transactionBackAllList(AllOrderInfoRes allOrderInfoRes) {
+ AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+ allOrderInfoRes.setStoreId(nowAccountInfo.getStoreId());
+ List allOrderInfoVo = super.baseMapper.transactionBackAllList(allOrderInfoRes,
+ allOrderInfoRes.getDataRange().length==0?"":allOrderInfoRes.getDataRange()[0],
+ allOrderInfoRes.getDataRange().length==0?"":allOrderInfoRes.getDataRange()[1]);
+
+ return allOrderInfoVo;
+ }
+ /**
+ * 查询退单订单数据
+ * @param
+ * @param allOrderInfo
+ * @return
+ */
+
+ @Override
+ public IPage tradingNewList(Page page, AllOrderInfoDto allOrderInfo) {
+ AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+ allOrderInfo.setStoreId(nowAccountInfo.getStoreId());
+ return baseMapper.tradingNewList(page,allOrderInfo,
+ allOrderInfo.getDataRange()==null?"":allOrderInfo.getDataRange()[0],
+ allOrderInfo.getDataRange()==null?"":allOrderInfo.getDataRange()[1]);
+ }
+ @Override
+ public AllOrderInfoVo getTradingNewData(AllOrderInfoDto allOrderInfo) {
+ AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+ allOrderInfo.setStoreId(nowAccountInfo.getStoreId());
+ return allOrderInfoMapper.getTradingNewData(allOrderInfo,
+ allOrderInfo.getDataRange()==null?"":allOrderInfo.getDataRange()[0],
+ allOrderInfo.getDataRange()==null?"":allOrderInfo.getDataRange()[1]);
+ }
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java
index f21f561d3..d55d4cbb9 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java
@@ -104,6 +104,23 @@ public class AllOrderInfoVo extends AllOrderInfo {
private String integral;
@TableField(exist = false)
private String integralCount;
+ @TableField(exist = false)
+ //优惠金额
+ private String discountMoneyAll;
+ @TableField(exist = false)
+ private String discountMoneyAllNo;
+ @TableField(exist = false)
+ private String discountMoneyOil;
+ @TableField(exist = false)
+ private String discountMoneyOilNo;
+ @TableField(exist = false)
+ private String discountMoneyStore;
+ @TableField(exist = false)
+ private String discountMoneyStoreNo;
+ @TableField(exist = false)
+ private String discountMoneyIntegral;
+ @TableField(exist = false)
+ private String discountMoneyIntegralNo;
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/Excel/TradingBackOrderExcel.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/Excel/TradingBackOrderExcel.java
new file mode 100644
index 000000000..aea94257c
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/Excel/TradingBackOrderExcel.java
@@ -0,0 +1,36 @@
+package com.fuint.business.order.vo.Excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class TradingBackOrderExcel {
+ @ExcelProperty("订单号")
+ private String orderNo; // 订单号
+ @ExcelProperty("订单类型")
+ private String payChannel; // 订单类型
+ @ExcelProperty("订单分类")
+ private String type; // 订单分类
+ @ExcelProperty("订单金额")
+ private Double goodsMoney; // 订单金额
+ @ExcelProperty("实收金额")
+ private Double payMoney; // 实收金额
+ @ExcelProperty("会员支付金额")
+ private Double paysMoney; // 会员支付金额
+ @ExcelProperty("归还金额")
+ private Double refMoney; // 归还金额
+ @ExcelProperty("付款用户")
+ private String userName; // 付款用户
+ @ExcelProperty("支付方式")
+ private String payType; // 支付方式
+ @ExcelProperty("支付渠道")
+ private String paymentChannel; // 支付渠道
+ @ExcelProperty("商户号")
+ private String mchntCd; // 付款用户
+ @ExcelProperty("收银员")
+ private String createBy; // 收银员
+ @ExcelProperty("订单完成时间")
+ private Date updateTime; // 支付时间
+}