|
@@ -17,7 +17,6 @@ import org.slf4j.Logger;
|
17
|
17
|
import org.slf4j.LoggerFactory;
|
18
|
18
|
import org.springframework.beans.factory.annotation.Autowired;
|
19
|
19
|
import org.springframework.stereotype.Service;
|
20
|
|
-import org.springframework.transaction.annotation.Transactional;
|
21
|
20
|
|
22
|
21
|
import java.time.LocalDateTime;
|
23
|
22
|
import java.util.ArrayList;
|
|
@@ -71,7 +70,7 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
|
71
|
70
|
taLiveActivity.setCreateDate(LocalDateTime.now());
|
72
|
71
|
taLiveActivity.setUpdateDate(LocalDateTime.now());
|
73
|
72
|
if (StringUtils.isNotBlank(taLiveActivity.getLiveRoomParam())) {
|
74
|
|
- taLiveActivity.setLiveAppName(taLiveActivity.getLiveRoomParam().replace(".html", ""));
|
|
73
|
+ taLiveActivity.setLiveAppPath(taLiveActivity.getLiveRoomParam().replace(".html", ""));
|
75
|
74
|
}
|
76
|
75
|
|
77
|
76
|
Boolean result = save(taLiveActivity);
|
|
@@ -79,19 +78,14 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
|
79
|
78
|
responseBean.addError("fail");
|
80
|
79
|
return responseBean;
|
81
|
80
|
}
|
82
|
|
-
|
83
|
|
-// // 生成二维码
|
84
|
|
-// QueryWrapper<TaMiniapp> taMiniappQuery = new QueryWrapper<>();
|
85
|
|
-// taMiniappQuery.eq("org_id", taLiveActivity.getOrgId());
|
86
|
|
-// TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQuery);
|
87
|
|
-// /**
|
88
|
|
-// * TODO 部分信息待修改
|
89
|
|
-// */
|
90
|
|
-// ResponseBean taMiniappQrcode = miniAppService.getQrCode
|
91
|
|
-// (CommConstant.ACTIVITY_QRCODE.replace("#0", taLiveActivity.getLiveActivityId().toString())
|
92
|
|
-// .replace("#1", "live"), taMiniapp.getMiniappId());
|
93
|
|
-// taLiveActivity.setQrCode(String.valueOf(taMiniappQrcode.getData()));
|
94
|
|
-// updateById(taLiveActivity);
|
|
81
|
+ QueryWrapper<TaMiniapp> taMiniappQuery = new QueryWrapper<>();
|
|
82
|
+ taMiniappQuery.eq("org_id", taLiveActivity.getOrgId());
|
|
83
|
+ TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQuery);
|
|
84
|
+ ResponseBean taMiniappQrcode = miniAppService.getQrCode
|
|
85
|
+ (CommConstant.LIVE_ACTIVITY_QRCODE.replace("#0", taLiveActivity.getLiveActivityId().toString())
|
|
86
|
+ .replace("#1", "live"), taMiniapp.getMiniappId());
|
|
87
|
+ taLiveActivity.setQrCode(String.valueOf(taMiniappQrcode.getData()));
|
|
88
|
+ updateById(taLiveActivity);
|
95
|
89
|
|
96
|
90
|
// 设置默认海报数据
|
97
|
91
|
TaShareContent shareContent = new TaShareContent();
|
|
@@ -110,13 +104,13 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
|
110
|
104
|
|
111
|
105
|
@Override
|
112
|
106
|
public IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
|
113
|
|
- String cityId, String buildingId, Integer status) {
|
|
107
|
+ String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId) {
|
114
|
108
|
logger.info("TaLiveActivityServiceImpl.listLiveActivityByCondition 接收参数:pageNum:{},pageSize:{},orgId:{}," +
|
115
|
109
|
"liveActivityTitle:{},cityId:{},buildingId:{},liveDetailType:{},status:{}", pageNum, pageSize,
|
116
|
110
|
liveActivityTitle, cityId, buildingId, status);
|
117
|
111
|
|
118
|
112
|
IPage<TaLiveActivity> pg = new Page<>(pageNum, pageSize);
|
119
|
|
- return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId);
|
|
113
|
+ return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId,taPersonBuildingListByUserId);
|
120
|
114
|
}
|
121
|
115
|
|
122
|
116
|
@Override
|