| @@ -103,71 +103,39 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { | |||||
| Row rowtwo = sheetTwo.createRow(0); | Row rowtwo = sheetTwo.createRow(0); | ||||
| Cell idCellTwo = rowtwo.createCell(0); | Cell idCellTwo = rowtwo.createCell(0); | ||||
| Cell merchantNameCellTwo = rowtwo.createCell(1); | Cell merchantNameCellTwo = rowtwo.createCell(1); | ||||
| Cell cardNameCellTwo = rowtwo.createCell(2); | |||||
| Cell orderIdCellTwo = rowtwo.createCell(3); | |||||
| Cell orderTypeCellTwo = rowtwo.createCell(4); | |||||
| Cell orderPaymentCellTwo = rowtwo.createCell(5); | |||||
| Cell receiverPaymentCellTwo = rowtwo.createCell(6); | |||||
| Cell realPaymentCellTwo = rowtwo.createCell(7); | |||||
| Cell realReceivePayCellTwo = rowtwo.createCell(8); | |||||
| Cell subsidyCellTwo = rowtwo.createCell(9); | |||||
| Cell realSubsidyCellTwo = rowtwo.createCell(10); | |||||
| Cell createDateCellTwo = rowtwo.createCell(11); | |||||
| Cell statusCellTwo = rowtwo.createCell(12); | |||||
| idCellTwo.setCellValue("ID"); | |||||
| merchantNameCellTwo.setCellValue("商户"); | |||||
| cardNameCellTwo.setCellValue("卡券名"); | |||||
| orderIdCellTwo.setCellValue("订单号"); | |||||
| orderTypeCellTwo.setCellValue("支付类型"); | |||||
| orderPaymentCellTwo.setCellValue("订单金额"); | |||||
| receiverPaymentCellTwo.setCellValue("接收金额"); | |||||
| realPaymentCellTwo.setCellValue("实收金额"); | |||||
| realReceivePayCellTwo.setCellValue("实收金额"); | |||||
| subsidyCellTwo.setCellValue("补贴金额(包含通道费)"); | |||||
| realSubsidyCellTwo.setCellValue("补贴金额(不包含通道费)"); | |||||
| createDateCellTwo.setCellValue("创建时间"); | |||||
| statusCellTwo.setCellValue("状态"); | |||||
| Cell createDateCellTwo = rowtwo.createCell(2); | |||||
| Cell orderPaymentCellTwo = rowtwo.createCell(3); | |||||
| Cell receiverPaymentCellTwo = rowtwo.createCell(4); | |||||
| Cell subsidyCellTwo = rowtwo.createCell(5); | |||||
| Cell statusCellTwo = rowtwo.createCell(6); | |||||
| idCellTwo.setCellValue("交易单号"); | |||||
| merchantNameCellTwo.setCellValue("消费商户"); | |||||
| createDateCellTwo.setCellValue("交易时间"); | |||||
| orderPaymentCellTwo.setCellValue("本次消费"); | |||||
| receiverPaymentCellTwo.setCellValue("商户应收"); | |||||
| subsidyCellTwo.setCellValue("补贴"); | |||||
| statusCellTwo.setCellValue("补贴状态"); | |||||
| for (int i = 0; i < subsidyVoList.size(); i++) { | for (int i = 0; i < subsidyVoList.size(); i++) { | ||||
| rowtwo = sheetTwo.createRow(i + 1); | rowtwo = sheetTwo.createRow(i + 1); | ||||
| idCellTwo = rowtwo.createCell(0); | idCellTwo = rowtwo.createCell(0); | ||||
| merchantNameCellTwo = rowtwo.createCell(1); | merchantNameCellTwo = rowtwo.createCell(1); | ||||
| cardNameCellTwo = rowtwo.createCell(2); | |||||
| orderIdCellTwo = rowtwo.createCell(3); | |||||
| orderTypeCellTwo = rowtwo.createCell(4); | |||||
| orderPaymentCellTwo = rowtwo.createCell(5); | |||||
| receiverPaymentCellTwo = rowtwo.createCell(6); | |||||
| realPaymentCellTwo = rowtwo.createCell(7); | |||||
| subsidyCellTwo = rowtwo.createCell(8); | |||||
| realSubsidyCellTwo = rowtwo.createCell(9); | |||||
| createDateCellTwo = rowtwo.createCell(10); | |||||
| statusCellTwo = rowtwo.createCell(11); | |||||
| createDateCellTwo = rowtwo.createCell(2); | |||||
| orderPaymentCellTwo = rowtwo.createCell(3); | |||||
| receiverPaymentCellTwo = rowtwo.createCell(4); | |||||
| subsidyCellTwo = rowtwo.createCell(5); | |||||
| statusCellTwo = rowtwo.createCell(6); | |||||
| WxMerchantSubsidyVo entity = subsidyVoList.get(i); | WxMerchantSubsidyVo entity = subsidyVoList.get(i); | ||||
| idCellTwo.setCellValue(entity.getId()); | idCellTwo.setCellValue(entity.getId()); | ||||
| merchantNameCellTwo.setCellValue(entity.getMerchantName()); | merchantNameCellTwo.setCellValue(entity.getMerchantName()); | ||||
| cardNameCellTwo.setCellValue(entity.getTitle()); | |||||
| orderIdCellTwo.setCellValue(entity.getOrderId()); | |||||
| String str = "券"; // 0:券1:付款码支付,2:C扫码支付,3,储值卡 | |||||
| if (entity.getOrderType().equals(EnumOrderType.COUPON.getCode())) { | |||||
| str = "券"; | |||||
| } else if (entity.getOrderType().equals(EnumOrderType.MICROPAY.getCode())) { | |||||
| str = "付款码支付"; | |||||
| } else if (entity.getOrderType().equals(EnumOrderType.NATIVEPAY.getCode())) { | |||||
| str = "C扫码支付"; | |||||
| } else if (entity.getOrderType().equals(EnumOrderType.PREPAIDCARD.getCode())) { | |||||
| str = "储值卡"; | |||||
| } | |||||
| orderTypeCellTwo.setCellValue(str); | |||||
| if (entity.getCreateDate() != null) | |||||
| createDateCellTwo.setCellValue(sdf.format(entity.getCreateDate())); | |||||
| orderPaymentCellTwo.setCellValue(entity.getOrderPayment()/ 100); | orderPaymentCellTwo.setCellValue(entity.getOrderPayment()/ 100); | ||||
| receiverPaymentCellTwo.setCellValue(entity.getReceiverPayment() / 100); | receiverPaymentCellTwo.setCellValue(entity.getReceiverPayment() / 100); | ||||
| realPaymentCellTwo.setCellValue(entity.getRealPayment() / 100); | |||||
| subsidyCellTwo.setCellValue(entity.getSubsidy() / 100); | subsidyCellTwo.setCellValue(entity.getSubsidy() / 100); | ||||
| realSubsidyCellTwo.setCellValue(entity.getRealSubsidy()); | |||||
| if (entity.getCreateDate() != null) | |||||
| createDateCellTwo.setCellValue(sdf.format(entity.getCreateDate())); | |||||
| String statusStr = "未补贴"; | String statusStr = "未补贴"; | ||||
| if (entity.getStatus().equals(EnumMerchantSubsidyStatus.NOT_SUBSIDY.getCode())) { | if (entity.getStatus().equals(EnumMerchantSubsidyStatus.NOT_SUBSIDY.getCode())) { | ||||
| statusStr = "未补贴"; | statusStr = "未补贴"; | ||||