humuyu 3 роки тому
батько
коміт
f146809065

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

@@ -35,10 +35,11 @@ public class TencentPushController {
 	public Map<String, Object> tencentpush(@RequestBody Map<String, String> json) throws Exception {
 
 		String channelId = json.get("channel_id");
-
-		Map<String, String> map = split(json.get("stream_param"));
+		
 		if (channelId.contains("share")) {
+			log.info("pc端的推送信息:" + JSON.toJSON(json));
 			// 转成json形式
+			Map<String, String> map = split(json.get("stream_param"));
 			String fileId = (String) json.get("file_id");
 			PushDataEntity pushData = new PushDataEntity();
 			pushData.setFileId(fileId);
@@ -47,7 +48,6 @@ public class TencentPushController {
 			pushData.setData(JSON.toJSONString(json));
 			pushData.setPath(json.get("video_url"));
 			pushDataMapper.insert(pushData);
-			log.info("pc端的推送信息:" + JSON.toJSON(json));
 			// 文件fileId
 			String roomId = map.get("groupid");
 			QueryWrapper<OrderRoomIdEntity> orderRoomQuery = new QueryWrapper<>();
@@ -68,6 +68,8 @@ public class TencentPushController {
 			}
 		}
 		if (channelId.contains("aux")) {
+			log.info("app的视频推送:" + JSON.toJSON(json));
+			Map<String, String> map = split(json.get("stream_param"));
 			// 转成json形式
 			String fileId = (String) json.get("file_id");
 			PushDataEntity pushData = new PushDataEntity();
@@ -77,7 +79,7 @@ public class TencentPushController {
 			pushData.setData(JSON.toJSONString(json));
 			pushData.setPath(json.get("video_url"));
 			pushDataMapper.insert(pushData);
-			log.info("app的视频推送:" + JSON.toJSON(json));
+		
 			// 文件fileId
 			String roomId = map.get("groupid");
 			QueryWrapper<OrderRoomIdEntity> orderRoomQuery = new QueryWrapper<>();

+ 2 - 0
eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/AdminOrderServiceImpl.java

@@ -429,6 +429,8 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		// 流程走完之后需要把数据插入到order_cochain
 		OrderCochainEntity orderCochain = new OrderCochainEntity();
 		orderCochain.setStatus("0");
+		//设置次数为0
+		orderCochain.setCount(0);
 		orderCochain.setBusinessNo(businessNo);
 		orderCochain.setCreateTime(LocalDateTime.now());
 		orderCochain.setUpdateTime(LocalDateTime.now());