提交代码

master
胡锐 3 months ago committed by yuanye
parent 43e8e93525
commit 27ee418b60
  1. 44
      order/src/main/java/com/order/controller/business/OrderCouponController.java
  2. 10
      service/pom.xml
  3. 107
      service/src/main/java/com/hfkj/common/utils/ExcelFillCellMergeStrategyUtils.java
  4. 186
      service/src/main/java/com/hfkj/common/utils/MergeCellStrategyHandler.java
  5. 86
      service/src/main/java/com/hfkj/model/order/OrderCouponModel.java
  6. 4
      service/src/main/java/com/hfkj/service/order/impl/BsOrderAfterSalesApplyServiceImpl.java
  7. 9
      service/src/main/java/com/hfkj/sysenum/order/OrderChildStatusEnum.java
  8. 9
      service/src/main/java/com/hfkj/sysenum/order/OrderCouponNoStatusEnum.java
  9. 9
      service/src/main/java/com/hfkj/sysenum/order/OrderPayChannelEnum.java
  10. 9
      service/src/main/java/com/hfkj/sysenum/order/OrderPayTypeEnum.java

@ -1,5 +1,6 @@
package com.order.controller.business; package com.order.controller.business;
import com.alibaba.excel.EasyExcel;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.hfkj.common.exception.ErrorCode; import com.hfkj.common.exception.ErrorCode;
@ -7,7 +8,10 @@ import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode; import com.hfkj.common.exception.SysCode;
import com.hfkj.common.security.SessionObject; import com.hfkj.common.security.SessionObject;
import com.hfkj.common.security.UserCenter; import com.hfkj.common.security.UserCenter;
import com.hfkj.common.utils.ExcelFillCellMergeStrategyUtils;
import com.hfkj.common.utils.MergeCellStrategyHandler;
import com.hfkj.common.utils.ResponseMsgUtil; import com.hfkj.common.utils.ResponseMsgUtil;
import com.hfkj.config.CommonSysConst;
import com.hfkj.entity.BsOrderCoupon; import com.hfkj.entity.BsOrderCoupon;
import com.hfkj.model.ResponseData; import com.hfkj.model.ResponseData;
import com.hfkj.model.SecUserSessionObject; import com.hfkj.model.SecUserSessionObject;
@ -15,6 +19,10 @@ import com.hfkj.model.order.OrderCouponModel;
import com.hfkj.service.coupon.BsOrderCouponNoService; import com.hfkj.service.coupon.BsOrderCouponNoService;
import com.hfkj.service.coupon.BsOrderCouponService; import com.hfkj.service.coupon.BsOrderCouponService;
import com.hfkj.sysenum.SecUserObjectTypeEnum; import com.hfkj.sysenum.SecUserObjectTypeEnum;
import com.hfkj.sysenum.order.OrderChildStatusEnum;
import com.hfkj.sysenum.order.OrderCouponNoStatusEnum;
import com.hfkj.sysenum.order.OrderPayChannelEnum;
import com.hfkj.sysenum.order.OrderPayTypeEnum;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -26,9 +34,8 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.HashMap; import java.io.File;
import java.util.List; import java.util.*;
import java.util.Map;
/** /**
* @className: OrderCouponController * @className: OrderCouponController
@ -163,7 +170,36 @@ public class OrderCouponController {
param.put("createTimeE", createTimeE); param.put("createTimeE", createTimeE);
List<OrderCouponModel> orderList = orderCouponService.getOrderList(param); List<OrderCouponModel> orderList = orderCouponService.getOrderList(param);
return ResponseMsgUtil.success(orderList); for (OrderCouponModel coupon : orderList) {
if (coupon.getPayChannel() != null) {
coupon.setPayChannel(OrderPayChannelEnum.getData(Integer.valueOf(coupon.getPayChannel())).getName());
}
if (coupon.getPayType() != null) {
coupon.setPayType(OrderPayTypeEnum.getData(Integer.valueOf(coupon.getPayType())).getName());
}
coupon.setTradeStatus(OrderChildStatusEnum.getData(Integer.valueOf(coupon.getTradeStatus())).getName());
coupon.setCouStatus(OrderCouponNoStatusEnum.getData(Integer.valueOf(coupon.getCouStatus())).getName());
coupon.setExceptionStatus(Boolean.getBoolean(coupon.getExceptionStatus())?"是":"否");
}
String fileUrl = CommonSysConst.getSysConfig().getFileUrl() + "/temporary/";
String pathName = System.currentTimeMillis()+".xlsx";
File file = new File(fileUrl);
if (!file.exists()) {
file.mkdirs();
}
//设置第几列开始合并
int[] mergeColumnIndex = {0,1,2,17};
//设置第几行开始合并
int mergeRowIndex = 1;
EasyExcel.write(fileUrl+pathName)
.head(OrderCouponModel.class)
.sheet("虚拟商品订单")
.registerWriteHandler(new ExcelFillCellMergeStrategyUtils(mergeRowIndex, mergeColumnIndex))
.doWrite(orderList);
return ResponseMsgUtil.success(pathName);
} catch (Exception e) { } catch (Exception e) {
log.error("error!",e); log.error("error!",e);

@ -256,5 +256,15 @@
<filtering>false</filtering> <filtering>false</filtering>
</resource> </resource>
</resources> </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>11</source>
<target>11</target>
</configuration>
</plugin>
</plugins>
</build> </build>
</project> </project>

@ -0,0 +1,107 @@
package com.hfkj.common.utils;
import com.alibaba.excel.metadata.CellData;
import com.alibaba.excel.metadata.Head;
import com.alibaba.excel.write.handler.CellWriteHandler;
import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.util.CellRangeAddress;
import java.util.List;
public class ExcelFillCellMergeStrategyUtils implements CellWriteHandler {
/**
* 需要合并列的下标从0开始
*/
private int[] mergeColumnIndex;
/**
* 从第几行开始合并表头下标为0
*/
private int mergeRowIndex;
public ExcelFillCellMergeStrategyUtils(int mergeRowIndex, int[] mergeColumnIndex) {
this.mergeRowIndex = mergeRowIndex;
this.mergeColumnIndex = mergeColumnIndex;
}
@Override
public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row, Head head, Integer integer, Integer integer1, Boolean aBoolean) {
}
@Override
public void afterCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Cell cell, Head head, Integer integer, Boolean aBoolean) {
}
@Override
public void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, CellData cellData, Cell cell, Head head, Integer integer, Boolean aBoolean) {
}
@Override
public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, List<CellData> list, Cell cell, Head head, Integer integer, Boolean aBoolean) {
//当前行
int curRowIndex = cell.getRowIndex();
//当前列
int curColIndex = cell.getColumnIndex();
if (curColIndex == 0) {
Row preRow = cell.getSheet().getRow(curRowIndex - 1);
if (preRow == null) {
// 当获取不到上一行数据时,使用缓存sheet中数据
preRow = writeSheetHolder.getCachedSheet().getRow(curRowIndex - 1);
}
if (preRow != null) {
if (cell.getStringCellValue().equals(preRow.getCell(0).getStringCellValue())) {
for (int i = 0; i < mergeColumnIndex.length; i++) {
if (curColIndex == mergeColumnIndex[i]) {
mergeWithPrevRow(writeSheetHolder, cell, i, i);
break;
}
}
}
}
}
// preRow.getCell(curColIndex);
/* if (curRowIndex > mergeRowIndex) {
for (int i = 0; i < mergeColumnIndex.length; i++) {
if (curColIndex == mergeColumnIndex[i]) {
mergeWithPrevRow(writeSheetHolder, cell, curRowIndex, curColIndex);
break;
}
}
}*/
}
private void mergeWithPrevRow(WriteSheetHolder writeSheetHolder, Cell cell, int curRowIndex, int curColIndex) {
Sheet sheet = writeSheetHolder.getSheet();
List<CellRangeAddress> mergeRegions = sheet.getMergedRegions();
boolean isMerged = false;
for (int i = 0; i < mergeRegions.size() && !isMerged; i++) {
CellRangeAddress cellRangeAddr = mergeRegions.get(i);
// 若上一个单元格已经被合并,则先移出原有的合并单元,再重新添加合并单元
if (cellRangeAddr.isInRange(curRowIndex - 1, curColIndex)) {
sheet.removeMergedRegion(i);
cellRangeAddr.setLastRow(curRowIndex);
sheet.addMergedRegion(cellRangeAddr);
isMerged = true;
}
}
// 若上一个单元格未被合并,则新增合并单元
if (!isMerged) {
CellRangeAddress cellRangeAddress = new CellRangeAddress(curRowIndex - 1, curRowIndex, curColIndex,
curColIndex);
sheet.addMergedRegion(cellRangeAddress);
}
}
}

@ -0,0 +1,186 @@
package com.hfkj.common.utils;
import com.alibaba.excel.metadata.Head;
import com.alibaba.excel.write.merge.AbstractMergeStrategy;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.util.CellRangeAddress;
import java.util.*;
/**
* @className: MergeCellStrategyHandler
* @author: HuRui
* @date: 2024/8/2
**/
public class MergeCellStrategyHandler extends AbstractMergeStrategy {
/**
* 相同列合并
*/
private boolean alikeColumn;
/**
* 相同行合并
*/
private boolean alikeRow;
/** 开始进行合并的行index */
private int rowIndex;
/** 跨行合并的列index */
private Set<Integer> columns;
private int currentRowIndex = 0;
public MergeCellStrategyHandler(boolean alikeColumn, boolean alikeRow, int rowIndex, Set<Integer> columns){
this.alikeColumn = alikeColumn;
this.alikeRow = alikeRow;
this.rowIndex = rowIndex;
this.columns = columns;
}
/**
* 指定是否进行跨列合并单元格
* @param alikeColumn
* @param rowIndex
*/
public MergeCellStrategyHandler(boolean alikeColumn, int rowIndex){
this(alikeColumn, false, rowIndex, new HashSet<>());
}
/**
* 指定是否进行跨行合并单元格
* @param alikeRow
* @param rowIndex
* @param columns
*/
public MergeCellStrategyHandler(boolean alikeRow, int rowIndex, Set<Integer> columns){
this(false, alikeRow, rowIndex, columns);
}
@Override
protected void merge(Sheet sheet, Cell cell, Head head, Integer integer) {
int rowId = cell.getRowIndex();
currentRowIndex = rowId == currentRowIndex ? currentRowIndex : rowId;
if (rowIndex > rowId) {
return;
}
int columnId = cell.getColumnIndex();
// 列合并
if (alikeColumn && columnId > 0) {
String currentCellVal = this.getCellVal(cell);
Cell preCell = cell.getRow().getCell(columnId - 1);
String preCellVal = this.getCellVal(preCell);
if (null != currentCellVal && null != preCellVal && StringUtils.isNotBlank(preCellVal) && StringUtils.isNotBlank(currentCellVal)) {
// 当前单元格内容与上一个单元格内容相等,进行合并处理
if (preCellVal.equals(currentCellVal)) {
CellRangeAddress rangeAddress = new CellRangeAddress(currentRowIndex, currentRowIndex, columnId - 1, columnId);
rangeAddress = this.findExistAddress(sheet, rangeAddress, currentCellVal);
if (null != rangeAddress) {
sheet.addMergedRegion(rangeAddress);
}
}
}
}
// 行合并
if (alikeRow && rowIndex < rowId && columns.contains(columnId)) {
String currentCellVal = this.getCellVal(cell);
Cell preCell = sheet.getRow(rowId - 1).getCell(columnId);
String preCellVal = this.getCellVal(preCell);
if (null != currentCellVal && null != preCellVal && !preCellVal.isBlank() && !currentCellVal.isBlank()) {
// 当前单元格内容与上一行单元格内容相等,进行合并处理
if (preCellVal.equals(currentCellVal)) {
//sheet.validateMergedRegions();
CellRangeAddress rangeAddress = new CellRangeAddress(currentRowIndex - 1, currentRowIndex, columnId, columnId);
rangeAddress = this.findExistAddress(sheet, rangeAddress, currentCellVal);
if (null != rangeAddress) {
sheet.addMergedRegion(rangeAddress);
}
}
}
}
}
/**
* 合并单元格地址范围,发现存在相同的地址则进行扩容合并
*
* @param isColumn true:跨列合并 false:跨行合并
* @param sheet
* @param rangeAddress :
* @param currentVal 当前单元格中的值
* @return
*/
private CellRangeAddress findExistAddress(Sheet sheet, CellRangeAddress rangeAddress, String currentVal) {
List<CellRangeAddress> mergedRegions = sheet.getMergedRegions();
int existIndex = 0;
Map<Integer, CellRangeAddress> existIdexMap = new LinkedHashMap<>();
if (null != mergedRegions && !mergedRegions.isEmpty()) {
//验证当前合并的单元格是否存在重复(fixme 重复问题待处理!!!)
for (CellRangeAddress mergedRegion : mergedRegions) {
if (mergedRegion.intersects(rangeAddress)) {
existIdexMap.put(existIndex, mergedRegion);
}
existIndex++;
}
}
if (existIdexMap.isEmpty()) {
return rangeAddress;
}
List<Integer> existIndexList = new ArrayList<>(existIdexMap.size());
for (Map.Entry<Integer, CellRangeAddress> addressEntry : existIdexMap.entrySet()) {
CellRangeAddress exist = addressEntry.getValue();
// 自动进行单元格合并处理
int firstRow = rangeAddress.getFirstRow();
int lastRow = rangeAddress.getLastRow();
int firstColumn = rangeAddress.getFirstColumn();
int lastColumn = rangeAddress.getLastColumn();
int firstRow1 = exist.getFirstRow();
int lastRow1 = exist.getLastRow();
int firstColumn1 = exist.getFirstColumn();
int lastColumn1 = exist.getLastColumn();
// 跨行合并 最后一列相等, 行不相等
if (lastRow > lastRow1 && lastColumn == lastColumn1) {
// 检查进行跨行合并的单元格是否已经存在跨列合并
if (lastColumn > 0 && firstColumn1 != lastColumn1) {
// 获取当前单元格的前一列单元格
String cellVal = this.getCellVal(sheet.getRow(lastRow).getCell(lastColumn - 1));
if (null != cellVal && cellVal.equals(currentVal)) {
exist.setLastRow(lastRow);
}
} else {
exist.setLastRow(lastRow);
}
rangeAddress = exist;
existIndexList.add(addressEntry.getKey());
}
// 跨列合并 行相等,列不相等
if (lastColumn > lastColumn1 && firstRow == firstRow1 ) {
exist.setLastColumn(lastColumn);
rangeAddress = exist;
existIndexList.add(addressEntry.getKey());
}
}
// 移除已经存在且冲突的合并数据
if (existIndexList.isEmpty()) {
rangeAddress = null;
}else {
sheet.removeMergedRegions(existIdexMap.keySet());
}
return rangeAddress;
}
private String getCellVal(Cell cell) {
String val = null;
try {
val = cell.getStringCellValue();
}catch (Exception e){
System.out.printf("读取单元格内容失败:行%d 列%d %n", (cell.getRowIndex() + 1), (cell.getColumnIndex() + 1));
}
return val;
}
}

@ -1,5 +1,7 @@
package com.hfkj.model.order; package com.hfkj.model.order;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -14,30 +16,104 @@ import java.util.Date;
@Data @Data
public class OrderCouponModel { public class OrderCouponModel {
@ColumnWidth(20)
@ExcelProperty("交易单号")
public String orderNo; public String orderNo;
@ColumnWidth(15)
@ExcelProperty("商品单号")
public String childOrderNo; public String childOrderNo;
@ColumnWidth(20)
@ExcelProperty("用户手机号")
public String userPhone; public String userPhone;
@ColumnWidth(20)
@ExcelProperty("商品key")
public String goodsKey; public String goodsKey;
@ColumnWidth(30)
@ExcelProperty("商品名称")
public String goodsName; public String goodsName;
@ColumnWidth(30)
@ExcelProperty("商品规格")
public String goodsSpecsName; public String goodsSpecsName;
@ColumnWidth(20)
@ExcelProperty("商品价格")
public String goodsPrice; public String goodsPrice;
@ColumnWidth(20)
@ExcelProperty("购买数量")
public String goodsCount; public String goodsCount;
@ColumnWidth(20)
@ExcelProperty({"交易信息", "订单金额"})
public BigDecimal totalPrice; public BigDecimal totalPrice;
@ColumnWidth(20)
@ExcelProperty({"交易信息", "总优惠"})
public BigDecimal totalDeductionPrice; public BigDecimal totalDeductionPrice;
@ColumnWidth(20)
@ExcelProperty({"交易信息", "优惠券优惠"})
public BigDecimal couponDiscountPrice; public BigDecimal couponDiscountPrice;
@ColumnWidth(20)
@ExcelProperty({"交易信息", "积分抵扣"})
public BigDecimal integralDiscountPrice; public BigDecimal integralDiscountPrice;
@ColumnWidth(20)
@ExcelProperty({"交易信息", "实付金额"})
public BigDecimal payRealPrice; public BigDecimal payRealPrice;
public Integer payChannel;
public Integer payType; @ColumnWidth(20)
@ExcelProperty({"交易信息", "支付渠道"})
public String payChannel;
@ColumnWidth(20)
@ExcelProperty({"交易信息", "支付方式"})
public String payType;
@ColumnWidth(20)
@ExcelProperty({"交易信息", "支付单号"})
public String paySerialNo; public String paySerialNo;
public Integer tradeStatus;
@ColumnWidth(20)
@ExcelProperty({"交易信息", "交易状态"})
public String tradeStatus;
@ColumnWidth(20)
@ExcelProperty({"交易信息", "创建时间"})
public Date createTime; public Date createTime;
@ColumnWidth(20)
@ExcelProperty({"交易信息", "支付时间"})
public Date payTime; public Date payTime;
@ColumnWidth(35)
@ExcelProperty("渠道订单号")
public String channelOrderNo; public String channelOrderNo;
@ColumnWidth(50)
@ExcelProperty("卡密")
public String couNo; public String couNo;
public Integer couStatus;
@ColumnWidth(20)
@ExcelProperty("卡密状态")
public String couStatus;
@ColumnWidth(20)
@ExcelProperty("过期时间")
public Date expireTime; public Date expireTime;
public String exceptionStatus;
@ColumnWidth(20)
@ExcelProperty("完成时间")
public Date finishTime; public Date finishTime;
@ColumnWidth(20)
@ExcelProperty("是否异常")
public String exceptionStatus;
} }

@ -270,6 +270,10 @@ public class BsOrderAfterSalesApplyServiceImpl implements BsOrderAfterSalesApply
BsOrderAfterSalesApplyExample example = new BsOrderAfterSalesApplyExample(); BsOrderAfterSalesApplyExample example = new BsOrderAfterSalesApplyExample();
BsOrderAfterSalesApplyExample.Criteria criteria = example.createCriteria(); BsOrderAfterSalesApplyExample.Criteria criteria = example.createCriteria();
if (MapUtils.getLong(param, "merId") != null) {
criteria.andMerIdEqualTo(MapUtils.getLong(param, "merId"));
}
if (MapUtils.getLong(param, "userId") != null) { if (MapUtils.getLong(param, "userId") != null) {
criteria.andUserIdEqualTo(MapUtils.getLong(param, "userId")); criteria.andUserIdEqualTo(MapUtils.getLong(param, "userId"));
} }

@ -3,6 +3,8 @@ package com.hfkj.sysenum.order;
import lombok.Data; import lombok.Data;
import lombok.Getter; import lombok.Getter;
import java.util.Objects;
/** /**
* @className: OrderChildStatusEnum * @className: OrderChildStatusEnum
* @author: HuRui * @author: HuRui
@ -50,4 +52,11 @@ public enum OrderChildStatusEnum {
this.code = code; this.code = code;
this.name = name; this.name = name;
} }
public static OrderChildStatusEnum getData(Integer type) {
for (OrderChildStatusEnum ele : values()) {
if (Objects.equals(type,ele.getCode())) return ele;
}
return null;
}
} }

@ -2,6 +2,8 @@ package com.hfkj.sysenum.order;
import lombok.Getter; import lombok.Getter;
import java.util.Objects;
/** /**
* 卡券编号订单状态 * 卡券编号订单状态
* @className: OrderCouponNoStatusEnum * @className: OrderCouponNoStatusEnum
@ -40,4 +42,11 @@ public enum OrderCouponNoStatusEnum {
this.code = code; this.code = code;
this.name = name; this.name = name;
} }
public static OrderCouponNoStatusEnum getData(Integer type) {
for (OrderCouponNoStatusEnum ele : values()) {
if (Objects.equals(type,ele.getCode())) return ele;
}
return null;
}
} }

@ -2,6 +2,8 @@ package com.hfkj.sysenum.order;
import lombok.Getter; import lombok.Getter;
import java.util.Objects;
/** /**
* 交易支付渠道 * 交易支付渠道
* @className: OrderPayModelEnum * @className: OrderPayModelEnum
@ -36,4 +38,11 @@ public enum OrderPayChannelEnum {
this.code = code; this.code = code;
this.name = name; this.name = name;
} }
public static OrderPayChannelEnum getData(Integer type) {
for (OrderPayChannelEnum ele : values()) {
if (Objects.equals(type,ele.getCode())) return ele;
}
return null;
}
} }

@ -2,6 +2,8 @@ package com.hfkj.sysenum.order;
import lombok.Getter; import lombok.Getter;
import java.util.Objects;
/** /**
* 交易支付类型 * 交易支付类型
* @className: OrderPayModelEnum * @className: OrderPayModelEnum
@ -36,4 +38,11 @@ public enum OrderPayTypeEnum {
this.code = code; this.code = code;
this.name = name; this.name = name;
} }
public static OrderPayTypeEnum getData(Integer type) {
for (OrderPayTypeEnum ele : values()) {
if (Objects.equals(type,ele.getCode())) return ele;
}
return null;
}
} }

Loading…
Cancel
Save