java/xizang.git

			@@ -301,6 +301,7 @@
			TFlowManagement save = new TFlowManagement();
			save.setPayType(3);
			save.setPayer(dto.getPayer());
			save.setBusinessDeptId(bill.getBusinessDeptId());
			save.setPayTime(bankflow.getPayTime());
			save.setSysSerialNumber(OrderNos.getDid(30));
			save.setBankSerialNumber(bankflow.getBankSerialNumber());
			@@ -382,6 +383,7 @@
			TFlowManagement saveFlow = new TFlowManagement();
			saveFlow.setPayType(1);
			saveFlow.setPayer(order.getUserId());
			saveFlow.setBusinessDeptId(bill.getBusinessDeptId());
			saveFlow.setPayTime(DateUtils.dateToLocalDateTime(save.getPayTime()));
			saveFlow.setSysSerialNumber(OrderNos.getDid(30));
			saveFlow.setBankSerialNumber(save.getPayNo());
			@@ -549,6 +551,7 @@
			TFlowManagement save = new TFlowManagement();
			save.setPayType(3);
			save.setPayer(dto.getPayer());
			save.setBusinessDeptId(bill.getBusinessDeptId());
			save.setPayTime(bankflow!=null?bankflow.getPayTime():DateUtils.dateToLocalDateTime(new Date()));
			save.setSysSerialNumber(OrderNos.getDid());
			save.setBankSerialNumber(bankflow!=null?bankflow.getBankSerialNumber():null);

			@@ -62,8 +62,8 @@
			<if test="query.userId != null and query.userId !=''">
			and t.id = #{query.userId}
			</if>
			<if test="query.businessDeptId != null and query.businessDeptId !=''">
			and b.business_dept_id = #{businessDeptId}
			<if test='query.businessDeptId != null and query.businessDeptId != "" and query.businessDeptId!="0"'>
			and b.business_dept_id = #{query.businessDeptId}
			</if>
			<if test="query.billType != null">
			and b.bill_type = #{query.billType}

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/resources/mapper/system/TBillMapper.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史