Merge remote-tracking branch 'origin/master'

This commit is contained in:
hejiayang
2025-12-15 10:13:58 +08:00
@@ -520,10 +520,15 @@ public class StClientMemberBalanceController {
stClientMemberTransactionRecordVO.setTransactionAmount(sumResult.getTransactionAmount());
statisticsCanteenBusiness.add(stClientMemberTransactionRecordVO);
String exportFields = "serialNo|交易流水号,orderNo|交易单号,userName|姓名,phone|手机号,workNo|工号,cardCode|卡号," +
"statusName|操作类型,transactionAmount|交易金额,paymentMethodName|结账方式,businessModelName|消费类型,availableBalance|余额," +
"payTime|结账时间,updateStatusName|操作端,createOne|操作人";
// String exportFields = "serialNo|交易流水号,orderNo|交易单号,userName|姓名,,workNo|工号,cardCode|卡号," +
// "statusName|操作类型,transactionAmount|交易金额,paymentMethodName|结账方式,businessModelName|消费类型,availableBalance|余额," +
// "payTime|结账时间,updateStatusName|操作端,createOne|操作人";
// "dinnerType|餐次名称,restName|食堂名称,createTime|交易时间,payTime|结账时间,updateStatusName|操作端,createOne|操作人";
String exportFields = "userName|姓名,workNo|工号,dinnerType|餐次名称,transactionAmount|交易金额,availableBalance|剩余金额,createTime|上传时间,serialNo|交易流水号,orderNo|交易单号,phone|手机号码,cardCode|卡号," +
"statusName|操作类型,,paymentMethodName|结账方式,businessModelName|消费类型名称,storedBalance|储值金额变动(元)" +
"updateStatusName|操作端,payTime|扣费时间";
// "dinnerType|餐次名称,restName|食堂名称,,payTime|结账时间,updateStatusName|操作端,createOne|操作人";
ExcelUtils.export(response, "消费明细", statisticsCanteenBusiness, exportFields, "yyyy-MM-dd HH:mm",true);
}