java/xizang.git

			@@ -58,6 +58,7 @@
			confirm.setBillId(CollectionUtil.join(dto.getBillIds(),","));
			confirm.setVoucher(dto.getVoucher());
			confirm.setPayFeesMoney(new BigDecimal(dto.getAmount()).divide(AmountConstant.b100).setScale(2, RoundingMode.HALF_DOWN).doubleValue());
			confirm.setPayTime(dto.getPayTime());
			tBillConfirmService.save(confirm);
			for (TBill tBill : tBills) {
			TBill save = new TBill();

			@@ -1,11 +1,13 @@
			package com.ruoyi.system.dto;

			import com.fasterxml.jackson.annotation.JsonFormat;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;

			import javax.validation.constraints.NotEmpty;
			import javax.validation.constraints.NotNull;
			import java.io.Serializable;
			import java.util.Date;
			import java.util.List;

			@Data
			@@ -32,5 +34,9 @@
			@NotEmpty(message = "凭证文件不能为空")
			private String voucher;

			@ApiModelProperty(value = "支付时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private Date payTime;


			}

			@@ -12,6 +12,7 @@

			import java.io.Serializable;
			import java.time.LocalDateTime;
			import java.util.Date;

			/**
			* <p>
			@@ -51,7 +52,7 @@
			@ApiModelProperty(value = "支付时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			@TableField("pay_time")
			private LocalDateTime payTime;
			private Date payTime;


			}

			@@ -222,7 +222,7 @@
			TFlowManagement save = new TFlowManagement();
			save.setPayType(3);
			save.setPayer(dto.getPayer());
			save.setPayTime(dto.getPayTime()==null?confirm.getPayTime():dto.getPayTime());
			save.setPayTime(dto.getPayTime()==null?DateUtils.dateToLocalDateTime(confirm.getPayTime()):dto.getPayTime());
			save.setBankSerialNumber(dto.getBankSerilNum());
			save.setFlowType(2);
			save.setPaymentBillId(bill.getId());
			@@ -235,7 +235,7 @@
			TBankFlow bankFlow = new TBankFlow();
			bankFlow.setPayType(3);
			bankFlow.setPayer(dto.getPayer());
			bankFlow.setPayTime(dto.getPayTime()==null?confirm.getPayTime():dto.getPayTime());
			bankFlow.setPayTime(dto.getPayTime()==null?DateUtils.dateToLocalDateTime(confirm.getPayTime()):dto.getPayTime());
			bankFlow.setBankSerialNumber(dto.getBankSerilNum());
			bankFlow.setFlowMoney(dto.getAmount());
			bankFlow.setFlowStatus(1);

	ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/PayController.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/dto/OfflinePayDto.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/model/TBillConfirm.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史