pipIrr-SV.git - Gitblit

			@@ -41,7 +41,7 @@
			private String address;

			/**
			* 水卡余额
			* 水卡最终余额
			*/
			private Float money;

			@@ -50,13 +50,22 @@

			private Integer cardCost;

			@Schema(title = "充值金额")
			/**
			* 本次充值金额
			*/
			private Float amount;

			/**
			* 本次赠送金额
			*/
			private Float gift;

			@Schema(title = "返回金额")
			private Float refundAmount;

			@Schema(title = "充值后金额")
			/**
			* 充值后金额，充值时余额 + 本次充值金额 + 本次赠送金额
			*/
			private Float afterRecharge;

			@Schema(title = "支付方式")

			@@ -113,9 +113,8 @@
			/**
			* 余额
			*/
			@JSONField(serializeUsing= ObjectWriterImplToString.class)
			@ColumnWidth(15)
			private Long money;
			private Double money;

			/**
			* 付款方式

			@@ -277,8 +277,9 @@
			cardNum,
			IFNULL(ope.card_cost,0) AS cardCost,
			IFNULL(ope.trade_amount, 0) AS amount,
			IFNULL(ope.gift, 0) AS gift,
			IFNULL(ope.refund_amount, 0) AS refundAmount,
			(IFNULL(ope.money, 0) + IFNULL(ope.trade_amount, 0)) AS afterRecharge,
			(IFNULL(ope.money, 0) + IFNULL(ope.trade_amount, 0) + IFNULL(ope.gift, 0)) AS afterRecharge,
			pay.name AS paymentName,
			ope.price,
			us.name AS opr,
			@@ -361,7 +362,8 @@
			IFNULL(ope.card_cost,0.00) AS cardCost,
			IFNULL(ope.gift,0.00) AS gift,
			IFNULL(ope.refund_amount,0.00) AS refundAmount,
			ope.money,
			<!--ope.money,-->
			(IFNULL(ope.money, 0) + IFNULL(ope.trade_amount, 0) + IFNULL(ope.gift, 0)) AS money,
			pay.name AS paymentName,
			ope.operate_dt as tradeTime,
			us.id AS cashierId,

	pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史