1、新增交易流水
2、修改时间空间差掉值后不能提交的问题
4 files added
5 files modified
| | |
| | | package com.matrix.system.hive.dao; |
| | | |
| | | import com.matrix.system.hive.bean.SysOrderFlow; |
| | | import com.matrix.system.hive.dto.OrderFlowListDto; |
| | | import com.matrix.system.hive.vo.OrderFlowVo; |
| | | import org.apache.ibatis.annotations.Param; |
| | | |
| | | import java.util.List; |
| | |
| | | public List<SysOrderFlow> selectByOrderId(@Param("orderId") Long orderId); |
| | | |
| | | public List<SysOrderFlow> selectPayMethodsAmountByOrderId(@Param("orderId") Long orderId); |
| | | |
| | | List<OrderFlowVo> selectInPage(@Param("record") OrderFlowListDto orderFlowListDto); |
| | | |
| | | Integer selectTotal(@Param("record")OrderFlowListDto orderFlowListDto); |
| | | } |
New file |
| | |
| | | package com.matrix.system.hive.dto; |
| | | |
| | | import com.fasterxml.jackson.annotation.JsonFormat; |
| | | import com.matrix.core.pojo.PaginationDto; |
| | | import com.matrix.core.pojo.PaginationVO; |
| | | import com.matrix.core.tools.DateUtil; |
| | | import io.swagger.annotations.ApiModel; |
| | | import io.swagger.annotations.ApiModelProperty; |
| | | |
| | | import javax.validation.constraints.NotNull; |
| | | import java.util.Date; |
| | | |
| | | /** |
| | | * @author jyy |
| | | * @date 2021-01-27 |
| | | **/ |
| | | @ApiModel(value = "OrderFlowListDto", description = "交易流水查询参数") |
| | | public class OrderFlowListDto extends PaginationDto { |
| | | |
| | | |
| | | @ApiModelProperty(value = "客户姓名/拼音/手机") |
| | | private String queryKey; |
| | | |
| | | @ApiModelProperty(value ="操作人") |
| | | private String oprationMan; |
| | | |
| | | @ApiModelProperty(value ="订单号") |
| | | private String orderNo; |
| | | |
| | | @ApiModelProperty(value ="交易类型") |
| | | private String flowType; |
| | | |
| | | |
| | | @ApiModelProperty(value ="支付方式") |
| | | private String payMethod; |
| | | |
| | | |
| | | @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD, timezone = "GMT+8") |
| | | @ApiModelProperty(value = "查询参数开始时间", example = "2021-01-10") |
| | | private Date startTime; |
| | | |
| | | |
| | | @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD, timezone = "GMT+8") |
| | | @ApiModelProperty(value = "查询参数结束时间", example = "2021-01-10") |
| | | private Date endTime; |
| | | |
| | | @ApiModelProperty(hidden = true) |
| | | private Long shopId; |
| | | |
| | | |
| | | @ApiModelProperty(hidden = true) |
| | | private Long companyId; |
| | | |
| | | |
| | | public String getQueryKey() { |
| | | return queryKey; |
| | | } |
| | | |
| | | public void setQueryKey(String queryKey) { |
| | | this.queryKey = queryKey; |
| | | } |
| | | |
| | | public String getOprationMan() { |
| | | return oprationMan; |
| | | } |
| | | |
| | | public void setOprationMan(String oprationMan) { |
| | | this.oprationMan = oprationMan; |
| | | } |
| | | |
| | | public String getOrderNo() { |
| | | return orderNo; |
| | | } |
| | | |
| | | public void setOrderNo(String orderNo) { |
| | | this.orderNo = orderNo; |
| | | } |
| | | |
| | | public String getFlowType() { |
| | | return flowType; |
| | | } |
| | | |
| | | public void setFlowType(String flowType) { |
| | | this.flowType = flowType; |
| | | } |
| | | |
| | | public String getPayMethod() { |
| | | return payMethod; |
| | | } |
| | | |
| | | public void setPayMethod(String payMethod) { |
| | | this.payMethod = payMethod; |
| | | } |
| | | |
| | | public Date getStartTime() { |
| | | return startTime; |
| | | } |
| | | |
| | | public void setStartTime(Date startTime) { |
| | | this.startTime = startTime; |
| | | } |
| | | |
| | | public Date getEndTime() { |
| | | return endTime; |
| | | } |
| | | |
| | | public void setEndTime(Date endTime) { |
| | | this.endTime = endTime; |
| | | } |
| | | |
| | | public Long getShopId() { |
| | | return shopId; |
| | | } |
| | | |
| | | public void setShopId(Long shopId) { |
| | | this.shopId = shopId; |
| | | } |
| | | |
| | | public Long getCompanyId() { |
| | | return companyId; |
| | | } |
| | | |
| | | public void setCompanyId(Long companyId) { |
| | | this.companyId = companyId; |
| | | } |
| | | } |
New file |
| | |
| | | package com.matrix.system.hive.statistics; |
| | | |
| | | import com.matrix.core.constance.MatrixConstance; |
| | | import com.matrix.core.pojo.AjaxResult; |
| | | import com.matrix.core.pojo.PaginationVO; |
| | | import com.matrix.core.tools.DateUtil; |
| | | import com.matrix.core.tools.WebUtil; |
| | | import com.matrix.core.tools.excl.ExcelSheetPO; |
| | | import com.matrix.core.tools.excl.ExcelVersion; |
| | | import com.matrix.system.app.vo.UserInfoVo; |
| | | import com.matrix.system.common.bean.SysUsers; |
| | | import com.matrix.system.common.constance.AppConstance; |
| | | import com.matrix.system.common.tools.DataAuthUtil; |
| | | import com.matrix.system.common.tools.ResponseHeadUtil; |
| | | import com.matrix.system.hive.action.util.QueryUtil; |
| | | import com.matrix.system.hive.bean.AchieveNew; |
| | | import com.matrix.system.hive.bean.SysOrder; |
| | | import com.matrix.system.hive.bean.SysOrderFlow; |
| | | import com.matrix.system.hive.bean.SysOrderItem; |
| | | import com.matrix.system.hive.dao.SysOrderFlowDao; |
| | | import com.matrix.system.hive.dto.OrderFlowListDto; |
| | | import com.matrix.system.hive.service.AchieveNewService; |
| | | import com.matrix.system.hive.service.SysOrderItemService; |
| | | import com.matrix.system.hive.service.SysOrderService; |
| | | import com.matrix.system.hive.vo.OrderFlowVo; |
| | | import io.swagger.annotations.Api; |
| | | import io.swagger.annotations.ApiOperation; |
| | | import io.swagger.annotations.ApiResponse; |
| | | import io.swagger.annotations.ApiResponses; |
| | | import io.swagger.models.auth.In; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.stereotype.Controller; |
| | | import org.springframework.ui.ModelMap; |
| | | import org.springframework.web.bind.annotation.*; |
| | | |
| | | import javax.annotation.Resource; |
| | | import javax.servlet.http.HttpServletRequest; |
| | | import javax.servlet.http.HttpServletResponse; |
| | | import java.io.IOException; |
| | | import java.io.OutputStream; |
| | | import java.util.ArrayList; |
| | | import java.util.List; |
| | | |
| | | /** |
| | | * 交易流水统计 |
| | | */ |
| | | @CrossOrigin(origins = "*") |
| | | @Api(value = "OrderFlowAction", tags = "交易流水") |
| | | @RestController |
| | | @RequestMapping(value = "/admin/orderFlow") |
| | | public class OrderFlowAction { |
| | | |
| | | |
| | | @Resource |
| | | private SysOrderFlowDao orderFlowDao; |
| | | |
| | | |
| | | /** |
| | | * 交易流水查询 |
| | | */ |
| | | |
| | | @ApiOperation(value = "查询交易流水") |
| | | @ApiResponses({ |
| | | @ApiResponse(code = 200, message = "OK", response = OrderFlowListDto.class) |
| | | }) |
| | | @PostMapping(value = "/findSumDailyInfoNew") |
| | | public @ResponseBody |
| | | AjaxResult findSumDailyInfoNew(@RequestBody OrderFlowListDto orderFlowListDto) { |
| | | if (!DataAuthUtil.hasAllShopAuth()) { |
| | | QueryUtil.setQueryLimit(orderFlowListDto); |
| | | } else { |
| | | QueryUtil.setQueryLimitCom(orderFlowListDto); |
| | | } |
| | | List<OrderFlowVo> rows = orderFlowDao.selectInPage(orderFlowListDto); |
| | | Integer total = orderFlowDao.selectTotal(orderFlowListDto); |
| | | AjaxResult result = AjaxResult.buildSuccessInstance(rows, total); |
| | | return result; |
| | | } |
| | | |
| | | |
| | | } |
| | | |
New file |
| | |
| | | package com.matrix.system.hive.vo; |
| | | |
| | | import com.fasterxml.jackson.annotation.JsonFormat; |
| | | import com.matrix.core.tools.DateUtil; |
| | | import com.matrix.system.app.vo.OrderDetailItemVo; |
| | | import io.swagger.annotations.ApiModel; |
| | | import io.swagger.annotations.ApiModelProperty; |
| | | |
| | | import java.math.BigDecimal; |
| | | import java.util.Date; |
| | | import java.util.List; |
| | | |
| | | /** |
| | | * @author jyy |
| | | * @date 2021-01-27 |
| | | **/ |
| | | @ApiModel(value = "OrderFlowVo", description = "订单流水返回参数类") |
| | | public class OrderFlowVo { |
| | | |
| | | @ApiModelProperty(value = "流水id") |
| | | private Long id; |
| | | |
| | | @ApiModelProperty(value = "订单ID") |
| | | private String orderId; |
| | | |
| | | @ApiModelProperty(value = "订单号") |
| | | private String orderNo; |
| | | |
| | | @ApiModelProperty(value ="交易类型") |
| | | private String flowType; |
| | | |
| | | @ApiModelProperty(value ="支付方式") |
| | | private String payMethod; |
| | | |
| | | @ApiModelProperty(value = "会员姓名") |
| | | private String vipName; |
| | | |
| | | @ApiModelProperty(value = "交易内容") |
| | | private String flowContent; |
| | | |
| | | @ApiModelProperty(value = "交易金额") |
| | | private BigDecimal amount; |
| | | |
| | | @ApiModelProperty(value = "操作人姓名") |
| | | private String staffName; |
| | | |
| | | @ApiModelProperty(value = "支付流水号") |
| | | private String flowNo; |
| | | |
| | | @ApiModelProperty(value = "门店名称") |
| | | private String shopName; |
| | | |
| | | @JsonFormat(pattern = DateUtil.DATE_FORMAT_SS, timezone = "GMT+8") |
| | | @ApiModelProperty(value = "创建时间") |
| | | private Date createTime; |
| | | |
| | | public Long getId() { |
| | | return id; |
| | | } |
| | | |
| | | public void setId(Long id) { |
| | | this.id = id; |
| | | } |
| | | |
| | | public String getOrderId() { |
| | | return orderId; |
| | | } |
| | | |
| | | public void setOrderId(String orderId) { |
| | | this.orderId = orderId; |
| | | } |
| | | |
| | | public String getOrderNo() { |
| | | return orderNo; |
| | | } |
| | | |
| | | public void setOrderNo(String orderNo) { |
| | | this.orderNo = orderNo; |
| | | } |
| | | |
| | | public String getFlowType() { |
| | | return flowType; |
| | | } |
| | | |
| | | public void setFlowType(String flowType) { |
| | | this.flowType = flowType; |
| | | } |
| | | |
| | | public String getPayMethod() { |
| | | return payMethod; |
| | | } |
| | | |
| | | public void setPayMethod(String payMethod) { |
| | | this.payMethod = payMethod; |
| | | } |
| | | |
| | | public String getVipName() { |
| | | return vipName; |
| | | } |
| | | |
| | | public void setVipName(String vipName) { |
| | | this.vipName = vipName; |
| | | } |
| | | |
| | | public String getFlowContent() { |
| | | return flowContent; |
| | | } |
| | | |
| | | public void setFlowContent(String flowContent) { |
| | | this.flowContent = flowContent; |
| | | } |
| | | |
| | | public BigDecimal getAmount() { |
| | | return amount; |
| | | } |
| | | |
| | | public void setAmount(BigDecimal amount) { |
| | | this.amount = amount; |
| | | } |
| | | |
| | | public String getStaffName() { |
| | | return staffName; |
| | | } |
| | | |
| | | public void setStaffName(String staffName) { |
| | | this.staffName = staffName; |
| | | } |
| | | |
| | | public String getFlowNo() { |
| | | return flowNo; |
| | | } |
| | | |
| | | public void setFlowNo(String flowNo) { |
| | | this.flowNo = flowNo; |
| | | } |
| | | |
| | | public String getShopName() { |
| | | return shopName; |
| | | } |
| | | |
| | | public void setShopName(String shopName) { |
| | | this.shopName = shopName; |
| | | } |
| | | |
| | | public Date getCreateTime() { |
| | | return createTime; |
| | | } |
| | | |
| | | public void setCreateTime(Date createTime) { |
| | | this.createTime = createTime; |
| | | } |
| | | } |
| | |
| | | where order_id=#{orderId} |
| | | group by pay_method |
| | | </select> |
| | | |
| | | <select id="selectInPage" resultType="com.matrix.system.hive.vo.OrderFlowVo"> |
| | | SELECT |
| | | a.id, |
| | | b.id as orderId, |
| | | a.create_time as createTime, |
| | | b.ORDER_NO as orderNo, |
| | | a.flow_content as flowContent, |
| | | a.flow_type as flowType, |
| | | a.amount as amount, |
| | | c.VIP_NAME as vipName, |
| | | a.pay_method as payMethod, |
| | | a.flow_no as flowNo, |
| | | d.shop_short_name as shopName, |
| | | e.su_name as staffName |
| | | from sys_order_flow a |
| | | LEFT JOIN sys_order b on a.order_id=b.ID |
| | | LEFT JOIN sys_vip_info c on a.vip_id=c.ID |
| | | LEFT JOIN sys_shop_info d on a.shop_id=d.ID |
| | | LEFT JOIN sys_users e on e.su_id=b.STAFF_ID |
| | | <where> |
| | | |
| | | and a.company_id=#{record.companyId} |
| | | |
| | | <if test="record.queryKey != null and record.queryKey != ''"> |
| | | and (instr(c.vip_name, #{record.queryKey}) or instr(c.phone, #{record.queryKey}) ) |
| | | </if> |
| | | <if test="record.oprationMan != null and record.oprationMan != ''"> |
| | | and instr(e.su_name, #{record.oprationMan}) |
| | | </if> |
| | | <if test="record.orderNo != null and record.orderNo != ''"> |
| | | and instr(b.ORDER_NO, #{record.orderNo}) |
| | | </if> |
| | | <if test="record.payMethod != null and record.payMethod != ''"> |
| | | and a.pay_method=#{record.payMethod} |
| | | </if> |
| | | |
| | | <if test="record.flowType != null and record.flowType != ''"> |
| | | and a.flow_type=#{record.flowType} |
| | | </if> |
| | | |
| | | <if test="record.startTime != null "> |
| | | and a.create_time >= #{record.startTime} |
| | | </if> |
| | | <if test="record.endTime != null "> |
| | | <![CDATA[and a.create_time <= #{record.endTime}]]> |
| | | </if> |
| | | <if test="record.shopId != null and record.shopId != ''"> |
| | | and a.shop_id=#{record.shopId} |
| | | </if> |
| | | |
| | | </where> |
| | | <if test="record.offset >=0 and record.limit >0"> |
| | | limit |
| | | #{record.offset},#{record.limit} |
| | | </if> |
| | | |
| | | |
| | | </select> |
| | | |
| | | <select id="selectTotal" resultType="java.lang.Integer"> |
| | | SELECT count(*) |
| | | from sys_order_flow a |
| | | LEFT JOIN sys_order b on a.order_id=b.ID |
| | | LEFT JOIN sys_vip_info c on a.vip_id=c.ID |
| | | LEFT JOIN sys_shop_info d on a.shop_id=d.ID |
| | | LEFT JOIN sys_users e on e.su_id=b.STAFF_ID |
| | | <where> |
| | | |
| | | and a.company_id=#{record.companyId} |
| | | |
| | | <if test="record.queryKey != null and record.queryKey != ''"> |
| | | and (instr(c.vip_name, #{record.queryKey}) or instr(c.phone, #{record.queryKey}) ) |
| | | </if> |
| | | <if test="record.oprationMan != null and record.oprationMan != ''"> |
| | | and instr(e.su_name, #{record.oprationMan}) |
| | | </if> |
| | | <if test="record.orderNo != null and record.orderNo != ''"> |
| | | and instr(b.ORDER_NO, #{record.orderNo}) |
| | | </if> |
| | | <if test="record.payMethod != null and record.payMethod != ''"> |
| | | and a.pay_method=#{record.payMethod} |
| | | </if> |
| | | |
| | | <if test="record.flowType != null and record.flowType != ''"> |
| | | and a.flow_type=#{record.flowType} |
| | | </if> |
| | | |
| | | <if test="record.startTime != null "> |
| | | and a.create_time >= #{record.startTime} |
| | | </if> |
| | | <if test="record.endTime != null "> |
| | | <![CDATA[and a.create_time <= #{record.endTime}]]> |
| | | </if> |
| | | <if test="record.shopId != null and record.shopId != ''"> |
| | | and a.shop_id=#{record.shopId} |
| | | </if> |
| | | |
| | | </where> |
| | | </select> |
| | | |
| | | </mapper> |
| | |
| | | body, body.full-height-layout #page-wrapper, body.full-height-layout #wrapper, |
| | | html { |
| | | height: 100%; |
| | | overflow: hidden; |
| | | } |
| | | |
| | | #page-wrapper { |
| | |
| | | } |
| | | |
| | | /*===========鑷畾涔夋牱寮廵nd==============================*/ |
| | | /** |
| | | * 覆盖elementui一些无用样式 |
| | | */ |
| | | .el-form-item{ |
| | | margin-bottom:10px !important; |
| | | } |
| | |
| | | <el-row type="flex" align="middle" style="padding: 0 0 10px 0;"> |
| | | <el-col :span="5" style="text-align: center;">充值金额</el-col> |
| | | <el-col :span="10" style="text-align: center; line-height: 50px;"> |
| | | <el-input v-model="rechargeMoney" placeholder="0.1元起充"></el-input> |
| | | <el-input v-model="rechargeMoney" @change="changeRechargeMoney" placeholder="0.1元起充"></el-input> |
| | | </el-col> |
| | | </el-row> |
| | | |
| | |
| | | }); |
| | | }, |
| | | methods : { |
| | | //修改充值金额同步修改业绩 |
| | | changeRechargeMoney(){ |
| | | let aMoeny=(this.rechargeMoney/this.achieveList.length).toFixed(2); |
| | | this.achieveList.forEach(item=>{ |
| | | item.achieveMoney=aMoeny; |
| | | }); |
| | | }, |
| | | submitRecharge() { |
| | | let _this = this; |
| | | |
| | |
| | | params.state = serviceOrderTab.state; |
| | | params.vipId = _this.vipInfo.id; |
| | | if (serviceOrderTab.selectTime) { |
| | | params.beginTime = moment(serviceOrderTab.selectTime[0]).format("YYYY-MM-DD HH:mm"); |
| | | params.closureTime = moment(serviceOrderTab.selectTime[1]).format("YYYY-MM-DD HH:mm"); |
| | | params.beginTime = serviceOrderTab.selectTime?moment(serviceOrderTab.selectTime[0]).format("YYYY-MM-DD HH:mm"):''; |
| | | params.closureTime = serviceOrderTab.selectTime?moment(serviceOrderTab.selectTime[1]).format("YYYY-MM-DD HH:mm"):''; |
| | | } |
| | | $.AjaxProxy({ |
| | | p:params |
| | |
| | | params.statu = orderTab.state; |
| | | params.vipId = _this.vipInfo.id; |
| | | if (orderTab.selectTime) { |
| | | params.beginTimeVo = moment(orderTab.selectTime[0]).format("YYYY-MM-DD HH:mm"); |
| | | params.endTimeVo = moment(orderTab.selectTime[1]).format("YYYY-MM-DD HH:mm"); |
| | | params.beginTimeVo = orderTab.selectTime?moment(orderTab.selectTime[0]).format("YYYY-MM-DD HH:mm"):''; |
| | | params.endTimeVo = orderTab.selectTime?moment(orderTab.selectTime[1]).format("YYYY-MM-DD HH:mm"):''; |
| | | } |
| | | $.AjaxProxy({ |
| | | p:params |
| | |
| | | params.offset = (page.currentPage - 1) * page.pageSize; |
| | | params.userId = _this.vipInfo.id; |
| | | if (skinTab.selectTime) { |
| | | params.beginTime = moment(skinTab.selectTime[0]).format("YYYY-MM-DD"); |
| | | params.endTime = moment(skinTab.selectTime[1]).format("YYYY-MM-DD"); |
| | | params.beginTime = skinTab.selectTime?moment(skinTab.selectTime[0]).format("YYYY-MM-DD"):''; |
| | | params.endTime = skinTab.selectTime?moment(skinTab.selectTime[1]).format("YYYY-MM-DD"):''; |
| | | } |
| | | $.AjaxProxy({ |
| | | p:params |
New file |
| | |
| | | <!DOCTYPE HTML> |
| | | <html xmlns:th="http://www.thymeleaf.org" xmlns:matrix="http://www.w3.org/1999/xhtml"> |
| | | <head> |
| | | <meta charset="utf-8"> |
| | | <META HTTP-EQUIV="Pragma" CONTENT="no-cache"> |
| | | <meta name="renderer" content="webkit|ie-comp|ie-stand"> |
| | | <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> |
| | | <meta name="viewport" |
| | | content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/> |
| | | <meta http-equiv="Cache-Control" content="no-siteapp"/> |
| | | <LINK rel="Bookmark" href="../images/favicon.ico"> |
| | | <!-- 本框架基本脚本和样式 --> |
| | | <script type="text/javascript" th:src="@{/js/systools/MBaseVue.js}"></script> |
| | | <link rel="stylesheet" th:href="@{/plugin/element-ui/index.css}"> |
| | | <link th:href="@{/css/styleOne/style.min.css}" rel="stylesheet" type="text/css"/> |
| | | <title></title> |
| | | <style> |
| | | .panel-body{ |
| | | overflow: hidden; |
| | | } |
| | | .buttonPanel{ |
| | | background: #ffffff; |
| | | padding: 10px 10px ; |
| | | margin: 0px 0px 10px 0px; |
| | | } |
| | | .rowPanel{ |
| | | background: #ffffff; |
| | | padding: 0px 10px ; |
| | | padding-top: 10px; |
| | | margin: 0px 0px 10px 0px; |
| | | } |
| | | .paginationStyle{ |
| | | background: #ffffff; |
| | | padding: 10px 10px; |
| | | margin: 0px 0px 10px 0px; |
| | | text-align: right; |
| | | } |
| | | </style> |
| | | </head> |
| | | <body> |
| | | <div class="panel-body" id="app"> |
| | | |
| | | <el-row class="buttonPanel"> |
| | | <el-button type="primary" >导出</el-button> |
| | | </el-row> |
| | | |
| | | <el-row class="rowPanel" > |
| | | <el-form ref="form" :model="form" inline > |
| | | <el-form-item label="会员" prop="queryKey"> |
| | | <el-input v-model="form.queryKey" placeholder="请输入会员姓名/手机"></el-input> |
| | | </el-form-item> |
| | | |
| | | <el-form-item label="操作人" prop="oprationMan" > |
| | | <el-input v-model="form.oprationMan"></el-input> |
| | | </el-form-item> |
| | | |
| | | <el-form-item label="订单号" prop="orderNo"> |
| | | <el-input v-model="form.orderNo"></el-input> |
| | | </el-form-item> |
| | | |
| | | <el-form-item label="交易类型" prop="flowType"> |
| | | <el-select v-model="form.flowType" placeholder="请选择"> |
| | | <el-option |
| | | v-for="item in flowTypeList" |
| | | :key="item.value" |
| | | :label="item.label" |
| | | :value="item.value" |
| | | > |
| | | </el-option> |
| | | </el-select> |
| | | </el-form-item> |
| | | |
| | | <el-form-item label="支付方式" prop="payMethod"> |
| | | <el-select v-model="form.payMethod" placeholder="请选择"> |
| | | <el-option |
| | | v-for="item in payMethodList" |
| | | :key="item.value" |
| | | :label="item.label" |
| | | :value="item.value"> |
| | | </el-option> |
| | | </el-select> |
| | | </el-form-item> |
| | | |
| | | <el-form-item label="时间" prop="datetimeArr"> |
| | | <el-date-picker |
| | | v-model="form.datetimeArr" |
| | | type="daterange" |
| | | range-separator="至" format="yyyy-MM-dd HH:mm" |
| | | start-placeholder="开始日期" |
| | | end-placeholder="结束日期"> |
| | | </el-date-picker> |
| | | </el-form-item> |
| | | |
| | | <el-button type="primary" @click="search" >搜索</el-button> |
| | | <el-button @click="resetForm('form')">重置</el-button> |
| | | </el-form> |
| | | </el-row> |
| | | |
| | | <el-row class="table-style" > |
| | | |
| | | <el-table id="proj" :data="table.rows" :height="height" stripe> |
| | | <el-table-column |
| | | prop="orderNo" |
| | | label="订单号" |
| | | width="180"> |
| | | </el-table-column> |
| | | <el-table-column |
| | | prop="flowContent" |
| | | label="交易内容" |
| | | show-overflow-tooltip |
| | | width="240"> |
| | | </el-table-column> |
| | | <el-table-column |
| | | prop="createTime" |
| | | label="交易时间" |
| | | show-overflow-tooltip |
| | | width="180"> |
| | | </el-table-column> |
| | | <el-table-column |
| | | prop="flowType" |
| | | label="交易类型"> |
| | | </el-table-column> |
| | | <el-table-column |
| | | prop="amount" |
| | | label="交易金额"> |
| | | </el-table-column> |
| | | <el-table-column |
| | | prop="vipName" |
| | | label="会员姓名"> |
| | | </el-table-column> |
| | | <el-table-column |
| | | prop="payMethod" |
| | | label="支付方式"> |
| | | </el-table-column> |
| | | <el-table-column |
| | | prop="flowNo" |
| | | label="支付流水号"> |
| | | </el-table-column> |
| | | <el-table-column |
| | | prop="staffName" |
| | | label="操作人"> |
| | | </el-table-column> |
| | | <el-table-column |
| | | prop="shopName" |
| | | label="门店名称"> |
| | | </el-table-column> |
| | | <el-table-column label="操作"> |
| | | <template slot-scope="scope"> |
| | | <el-button type="text" size="small">有效</el-button> |
| | | </template> |
| | | </el-table-column> |
| | | </el-table> |
| | | </el-row> |
| | | <el-row class="paginationStyle" > |
| | | <el-pagination background |
| | | @size-change="changePageSize" |
| | | @current-change="changeCurrentPage" |
| | | :current-page="table.currentPage" |
| | | :page-sizes="[10, 20, 30, 50]" |
| | | :page-size="table.pageSize" |
| | | layout="total, sizes, prev, pager, next, jumper" |
| | | :total="table.total"> |
| | | </el-pagination> |
| | | </el-row> |
| | | |
| | | </div> |
| | | </body> |
| | | <script type="text/javascript" th:src="@{/js/plugin/jquery-2.1.4.min.js}"></script> |
| | | <script type="text/javascript" th:src="@{/js/plugin/jquery.query.js}"></script> |
| | | <script type="text/javascript" th:src="@{/plugin/layer/layer.js}"></script> |
| | | <script type="text/javascript" th:src="@{/js/systools/AjaxProxyVue.js}"></script> |
| | | <script type="text/javascript" th:src="@{/js/plugin/vue.js}"></script> |
| | | <script type="text/javascript" th:src="@{/plugin/element-ui/index.js}"></script> |
| | | <script type="text/javascript" th:src="@{/plugin/moment.min.js}"></script> |
| | | <script type="text/javascript" th:inline="javascript"> |
| | | |
| | | var vue = new Vue({ |
| | | el: '#app', |
| | | data: { |
| | | table:{ |
| | | rows:[], |
| | | total:0, |
| | | pageSize:10, |
| | | currentPage:1, |
| | | }, |
| | | form:{ |
| | | name:null, |
| | | datetimeArr:'', |
| | | payMethod:'', |
| | | flowType:'', |
| | | orderNo:'', |
| | | oprationMan:'', |
| | | queryKey:'', |
| | | }, |
| | | height:'calc(100vh - 240px)', |
| | | flowTypeList:[ |
| | | {value:'',label:'全部'}, |
| | | {value:'购买',label:'购买'}, |
| | | {value:'退款',label:'退款'}, |
| | | {value:'还款',label:'还款'} |
| | | ], |
| | | payMethodList:[ |
| | | {value:'',label:'全部'}, |
| | | {value:'现金',label:'现金'}, |
| | | {value:'微信',label:'微信'}, |
| | | {value:'支付宝',label:'支付宝'}, |
| | | {value:'银行卡',label:'银行卡'}, |
| | | {value:'团购',label:'团购'}, |
| | | {value:'储值卡',label:'储值卡'}, |
| | | {value:'欠款',label:'欠款'} |
| | | ], |
| | | }, |
| | | created: function () { |
| | | this.loadData(); |
| | | window.addEventListener("keydown", this.keydown); |
| | | }, |
| | | methods: { |
| | | changePageSize(val) { |
| | | this.table.pageSize = val; |
| | | this.loadData(); |
| | | }, |
| | | changeCurrentPage(val) { |
| | | this.table.currentPage = val; |
| | | this.loadData(); |
| | | }, |
| | | resetForm(formName) { |
| | | this.$refs[formName].resetFields(); |
| | | }, |
| | | loadData:function(){ |
| | | let _this = this; |
| | | //获取用户列表 |
| | | AjaxProxy.requst({ |
| | | app: _this, |
| | | data:{ |
| | | limit:_this.table.pageSize, |
| | | offset:_this.table.pageSize*(_this.table.currentPage-1), |
| | | name:_this.form.name, |
| | | payMethod:_this.form.payMethod, |
| | | flowType:_this.form.flowType, |
| | | orderNo:_this.form.orderNo, |
| | | oprationMan:_this.form.oprationMan, |
| | | queryKey:_this.form.queryKey, |
| | | startTime:_this.form.datetimeArr?moment(_this.form.datetimeArr[0]).format("YYYY-MM-DD HH:mm"):'', |
| | | endTime:_this.form.datetimeArr?moment(_this.form.datetimeArr[1]).format("YYYY-MM-DD HH:mm"):'', |
| | | }, |
| | | url: basePath + '/admin/orderFlow/findSumDailyInfoNew', |
| | | callback: function (data) { |
| | | _this.table.rows = data.rows; |
| | | _this.table.total=data.total; |
| | | } |
| | | }); |
| | | }, |
| | | search:function(){ |
| | | this.table.currentPage=1; |
| | | this.loadData(); |
| | | }, |
| | | keydown(evt){ |
| | | if(evt.keyCode==13) { |
| | | this.search(); |
| | | } |
| | | } |
| | | |
| | | |
| | | } |
| | | }); |
| | | |
| | | |
| | | </script> |
| | | </body> |
| | | </html> |