提交 5fe08a84 作者: han

飞手端继续上传图片

上级 70db58ea
流水线 #7925 已通过 于阶段
in 2 分 58 秒
......@@ -228,7 +228,12 @@ public class RequirementsController extends BaseController {
return requirementsService.fulfilATaskDetails(requirementsInfoId, userAccountId);
}
@ApiOperation(value = "new——小程序-—飞手端--继续上传图片")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@PostMapping("updateTaskUrl")
public ResultBody updateTaskUrl(@ApiParam(value = "完成任务图片", required = true) @RequestParam String taskUrl, @ApiParam(value = "发布服务需求id", required = true) @RequestParam Integer requirementsInfoId) {
return requirementsService.updateTaskUrl(taskUrl,requirementsInfoId);
}
@ApiOperation(value = "new——小程序-—发布者--订单结算")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@PostMapping("settleAccounts")
......
......@@ -124,6 +124,7 @@ public interface RequirementsDao {
void fulfilATask(ServiceFulfilATaskDO serviceFulfilATaskDO);
void updateTaskUrl(@Param("taskUrl") String taskUrl,@Param("requirementsInfoId") Integer requirementsInfoId);
ServiceFulfilATaskDO fulfilATaskDetails(Integer requirementsInfoId, Integer userAccountId);
......
......@@ -88,6 +88,8 @@ public interface RequirementsService {
ResultBody fulfilATask(ServiceFulfilATaskVO fulfilATaskVO);
ResultBody updateTaskUrl(String taskUrl,Integer requirementsInfoId);
ResultBody<ServiceFulfilATaskDTO> fulfilATaskDetails(Integer requirementsInfoId, Integer userAccountId);
ResultBody settleAccounts(ServiceSettleAccountsVO settleAccountsVO, HttpServletRequest request);
......
......@@ -2,6 +2,8 @@ package com.mmc.csf.release.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.mmc.csf.common.util.json.JsonUtil;
import com.mmc.csf.common.util.page.PageResult;
import com.mmc.csf.common.util.web.HttpsRequestUtil;
......@@ -3165,6 +3167,41 @@ public class RequirementsServiceImpl implements RequirementsService {
}
@Override
public ResultBody updateTaskUrl(String taskUrl, Integer requirementsInfoId) {
if(StringUtils.isEmpty(taskUrl)){
return ResultBody.error("传的内容为空");
}
ServiceFulfilATaskDO serviceFulfilATaskDO = requirementsDao.fulfilATaskDetails(requirementsInfoId, null);
if(serviceFulfilATaskDO == null){
return ResultBody.error("没有查到这个订单");
}
String taskUrl1 = serviceFulfilATaskDO.getTaskUrl();
if(StringUtils.isEmpty(taskUrl1)){
String newTaskUrl = taskUrl;
requirementsDao.updateTaskUrl(newTaskUrl,requirementsInfoId);
return ResultBody.success();
}
// 解析为JSON数组
JsonArray jsonArray1 = new Gson().fromJson(taskUrl1, JsonArray.class);
JsonArray jsonArray2 = new Gson().fromJson(taskUrl, JsonArray.class);
// 合并JSON数组
JsonArray mergedArray = new JsonArray();
for (int i = 0; i < jsonArray1.size(); i++) {
mergedArray.add(jsonArray1.get(i));
}
for (int i = 0; i < jsonArray2.size(); i++) {
mergedArray.add(jsonArray2.get(i));
}
// 转换为字符串形式
String newTaskUrl = mergedArray.toString();
requirementsDao.updateTaskUrl(newTaskUrl,requirementsInfoId);
return ResultBody.success();
}
@Override
public ResultBody<ServiceFulfilATaskDTO> fulfilATaskDetails(Integer requirementsInfoId, Integer userAccountId) {
ServiceFulfilATaskDO serviceFulfilATaskDO = requirementsDao.fulfilATaskDetails(requirementsInfoId, userAccountId);
ServiceFulfilATaskDTO serviceFulfilATaskDTO = serviceFulfilATaskDO.buildServiceFulfilATaskDTO();
......
......@@ -1696,6 +1696,11 @@
set repertory = #{num}
where id = #{requireId}
</update>
<update id="updateTaskUrl">
update service_fulfil_a_task
set task_url = #{taskUrl}
where requirements_info_id = #{requirementsInfoId}
</update>
<insert id="insertAgreePilotOrder">
insert into agree_pilot_order(require_info_id, service_flow_id, pilot_certification_user_id, create_time)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论