diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java index a79335442..2adb164fc 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopUser.java @@ -45,7 +45,7 @@ public class ShopUser implements Serializable { /** * 用户昵称 */ - @ColumnMask(Masks.CHINESE_NAME) +// @ColumnMask(Masks.CHINESE_NAME) private String nickName; /** diff --git a/cash-common/cash-common-tools/src/main/java/com/czg/enums/ShopUserFlowBizEnum.java b/cash-common/cash-common-tools/src/main/java/com/czg/enums/ShopUserFlowBizEnum.java index 080db4ec3..dda6be9e4 100644 --- a/cash-common/cash-common-tools/src/main/java/com/czg/enums/ShopUserFlowBizEnum.java +++ b/cash-common/cash-common-tools/src/main/java/com/czg/enums/ShopUserFlowBizEnum.java @@ -9,7 +9,7 @@ import lombok.Getter; @Getter public enum ShopUserFlowBizEnum { // 会员充值 - CASH_IN("cashIn", "会员充值"), + CASH_IN("cashIn", "现金充值"), CASHBACK("cashback", "消费返现"), CASHBACK_REFUND("cashbackRefund", "消费返现扣减"), diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java index 745da1346..7b617b8be 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java @@ -1,6 +1,7 @@ package com.czg.service.market.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.DesensitizedUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONArray; import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO; @@ -234,7 +235,7 @@ public class MkShopRechargeServiceImpl extends ServiceImpl 0) { builder.append(getFormatLabel(leftRightAlign(" 赠送金额:", record.getGiftAmount().stripTrailingZeros().toPlainString(), 32), signLabelInfo.s)).append(signLabelInfo.br); @@ -723,11 +733,11 @@ public interface PrinterImpl { builder.append(getFormatLabel(leftRightAlign(" 赠送优惠券:", record.getGiftCoupon() + "", 32), signLabelInfo.s)).append(signLabelInfo.br); } builder.append(getFormatLabel(leftRightAlign(" 充值后余额:", record.getBalance().stripTrailingZeros().toPlainString(), 32), signLabelInfo.s)).append(signLabelInfo.br); - builder.append(getFormatLabel("--------------------------------")).append(signLabelInfo.br); + builder.append(getDividingLine()).append(signLabelInfo.br); // 支付信息 builder.append(getFormatLabel(leftRightAlign("已付金额:", record.getRechargeAmount().stripTrailingZeros().toPlainString(), 32), signLabelInfo.s)).append(signLabelInfo.br); builder.append(getFormatLabel(leftRightAlign("支付方式:", record.getPayType(), 32), signLabelInfo.s)).append(signLabelInfo.br); - builder.append(getFormatLabel("--------------------------------")).append(signLabelInfo.br); + builder.append(getDividingLine()).append(signLabelInfo.br); builder.append(getFormatLabel(StrUtil.format("操作员: {}", record.getOperator()), signLabelInfo.s)).append(signLabelInfo.br); builder.append(getFormatLabel(StrUtil.format("充值编号: {}", record.getRechargeId()), signLabelInfo.s)).append(signLabelInfo.br); @@ -764,7 +774,7 @@ public interface PrinterImpl { } } - builder.append(getFormatLabel("--------------------------------")).append(signLabelInfo.br).append(signLabelInfo.br); + builder.append(getDividingLine()).append(signLabelInfo.br).append(signLabelInfo.br); // 账存数量、盈亏金额、备注 builder.append(getFormatLabel(StrUtil.format("账存数量: {}", record.getWinLossNumberCount()), signLabelInfo.s)).append(signLabelInfo.br); @@ -772,7 +782,7 @@ public interface PrinterImpl { builder.append(getFormatLabel(StrUtil.format("盈亏金额: {}", winLossAmountStr), signLabelInfo.s)).append(signLabelInfo.br); builder.append(getFormatLabel(StrUtil.format("备注: {}", StrUtil.isBlank(record.getRemark()) ? "" : record.getRemark()), signLabelInfo.s)).append(signLabelInfo.br); - builder.append(getFormatLabel("--------------------------------")).append(signLabelInfo.br).append(signLabelInfo.br); + builder.append(getDividingLine()).append(signLabelInfo.br).append(signLabelInfo.br); // 操作员、打印时间 builder.append(getFormatLabel(StrUtil.format("操作员: {}", record.getOperator()), signLabelInfo.s)).append(signLabelInfo.br); // 打印时间:复用之前的DateUtil格式化,若DTO需补充printTime字段,可按需求添加 @@ -808,8 +818,7 @@ public interface PrinterImpl { getFormatLabel("怕过号,扫一扫", signLabelInfo.center, signLabelInfo.bold) + signLabelInfo.br + getFormatLabel(codeUrl, signLabelInfo.center, signLabelInfo.qr) + - signLabelInfo.br + - "--------------------------------" + signLabelInfo.br + + signLabelInfo.br + getDividingLine() + signLabelInfo.br + getFormatLabel(shopNote, signLabelInfo.s) + getFormatLabel(StrUtil.format("取号时间: {}", DateUtil.format(takeTime, "yyyy-MM-dd HH:mm:ss")), signLabelInfo.s) + signLabelInfo.br +