java/haizhentong.git

			@@ -244,6 +244,13 @@
			sysAppUserVO.setSysInspections(sysInspections);
			// 订单信息
			List<TSysOrderVO> sysOrders = sysOrderService.queryListByAppUserId(id);
			for (TSysOrderVO sysOrder : sysOrders) {
			List<TSysInspection> tSysInspections = sysInspections.stream().filter(c -> c.getId().equals(sysOrder.getInspectionId())).collect(Collectors.toList());
			if(!CollectionUtils.isEmpty(tSysInspections)){
			TSysInspection sysInspection = tSysInspections.get(0);
			sysOrder.setSysInspection(sysInspection);
			}
			}
			sysAppUserVO.setSysOrders(sysOrders);
			if(sysAppUserVO.getBirthTime() != null){
			long age = ChronoUnit.YEARS.between(sysAppUserVO.getBirthTime(), LocalDateTime.now());

			@@ -15,6 +15,7 @@
			public static String accessKeySecret = "DWcA5fNQ8vNBBIKa0PkDfGxxNtCFrtrwWiRn1ey6";
			public static String bucketName = "haizhentong";
			public static String oss_domain = "https://haizhentong.obs.cn-south-1.myhuaweicloud.com/";
			public static String oss_domain_cdn = "https://obs.haizhentong.com/";


			// 创建ObsClient实例
			@@ -31,7 +32,7 @@
			obsClient.putObject(bucketName,"file/"+fileName,content,meta);// 上传Object.
			if(fileName != null && !"".equals(fileName)){
			System.out.println(fileName);
			fileName = oss_domain+"file/"+fileName;
			fileName = oss_domain_cdn+"file/"+fileName;
			}
			}
			return fileName;
			@@ -46,7 +47,7 @@
			obsClient.putObject(bucketName,"file/"+fileName,content,meta);// 上传Object.
			if(fileName != null && !"".equals(fileName)){
			System.out.println(fileName);
			fileName = oss_domain+"file/"+fileName;
			fileName = oss_domain_cdn+"file/"+fileName;
			}
			}
			return fileName;

			@@ -1,5 +1,6 @@
			package com.ruoyi.system.vo;

			import com.ruoyi.system.model.TSysInspection;
			import com.ruoyi.system.model.TSysOrder;
			import com.ruoyi.system.model.TSysOrderGoods;
			import io.swagger.annotations.ApiModel;
			@@ -15,4 +16,7 @@
			@ApiModelProperty(value = "订单商品列表")
			private List<TSysOrderGoods> sysOrderGoods;

			@ApiModelProperty(value = "检测信息")
			private TSysInspection sysInspection;

			}

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysAppUserController.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/utils/util/ObsUploadUtil.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/vo/TSysOrderVO.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史