| @@ -7,6 +7,7 @@ import com.iformall.common.Result; | |||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| import com.iformall.domain.po.base.BaseEntity; | import com.iformall.domain.po.base.BaseEntity; | ||||
| import com.iformall.domain.vo.WxCouponOrderBVo; | |||||
| import com.iformall.domain.po.WxActivity; | import com.iformall.domain.po.WxActivity; | ||||
| import com.iformall.domain.po.WxCarPayOrder; | import com.iformall.domain.po.WxCarPayOrder; | ||||
| import com.iformall.enums.EnumActivityStatus; | import com.iformall.enums.EnumActivityStatus; | ||||
| @@ -18,6 +19,10 @@ import io.swagger.annotations.Api; | |||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| import io.swagger.annotations.ApiImplicitParams; | import io.swagger.annotations.ApiImplicitParams; | ||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| import javax.servlet.http.HttpServletRequest; | |||||
| import javax.servlet.http.HttpServletResponse; | |||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| @@ -45,6 +50,14 @@ public class WxCarPayOrderController extends BaseController { | |||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @GetMapping("export") | |||||
| public void export(@ModelAttribute WxCarPayOrder wxCarPayOrder, HttpServletRequest request, HttpServletResponse response) { | |||||
| if (null == wxCarPayOrder) wxCarPayOrder = new WxCarPayOrder(); | |||||
| wxCarPayOrder.updateTenantInfo(getTenantInfo()); | |||||
| wxCarPayOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC); | |||||
| wxParkPayService.exportData(wxCarPayOrder, request, response); | |||||
| } | |||||
| @ApiOperation("总和") | @ApiOperation("总和") | ||||
| @GetMapping("sum") | @GetMapping("sum") | ||||
| public ResultData sum(@ModelAttribute WxCarPayOrder wxCarPayOrder) { | public ResultData sum(@ModelAttribute WxCarPayOrder wxCarPayOrder) { | ||||
| @@ -53,5 +66,13 @@ public class WxCarPayOrderController extends BaseController { | |||||
| Integer total = wxParkPayService.sumCarPayOrder(wxCarPayOrder); | Integer total = wxParkPayService.sumCarPayOrder(wxCarPayOrder); | ||||
| return new ResultData(total); | return new ResultData(total); | ||||
| } | } | ||||
| @ApiOperation("总和") | |||||
| @GetMapping("detail") | |||||
| public ResultData detail(@ModelAttribute WxCarPayOrder wxCarPayOrder) { | |||||
| if (null == wxCarPayOrder) wxCarPayOrder = new WxCarPayOrder(); | |||||
| wxCarPayOrder.updateTenantInfo(getTenantInfo()); | |||||
| return new ResultData(wxParkPayService.detailWxCarPayOrder(wxCarPayOrder.getId(),wxCarPayOrder.getTenantId())); | |||||
| } | |||||
| } | } | ||||
| @@ -3,6 +3,8 @@ package com.iformall.domain.po; | |||||
| import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import cn.afterturn.easypoi.excel.annotation.Excel; | |||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import lombok.ToString; | import lombok.ToString; | ||||
| @@ -16,36 +18,61 @@ public class WxCarPayOrder extends TenantEntity { | |||||
| private static final long serialVersionUID = -5094915301794376964L; | private static final long serialVersionUID = -5094915301794376964L; | ||||
| @Excel(name = "ID", width = 20, orderNum = "1", prefix = "`") | |||||
| protected Long id; | protected Long id; | ||||
| @Excel(name = "创建时间", width = 20,exportFormat = "yyyy-MM-dd HH:mm:ss", orderNum = "2") | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") | ||||
| private Date createTime; | private Date createTime; | ||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") | ||||
| private Date updateTime; | private Date updateTime; | ||||
| @Excel(name = "用户ID", width = 20, orderNum = "3") | |||||
| @io.swagger.annotations.ApiModelProperty(value="用户ID",name="cUserId") | @io.swagger.annotations.ApiModelProperty(value="用户ID",name="cUserId") | ||||
| private Long cUserId; | private Long cUserId; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private List<Long> userIds; | private List<Long> userIds; | ||||
| @Excel(name = "用户手机号", width = 20, orderNum = "4") | |||||
| @io.swagger.annotations.ApiModelProperty(value="用户手机号",name="cUserPhone") | @io.swagger.annotations.ApiModelProperty(value="用户手机号",name="cUserPhone") | ||||
| private String cUserPhone; | private String cUserPhone; | ||||
| public Long getcUserId() { | |||||
| return cUserId; | |||||
| } | |||||
| public void setcUserId(Long cUserId) { | |||||
| this.cUserId = cUserId; | |||||
| } | |||||
| public String getcUserPhone() { | |||||
| return cUserPhone; | |||||
| } | |||||
| public void setcUserPhone(String cUserPhone) { | |||||
| this.cUserPhone = cUserPhone; | |||||
| } | |||||
| @Excel(name = "车牌号", width = 20, orderNum = "5") | |||||
| @io.swagger.annotations.ApiModelProperty(value="车牌号",name="carNumber") | @io.swagger.annotations.ApiModelProperty(value="车牌号",name="carNumber") | ||||
| private String carNumber; | private String carNumber; | ||||
| @Excel(name = "支付金额(分)", width = 20, orderNum = "6") | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付金额(分)",name="payAmount") | @io.swagger.annotations.ApiModelProperty(value="支付金额(分)",name="payAmount") | ||||
| private Integer payAmount; | private Integer payAmount; | ||||
| @Excel(name = "支付时间", width = 20, exportFormat = "yyyy-MM-dd HH:mm:ss",orderNum = "7") | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付时间",name="payTime") | @io.swagger.annotations.ApiModelProperty(value="支付时间",name="payTime") | ||||
| private Date payTime; | private Date payTime; | ||||
| @Excel(name = "微信生成的订单号", width = 20, orderNum = "8") | |||||
| @io.swagger.annotations.ApiModelProperty(value="微信生成的订单号",name="transactionId") | @io.swagger.annotations.ApiModelProperty(value="微信生成的订单号",name="transactionId") | ||||
| private String transactionId; | private String transactionId; | ||||
| @Excel(name = "车场订单号", width = 20, orderNum = "9") | |||||
| @io.swagger.annotations.ApiModelProperty(value="车场订单号",name="parkOrderNo") | @io.swagger.annotations.ApiModelProperty(value="车场订单号",name="parkOrderNo") | ||||
| private String parkOrderNo; | private String parkOrderNo; | ||||
| @Excel(name = "商户收款账户", width = 20, orderNum = "10") | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户收款账户",name="merchantAccount") | @io.swagger.annotations.ApiModelProperty(value="商户收款账户",name="merchantAccount") | ||||
| private String merchantAccount; | private String merchantAccount; | ||||
| @Excel(name = "商户编号", width = 20, orderNum = "11") | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户编号",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="商户编号",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| @Excel(name = "商户名称", width = 20, orderNum = "12") | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户名称",name="merchantName") | @io.swagger.annotations.ApiModelProperty(value="商户名称",name="merchantName") | ||||
| private String merchantName; | private String merchantName; | ||||
| @Excel(name = "是否已通知车场", width = 20, replace = {"已通知成功_1"}, orderNum = "13") | |||||
| @io.swagger.annotations.ApiModelProperty(value="是否已通知车场EnumYesOrNo",name="parkNotify") | @io.swagger.annotations.ApiModelProperty(value="是否已通知车场EnumYesOrNo",name="parkNotify") | ||||
| private Integer parkNotify; | private Integer parkNotify; | ||||
| @Excel(name = "通知失败原因", width = 20, orderNum = "14") | |||||
| @io.swagger.annotations.ApiModelProperty(value="通知失败原因",name="notifyFailReason") | @io.swagger.annotations.ApiModelProperty(value="通知失败原因",name="notifyFailReason") | ||||
| private String notifyFailReason; | private String notifyFailReason; | ||||
| @io.swagger.annotations.ApiModelProperty(value="通知重试次数",name="notifyCount") | @io.swagger.annotations.ApiModelProperty(value="通知重试次数",name="notifyCount") | ||||
| @@ -3,10 +3,14 @@ package com.iformall.service.park.pay; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.Map; | import java.util.Map; | ||||
| import javax.servlet.http.HttpServletRequest; | |||||
| import javax.servlet.http.HttpServletResponse; | |||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.domain.po.WxCarPayOrder; | import com.iformall.domain.po.WxCarPayOrder; | ||||
| import com.iformall.domain.po.WxPark; | import com.iformall.domain.po.WxPark; | ||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import com.iformall.domain.vo.WxCouponOrderBVo; | |||||
| import com.iformall.enums.EnumCarVendor; | import com.iformall.enums.EnumCarVendor; | ||||
| import com.iformall.service.pay.service.pay.entity.PayAdapterResult; | import com.iformall.service.pay.service.pay.entity.PayAdapterResult; | ||||
| @@ -14,6 +18,8 @@ public interface WxParkPayService { | |||||
| public PageInfo<WxCarPayOrder> listPayOrderAsPage(WxCarPayOrder record, Integer pageIndex, Integer pageSize); | public PageInfo<WxCarPayOrder> listPayOrderAsPage(WxCarPayOrder record, Integer pageIndex, Integer pageSize); | ||||
| public void exportData(WxCarPayOrder record, HttpServletRequest request, HttpServletResponse response); | |||||
| //share:是否分账,服务商模式下生效 | //share:是否分账,服务商模式下生效 | ||||
| public PayAdapterResult createWxPayOrder(TenantEntity tenantEntity,boolean isIsvModel,boolean share,String openId,String appId,String mchId,String productName,String attach,String payOrderNo, | public PayAdapterResult createWxPayOrder(TenantEntity tenantEntity,boolean isIsvModel,boolean share,String openId,String appId,String mchId,String productName,String attach,String payOrderNo, | ||||
| Integer fee,String ip,String notifyUrl,String apiKey,Date currentDate) throws Exception; | Integer fee,String ip,String notifyUrl,String apiKey,Date currentDate) throws Exception; | ||||
| @@ -16,6 +16,7 @@ import com.iformall.domain.po.WxPayAccount; | |||||
| import com.iformall.domain.po.WxPayOrder; | import com.iformall.domain.po.WxPayOrder; | ||||
| import com.iformall.domain.po.WxRefundOrder; | import com.iformall.domain.po.WxRefundOrder; | ||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import com.iformall.domain.vo.WxCouponOrderBVo; | |||||
| import com.iformall.enums.EnumCarVendor; | import com.iformall.enums.EnumCarVendor; | ||||
| import com.iformall.enums.EnumPayVersion; | import com.iformall.enums.EnumPayVersion; | ||||
| import com.iformall.enums.EnumPayWay; | import com.iformall.enums.EnumPayWay; | ||||
| @@ -46,6 +47,9 @@ import java.util.Map; | |||||
| import java.util.SortedMap; | import java.util.SortedMap; | ||||
| import java.util.TreeMap; | import java.util.TreeMap; | ||||
| import javax.servlet.http.HttpServletRequest; | |||||
| import javax.servlet.http.HttpServletResponse; | |||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| @@ -96,6 +100,13 @@ public class WxParkPayServiceImpl implements WxParkPayService { | |||||
| public PageInfo<WxCarPayOrder> listPayOrderAsPage(WxCarPayOrder record, Integer pageIndex, Integer pageSize) { | public PageInfo<WxCarPayOrder> listPayOrderAsPage(WxCarPayOrder record, Integer pageIndex, Integer pageSize) { | ||||
| return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCarPayOrderMapper.findList(record)); | return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCarPayOrderMapper.findList(record)); | ||||
| } | } | ||||
| @Override | |||||
| public void exportData(WxCarPayOrder record, HttpServletRequest request, HttpServletResponse response) { | |||||
| String filename = "停车支付订单"; | |||||
| List<WxCarPayOrder> list = wxCarPayOrderMapper.findList(record); | |||||
| excelService.exportCsv(list, null, filename, WxCarPayOrder.class, filename + ".csv", response, false); | |||||
| } | |||||
| @Override | @Override | ||||
| public PayAdapterResult createWxPayOrder(TenantEntity tenantEntity,boolean isIsvModel,boolean share,String openId,String appId,String mchId,String productName,String attach,String payOrderNo, | public PayAdapterResult createWxPayOrder(TenantEntity tenantEntity,boolean isIsvModel,boolean share,String openId,String appId,String mchId,String productName,String attach,String payOrderNo, | ||||