|
@@ -120,7 +120,7 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
|
|
|
|
|
|
|
|
String ghid = "";
|
|
String ghid = "";
|
|
|
Integer groupId = editList.get(0).getGroupId();
|
|
Integer groupId = editList.get(0).getGroupId();
|
|
|
- FosterwxCashOasBox fosterwxCashOasBox = fosterwxCashOasBoxService.getRandOas(editList.get(0).getGroupId(),editList.get(0).getType());
|
|
|
|
|
|
|
+ FosterwxCashOasBox fosterwxCashOasBox = fosterwxCashOasBoxService.getRandOas(editList.get(0).getGroupId(), editList.get(0).getType());
|
|
|
if (null != fosterwxCashOasBox) {
|
|
if (null != fosterwxCashOasBox) {
|
|
|
ghid = fosterwxCashOasBox.getGhId();
|
|
ghid = fosterwxCashOasBox.getGhId();
|
|
|
}
|
|
}
|
|
@@ -132,7 +132,7 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
|
|
|
|
|
|
|
|
taskRedis.createUrlByTyper(JSON.toJSONString(tempList));
|
|
taskRedis.createUrlByTyper(JSON.toJSONString(tempList));
|
|
|
tempList.clear();
|
|
tempList.clear();
|
|
|
- fosterwxCashOasBox = fosterwxCashOasBoxService.getRandOas(editList.get(0).getGroupId(),editList.get(0).getType());
|
|
|
|
|
|
|
+ fosterwxCashOasBox = fosterwxCashOasBoxService.getRandOas(editList.get(0).getGroupId(), editList.get(0).getType());
|
|
|
if (null != fosterwxCashOasBox) {
|
|
if (null != fosterwxCashOasBox) {
|
|
|
ghid = fosterwxCashOasBox.getGhId();
|
|
ghid = fosterwxCashOasBox.getGhId();
|
|
|
}
|
|
}
|
|
@@ -201,7 +201,7 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
|
|
|
*/
|
|
*/
|
|
|
@Override
|
|
@Override
|
|
|
public void editBoxUrl(FosterwxCashScheduleTaskList fosterwxCashScheduleTaskList, FosterwxCashTaskList fosterwxCashTaskList) {
|
|
public void editBoxUrl(FosterwxCashScheduleTaskList fosterwxCashScheduleTaskList, FosterwxCashTaskList fosterwxCashTaskList) {
|
|
|
- FosterwxCashOasBox fosterwxCashOasBox = fosterwxCashOasBoxService.getRandBox(fosterwxCashScheduleTaskList.getGroupId(),fosterwxCashScheduleTaskList.getType());
|
|
|
|
|
|
|
+ FosterwxCashOasBox fosterwxCashOasBox = fosterwxCashOasBoxService.getRandBox(fosterwxCashScheduleTaskList.getGroupId(), fosterwxCashScheduleTaskList.getType());
|
|
|
if (null == fosterwxCashOasBox) {
|
|
if (null == fosterwxCashOasBox) {
|
|
|
// 状态
|
|
// 状态
|
|
|
fosterwxCashScheduleTaskList.setStatus(3);
|
|
fosterwxCashScheduleTaskList.setStatus(3);
|
|
@@ -255,7 +255,6 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
|
|
|
fosterwxCashScheduleTaskListMapper.updateById(fosterwxCashScheduleTaskList);
|
|
fosterwxCashScheduleTaskListMapper.updateById(fosterwxCashScheduleTaskList);
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
- FosterwxCashOasBox fosterwxCashOasBox = fosterwxCashOasBoxService.getRandBox(fosterwxCashScheduleTaskList.getGroupId(),fosterwxCashScheduleTaskList.getType());
|
|
|
|
|
|
|
|
|
|
// FosterwxCashOasBox fosterwxCashOasBox = fosterwxCashOasBoxService.getRandBox(fosterwxCashScheduleTaskList.getGroupId());
|
|
// FosterwxCashOasBox fosterwxCashOasBox = fosterwxCashOasBoxService.getRandBox(fosterwxCashScheduleTaskList.getGroupId());
|
|
|
// if (null == fosterwxCashOasBox) {
|
|
// if (null == fosterwxCashOasBox) {
|
|
@@ -278,9 +277,9 @@ public class FosterwxCashScheduleTaskListServiceImpl extends ServiceImpl<Fosterw
|
|
|
fosterwxCashScheduleTaskList.setErrInfo("");
|
|
fosterwxCashScheduleTaskList.setErrInfo("");
|
|
|
// 分配的公众号
|
|
// 分配的公众号
|
|
|
if (3 == fosterwxCashWorkwxTaskList.getTaskType()) {
|
|
if (3 == fosterwxCashWorkwxTaskList.getTaskType()) {
|
|
|
- fosterwxCashScheduleTaskList.setGhId(fosterwxCashOasBox.getGhId());
|
|
|
|
|
|
|
+ fosterwxCashScheduleTaskList.setGhId(fosterwxCashWorkwxTaskList.getBoxGhId());
|
|
|
}
|
|
}
|
|
|
- fosterwxCashScheduleTaskList.setBoxGhid(fosterwxCashOasBox.getGhId());
|
|
|
|
|
|
|
+ fosterwxCashScheduleTaskList.setBoxGhid(fosterwxCashWorkwxTaskList.getBoxGhId());
|
|
|
|
|
|
|
|
// 小程序链接
|
|
// 小程序链接
|
|
|
String sendUrl = "";
|
|
String sendUrl = "";
|