Commit 9ea871d7 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.2' into MVP1.7.2

parents 6245c0f5 ca8348ff
...@@ -4,6 +4,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; ...@@ -4,6 +4,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.order.constants.OrderConstants; import com.yifu.cloud.plus.v1.yifu.order.constants.OrderConstants;
import com.yifu.cloud.plus.v1.yifu.order.service.TOrderFileSyncLogService;
import com.yifu.cloud.plus.v1.yifu.order.service.TOrderService; import com.yifu.cloud.plus.v1.yifu.order.service.TOrderService;
import com.yifu.cloud.plus.v1.yifu.order.util.EkpOrderFileTask; import com.yifu.cloud.plus.v1.yifu.order.util.EkpOrderFileTask;
import com.yifu.cloud.plus.v1.yifu.order.vo.OrderAddVO; import com.yifu.cloud.plus.v1.yifu.order.vo.OrderAddVO;
...@@ -39,6 +40,8 @@ public class EkpOrderController { ...@@ -39,6 +40,8 @@ public class EkpOrderController {
private TOrderService tOrderService; private TOrderService tOrderService;
@Autowired @Autowired
private EkpOrderFileTask ekpOrderFileTask; private EkpOrderFileTask ekpOrderFileTask;
@Autowired
private TOrderFileSyncLogService syncLogService;
/** /**
* 接收处理ekp订单 * 接收处理ekp订单
* *
...@@ -84,6 +87,9 @@ public class EkpOrderController { ...@@ -84,6 +87,9 @@ public class EkpOrderController {
ekpOrderFileTask.receiveOrderNew(multipartFile.getInputStream(),vo.getFile1(),vo.getOrderNo(),fileName ekpOrderFileTask.receiveOrderNew(multipartFile.getInputStream(),vo.getFile1(),vo.getOrderNo(),fileName
,multipartFile.getOriginalFilename(),vo.getFileIds()); ,multipartFile.getOriginalFilename(),vo.getFileIds());
} }
}else {
//记录未获取到附件文件流的信息
syncLogService.saveAsso(vo.getOrderNo(),vo.getFileIds());
} }
return R.ok(); return R.ok();
} }
......
...@@ -49,4 +49,7 @@ public interface TOrderFileSyncLogService extends IService<TOrderFileSyncLog> { ...@@ -49,4 +49,7 @@ public interface TOrderFileSyncLogService extends IService<TOrderFileSyncLog> {
void listExport(HttpServletResponse response, TOrderFileSyncLogSearchVo searchVo); void listExport(HttpServletResponse response, TOrderFileSyncLogSearchVo searchVo);
List<TOrderFileSyncLog> noPageDiy(TOrderFileSyncLogSearchVo searchVo); List<TOrderFileSyncLog> noPageDiy(TOrderFileSyncLogSearchVo searchVo);
void saveAsso(String orderNo, String fileIds);
} }
...@@ -45,6 +45,7 @@ import javax.servlet.http.HttpServletResponse; ...@@ -45,6 +45,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -148,6 +149,18 @@ public class TOrderFileSyncLogServiceImpl extends ServiceImpl<TOrderFileSyncLogM ...@@ -148,6 +149,18 @@ public class TOrderFileSyncLogServiceImpl extends ServiceImpl<TOrderFileSyncLogM
return baseMapper.selectList(wrapper); return baseMapper.selectList(wrapper);
} }
@Override
public void saveAsso(String orderNo, String fileIds) {
TOrderFileSyncLog log = new TOrderFileSyncLog();
log.setFlag(CommonConstants.ZERO_STRING);
log.setOrderNo(orderNo);
log.setAttIds(fileIds);
log.setCreateTime(LocalDateTime.now());
log.setUpdateTime(LocalDateTime.now());
log.setReason("附件文件流获取失败,请联系管理员处理!");
baseMapper.insert(log);
}
private Long noPageCountDiy(TOrderFileSyncLogSearchVo searchVo) { private Long noPageCountDiy(TOrderFileSyncLogSearchVo searchVo) {
LambdaQueryWrapper<TOrderFileSyncLog> wrapper = buildQueryWrapper(searchVo); LambdaQueryWrapper<TOrderFileSyncLog> wrapper = buildQueryWrapper(searchVo);
List<String> idList = Common.getList(searchVo.getIds()); List<String> idList = Common.getList(searchVo.getIds());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment