微信收款
-
{{ orderStatistics.cash }}元/{{orderStatistics.cashcount}}笔
+
{{ orderStatistics.cash?orderStatistics.cash:0 }}元/{{orderStatistics.cashcount}}笔
支付宝收款
-
{{ orderStatistics.wechat }}元/{{orderStatistics.wechatcount}}笔
+
{{ orderStatistics.wechat?orderStatistics.wechat:0 }}元/{{orderStatistics.wechatcount}}笔
会员钱包收款
-
{{ orderStatistics.alipay }}元/{{orderStatistics.alipaycount}}笔
+
{{ orderStatistics.alipay?orderStatistics.alipay:0 }}元/{{orderStatistics.alipaycount}}笔
@@ -112,13 +112,13 @@
现金支付收款
-
{{ orderStatistics.balance }}元/{{orderStatistics.balanceCount}}笔
+
{{ orderStatistics.balance?orderStatistics.balance:0 }}元/{{orderStatistics.balanceCount}}笔
-
+
+ 油品
+ 商品
+ 储值卡
+ 积分
+ 囤油卡
+ 油品加商品(收银台订单)
+ 挂账订单
+ 其他
+
-
+
现金
@@ -154,12 +163,17 @@
-
+
+
+ {{scope.row.payMoney}}
+ --
+
+
-
-
-
+
+
+
import {
+ exportExcelTradingApi,
getRunningWaterByTissueApi,
getTissueByDataApi,
getTradingPageApi
@@ -331,10 +346,10 @@ import {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
- // exportExcelCashierApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
- // const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
- // this.$download.saveAs(blob,'收银台订单统计.xLsx')
- // })
+ exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
+ const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+ this.$download.saveAs(blob,'交易明细统计.xLsx')
+ })
},
// 获取订单统计信息
@@ -356,7 +371,7 @@ import {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
- getTradingPageApi(this.addDateRange(this.queryParams),dateRange).then( response => {
+ getTradingPageApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
this.orderList = response.data.records;
this.total = response.data.total;
this.isSysDate = false
diff --git a/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/day.vue b/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/day.vue
index 805dc1924..583eac72e 100644
--- a/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/day.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/runningWater/tab/day.vue
@@ -8,24 +8,24 @@
交易金额
-
{{ 0 }}
+
{{ orderStatistics.amount }}
交易笔数
-
{{ 0 }}
+
{{ orderStatistics.strokeCount }}
-
-
-
日均交易笔数
-
{{ 0 }}
+
{{ orderStatistics.unitPrice }}
+
+
+
+
+
+
+
+
@@ -59,18 +59,16 @@
placeholder="结束日期">
-
-
-
- {{ item.realName }}
- {{ item.mobile }}
-
-
-
+
+
+
+
+
+
+
+
+
+
搜索
重置
@@ -128,7 +126,7 @@
diff --git a/fuintBackend/configure/dev/application.properties b/fuintBackend/configure/dev/application.properties
index 61e5a4abf..c058ecd5c 100644
--- a/fuintBackend/configure/dev/application.properties
+++ b/fuintBackend/configure/dev/application.properties
@@ -43,7 +43,8 @@ images.root=d:/ruoyi/uploadPath
images.path=/static/uploadImages/
# \u4E0A\u4F20\u56FE\u7247\u670D\u52A1\u5668\u57DF\u540D
-images.upload.url=http://localhost:8008
+#images.upload.url=http://localhost:8008
+images.upload.url=http://localhost:8080
# \u4E0A\u4F20\u56FE\u7247\u5141\u8BB8\u7684\u5927\u5C0F\uFF08\u5355\u4F4D\uFF1AMB\uFF09
images.upload.maxSize=5
@@ -75,7 +76,7 @@ aliyun.sms.accessKeySecret=whimt0bhMMJ0amVZPsvJ2euz8nCiOp
aliyun.sms.regionId=cn-hangzhou
aliyun.sms.templateCode=SMS_154950909
# \u963F\u91CC\u4E91\u77ED\u4FE1\u7B7E\u540D
-aliyun.sms.signName=阿里云短信测试
+aliyun.sms.signName=\u963F\u91CC\u4E91\u77ED\u4FE1\u6D4B\u8BD5
################## \u963F\u91CC\u4E91OSS\u5B58\u50A8\u914D\u7F6E######################
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java
index 8f42126fd..c7ffc92c4 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java
@@ -49,7 +49,8 @@ public class Const {
public static String NOTIFY_PUBLIC_KEYS="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbBAl3xSB7YeUnze4yYZmnTeT7OtXZr0sP10TsDVRH2SY/VEjgS9KPmHMmVeKZT3+6xKsUvulgVyie46GGtZPrnoh+glF1gzsYAXJ7dvR/R5nYO5VvfwK/ChPFTiKhbTtO4OKtchgBZuqCbsemG+gFIiVJo37dY0Kg0zISmFHdOQIDAQAB";
//小程序异步通知(回调地址)
- public static String notify_url = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notify";
+// public static String notify_url = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notify";
+ public static String notify_url = "http://k40180f897.goho.co/api/fyPay/notify";
// public static String notify_url = "https://8q4f124343.yicp.fun/api/fyPay/notify";
//主扫异步通知(回调地址)
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueRecord.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueRecord.java
index 17ff96c74..4428ae14f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueRecord.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueRecord.java
@@ -48,7 +48,7 @@ public class CardValueRecord extends Model {
private Double rechargeBalance;
//储值卡赠送金额
private Double giftBalance;
- private Double lockupPrice;
+// private Double lockupPrice;
//积分
private Integer points;
//成长值
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 e00eaedc3..da1068bc7 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
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.order.dto.AllOrderInfoDto;
import com.fuint.business.order.entity.AllOrderInfo;
import com.fuint.business.order.entity.CardBalanceChange;
+import com.fuint.business.order.entity.CashierOrder;
import com.fuint.business.order.service.AllOrderInfoService;
import com.fuint.business.order.vo.AllOrderInfoVo;
import com.fuint.business.order.vo.CardBalanceChangeVo;
@@ -14,6 +15,7 @@ import com.fuint.system.dept.vo.SysDeptVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
@@ -94,6 +96,16 @@ public class AllOrderInfoController extends BaseController {
return getSuccessResult(list);
}
+ /**
+ * 导出订单
+ * @param response
+ */
+ @PostMapping("tradingExportExcel")
+ public void tradingExportExcel(HttpServletResponse response, @RequestBody AllOrderInfoDto allOrderInfo) {
+ this.allOrderInfoService.tradingExportExcel(response, allOrderInfo);
+ }
+
+
@GetMapping("getTradingData")
public ResponseObject getTradingData(AllOrderInfoDto allOrderInfo,
@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
@@ -115,6 +127,15 @@ public class AllOrderInfoController extends BaseController {
return getSuccessResult(list);
}
+ @PostMapping("runningWaterByTissueExportExcel")
+ public void runningWaterByTissueExportExcel(HttpServletResponse response, @RequestBody AllOrderInfoDto allOrderInfo) {
+ this.allOrderInfoService.runningWaterByTissueExportExcel(response, allOrderInfo);
+ }
+ @PostMapping("runningWaterByOilDeptExportExcel")
+ public void runningWaterByOilDeptExportExcel(HttpServletResponse response, @RequestBody AllOrderInfoDto allOrderInfo) {
+ this.allOrderInfoService.runningWaterByOilDeptExportExcel(response, allOrderInfo);
+ }
+
/**
* 机构流水分析
*/
@@ -135,6 +156,20 @@ public class AllOrderInfoController extends BaseController {
IPage list = allOrderInfoService.runningWaterByDay(page, allOrderInfoDto);
return getSuccessResult(list);
}
+
+ @GetMapping("getRunningWaterByDayData")
+ public ResponseObject getRunningWaterByDayData(AllOrderInfoDto allOrderInfoDto,
+ @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+ @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+ Page page =new Page(pageNo,pageSize);
+ AllOrderInfoVo list = allOrderInfoService.getRunningWaterByDayData(allOrderInfoDto);
+ return getSuccessResult(list);
+ }
+
+ @PostMapping("runningWaterByDayExportExcel")
+ public void runningWaterByDayExportExcel(HttpServletResponse response, @RequestBody AllOrderInfoDto allOrderInfo) {
+ this.allOrderInfoService.runningWaterByDayExportExcel(response, allOrderInfo);
+ }
@GetMapping("runningWaterByData")
public ResponseObject runningWaterByData(AllOrderInfoDto allOrderInfoDto,
@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
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 d121684e1..13a1a17a7 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
@@ -32,6 +32,7 @@ public interface AllOrderInfoMapper extends BaseMapper {
AllOrderInfoVo getStoreNDynamic(@Param("allOrderInfo") AllOrderInfoDto allOrderInfo);
IPage getRunningWaterByDay(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfoDto allOrderInfo);
+ AllOrderInfoVo getRunningWaterByDayData( @Param("allOrderInfo") AllOrderInfoDto allOrderInfo);
AllOrderInfoVo getRunningWaterByData(@Param("allOrderInfo") AllOrderInfoDto allOrderInfo);
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 0ddcb3184..1107bd7d7 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
@@ -252,6 +252,22 @@
amount > 0
Order by aoi.pay_time
+
+
退款
@@ -330,6 +330,25 @@
+
+
+ 退款密码
+
+
+
+
+
+
+
+
+
{
})
},
+ // 打印商品支付后的订单
+ reoilOrderReport () {
+ let oilOrderR = []
+ this.oilInfo.forEach(order=>{
+ let o = {
+ oilName : this.getName(this.oilNameList, order.oils) + "-" + this.getName1(this.oilGunList, order.oilGunNum),
+ amount : order.orderAmount.toString(),
+ oilNum : order.oilNum.toString()
+ }
+ oilOrderR.push(o)
+ })
+ console.log("111111111111111111111111111")
+
+ let goodsOrderR = []
+ if (this.goodsInfo) {
+ this.goodsInfo.forEach(order=>{
+ console.log("111111111111111111111111111")
+
+ let o = {
+ oilName : order.name,
+ unit : order.num+""+order.unit,
+ amount : order.memberPrice.toString()
+ }
+ goodsOrderR.push(o)
+ })
+ }
+
+
+ // 支付方式
+ const payTypeMap = {
+ 'CASH': '现金',
+ 'WECHAT': '微信',
+ 'ALIPAY': '支付宝',
+ 'UNIONPAY': '银联二维码',
+ 'credit': '挂账',
+ 'oilCard': '囤油卡',
+ 'balance': '储值卡'
+ };
+ let payTypeText = payTypeMap[this.cashierOrder.payType] || '小程序码';
+
+ let f ={
+ oilOrder:oilOrderR,
+ goodsOrder:goodsOrderR,
+ payType:payTypeText,
+ amount:this.cashierOrder.amount,
+ payAmount:this.cashierOrder.amount,
+ seekZero:this.cashierOrder.payAmount,
+
+ balanceAmount:this.oilInfo[0].balanceAmount,// 储值卡
+ oilCardAmount:this.oilInfo[0].oilCardAmount,// 屯油卡
+ calculateRefundsV:this.calculateRefundsV,
+ type : "2",
+ }
+ rePrintOilOrderReport(f).then(res=>{
+
+ })
+ },
+
+
// 补打
patchwork(data){
const orderNo = data.orderNo
@@ -804,7 +885,29 @@ import {rePrintOilOrderReport} from "@/api/print";
this.oilOrderReport()
}).catch(() => {});
},
- // 退款
+
+ async refHandleRefundByif(id){
+ this.refDialogRefund = true;
+ await ifRefPassApi({refPass:this.refPass}).then(res=>{
+ if (res.data) {
+ this.handleRefund(this.getId)
+ this.refDialogRefund = false;
+ } else {
+ this.$message({
+ type: 'info',
+ message: '密码错误'
+ });
+ }
+ })
+ },
+ async refHandleRefund(id){
+ this.getId = id,
+ this.refPass = ""
+ this.refDialogRefund = true;
+ },
+
+
+ // 退款
async handleRefund(id){
this.dialogRefund = true;
await cashierOrder(id).then( response => {
@@ -906,7 +1009,8 @@ import {rePrintOilOrderReport} from "@/api/print";
message: '退款成功'
});
// this.printLocally()
- this.oilOrderReport()
+ this.reoilOrderReport()
+
}
})
@@ -916,6 +1020,7 @@ import {rePrintOilOrderReport} from "@/api/print";
this.getList();
// this.getOrderStatistics();
this.getStaffList();
+ // this.oilOrderReport()
},
// 获取油枪信息
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
index 4d8c57100..5057f1b7e 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
@@ -186,7 +186,7 @@
type="primary" plain round>补打
退款
@@ -204,7 +204,25 @@
@current-change="getList">
+
+
+
+ 退款密码
+
+
+
+
+
+
+
{});
},
+
+ async refHandleRefundByif(id){
+ this.refDialogRefund = true;
+ await ifRefPassApi({refPass:this.refPass}).then(res=>{
+ if (res.data) {
+ this.handleRefund(this.getId)
+ this.refDialogRefund = false;
+ } else {
+ this.$message({
+ type: 'info',
+ message: '密码错误'
+ });
+ }
+ })
+ },
+ async refHandleRefund(id){
+ this.getId = id,
+ this.refPass = ""
+ this.refDialogRefund = true;
+ },
+
// 退款
async handleRefund(id){
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
index dd3913a7b..d86c6b5c0 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
@@ -536,7 +536,7 @@
'oilCard': '囤油卡',
'balance': '储值卡'
};
- let payTypeText = payTypeMap[this.payType] || '小程序码';
+ let payTypeText = payTypeMap[this.oilOrder.payType] || '小程序码';
let f ={
oilOrder:oilOrderR,