diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java index e2752b717..2f5b2abde 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java @@ -86,9 +86,13 @@ import java.util.Map; public class WalletRechargeInvoiceServiceImpl extends ServiceImpl implements WalletRechargeInvoiceService { static private final String TAG = "充值/扣款发票"; - private static final double INVOICE_STAMP_WIDTH_RATIO = 500D / (661.5D * 3D); - private static final double INVOICE_STAMP_X_RATIO = (500D + 661.5D * 3D * 0.15D + 80D) / (661.5D * 3D); - private static final double INVOICE_STAMP_BOTTOM_MARGIN_RATIO = 50D / (359.1D * 3D); + private static final double CSS_PX_PER_CM = 96D / 2.54D; + private static final double INVOICE_WIDTH_CSS_PX = 17.5D * CSS_PX_PER_CM; + private static final double INVOICE_HEIGHT_CSS_PX = 9.5D * CSS_PX_PER_CM; + private static final double INVOICE_TABLE_WIDTH_CSS_PX = 15D * CSS_PX_PER_CM; + private static final double INVOICE_STAMP_WIDTH_RATIO = 2.5D * 0.8D / 17.5D; + private static final double INVOICE_STAMP_X_RATIO = ((INVOICE_WIDTH_CSS_PX - INVOICE_TABLE_WIDTH_CSS_PX) / 2D + 140D) / INVOICE_WIDTH_CSS_PX; + private static final double INVOICE_STAMP_Y_RATIO = (24D + 36D + 24D + 4D + 4.5D * CSS_PX_PER_CM - 8D) / INVOICE_HEIGHT_CSS_PX; private final FlowUtil flowUtil; @@ -478,7 +482,7 @@ public class WalletRechargeInvoiceServiceImpl extends ServiceImpl