去掉orderId

eladmin-system/src/main/java/me/zhengjie/application/admin/controller/OrderRoomIdController.java

@@ -42,7 +42,7 @@ public class OrderRoomIdController {
 		AppBaseResponse<JSONObject> rep = new AppBaseResponse<>();
 		JSONObject jsonObj = JSONObject.parseObject(json);
 		QueryWrapper<OrderRoomIdEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("orderId", jsonObj.getString("orderId"));
+		queryWrapper.eq("businessNo", jsonObj.getString("businessNo"));
 		queryWrapper.orderByDesc("update_time");
 		List<OrderRoomIdEntity> orderRoomList = orderRoomService.list(queryWrapper);
 		if (orderRoomList != null && orderRoomList.size() > 0) {

eladmin-system/src/main/java/me/zhengjie/application/admin/controller/TencentPushController.java

@@ -59,8 +59,7 @@ public class TencentPushController {
 			// 这里通过订单查询相关信息
 			if (orderRoomId != null && orderRoomId.size() > 0) {
 				OrderRoomIdEntity orderRoomIdEntity = orderRoomId.get(0);
-				String orderType = StepStatusEnum.getType(orderRoomIdEntity.getOrderId());
-				String filePath = orderRoomIdEntity.getBusinessNo() + "/" + orderType;
+				String filePath = orderRoomIdEntity.getBusinessNo() + "/" ;
 				String fileName = filePath + "/PC" + fileId + ".mp4";
 				DownloadUtils.downloadFile(json.get("video_url"), fileName);
 				OrderRoomIdEntity update = new OrderRoomIdEntity();
@@ -109,8 +108,8 @@ public class TencentPushController {
 							String roomId = param.get("roomId");
 							OrderRoomIdEntity orderRoomId = new OrderRoomIdEntity();
 							orderRoomId.setAppFileId(fileId);
-							String orderType = StepStatusEnum.getType(orderRoomId.getOrderId());
-							String filePath = orderRoomId.getBusinessNo() + "/" + orderType;
+						
+							String filePath = orderRoomId.getBusinessNo() + "/"  ;
 							String fileName = filePath + "/APP" + fileId + ".mp4";
 							DownloadUtils.downloadFile(videoUrl.get("Url").toString(), fileName);
 							orderRoomId.setAppVideoUrl(fileName);
@@ -152,8 +151,8 @@ public class TencentPushController {
 
 				if (orderRoomId != null && orderRoomId.size() > 0) {
 					OrderRoomIdEntity orderRoomIdEntity = orderRoomId.get(0);
-					String orderType = StepStatusEnum.getType(orderRoomIdEntity.getOrderId());
-					String filePath = orderRoomIdEntity.getBusinessNo() + "/" + orderType;
+				
+					String filePath = orderRoomIdEntity.getBusinessNo() + "/" ;
 					String fileName = filePath + "/APP" + fileId + ".mp4";
 					DownloadUtils.downloadFile(path, fileName);
 					OrderRoomIdEntity update = new OrderRoomIdEntity();

eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/OrderServiceImpl.java

@@ -488,12 +488,11 @@ public class OrderServiceImpl implements OrderService {
 		log.info("推送的参数: " + json);
 		// 保存数据
 		JSONObject jsonObject = JSONObject.parseObject(json);
-		String orderId = jsonObject.getString("orderId");
 		String businessNo = jsonObject.getString("businessNo");
 		String roomId = jsonObject.getString("roomId");
 
 		OrderRoomIdEntity orderRoomId = new OrderRoomIdEntity();
-		orderRoomId.setOrderId(orderId);
+		
 		// 业务流水
 		orderRoomId.setBusinessNo(businessNo);
 		// 房间号
@@ -504,7 +503,7 @@ public class OrderServiceImpl implements OrderService {
 		orderRoomId.setUpdateTime(LocalDateTime.now());
 		// 这里先判断是否存在，不存在就插入数据
 		OrderRoomIdEntity orderQuery = new OrderRoomIdEntity();
-		orderQuery.setOrderId(orderId);
+	
 		orderQuery.setRoomId(roomId);
 		// 业务流水
 		orderQuery.setBusinessNo(businessNo);

eladmin-system/src/main/java/me/zhengjie/application/user/service/impl/ApiServiceImpl.java

@@ -147,12 +147,11 @@ public class ApiServiceImpl implements ApiService {
 		log.info("推送的参数: " + json);
 		// 保存数据
 		JSONObject jsonObject = JSONObject.parseObject(json);
-		String orderId = jsonObject.getString("orderId");
+//		String orderId = jsonObject.getString("orderId");
 		String businessNo = jsonObject.getString("businessNo");
 		String roomId = jsonObject.getString("roomId");
-
 		OrderRoomIdEntity orderRoomId = new OrderRoomIdEntity();
-		orderRoomId.setOrderId(orderId);
+	
 		// 业务流水
 		orderRoomId.setBusinessNo(businessNo);
 		// 房间号
@@ -163,7 +162,6 @@ public class ApiServiceImpl implements ApiService {
 		orderRoomId.setUpdateTime(LocalDateTime.now());
 		// 这里先判断是否存在，不存在就插入数据
 		OrderRoomIdEntity orderQuery = new OrderRoomIdEntity();
-		orderQuery.setOrderId(orderId);
 		orderQuery.setRoomId(roomId);
 		// 业务流水
 		orderQuery.setBusinessNo(businessNo);

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/entity/OrderRoomIdEntity.java

@@ -39,9 +39,6 @@ public class OrderRoomIdEntity implements Serializable {
 	@TableId(value = "id", type = IdType.AUTO)
 	private Integer id;
 
-	@TableField("orderId")
-	private String orderId;
-
 	@TableField("roomId")
 	private String roomId;
 
@@ -82,6 +79,5 @@ public class OrderRoomIdEntity implements Serializable {
 	 */
 	@TableField("business_no")
 	private String businessNo;
-	
 
 }