|
|
@@ -1,6 +1,7 @@
|
|
|
package com.uas.ps.inquiry.controller;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.uas.ps.core.logging.BufferedLoggerManager;
|
|
|
import com.uas.ps.inquiry.domain.IPage;
|
|
|
import com.uas.ps.inquiry.entity.*;
|
|
|
import com.uas.ps.inquiry.model.*;
|
|
|
@@ -8,6 +9,7 @@ import com.uas.ps.inquiry.page.PageInfo;
|
|
|
import com.uas.ps.inquiry.page.SearchFilter;
|
|
|
import com.uas.ps.inquiry.service.AttachService;
|
|
|
import com.uas.ps.inquiry.service.PublicInquiryService;
|
|
|
+import com.uas.ps.inquiry.support.InquiryBufferedLogger;
|
|
|
import javassist.NotFoundException;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
@@ -35,6 +37,8 @@ public class PublicInquiryController {
|
|
|
@Autowired
|
|
|
private AttachService attachService;
|
|
|
|
|
|
+ private final static InquiryBufferedLogger logger = BufferedLoggerManager.getLogger(InquiryBufferedLogger.class);
|
|
|
+
|
|
|
/**
|
|
|
* 将买家ERP的公共询价写到公共询价服务中心
|
|
|
*
|
|
|
@@ -50,6 +54,7 @@ public class PublicInquiryController {
|
|
|
address = URLDecoder.decode(address, "UTF-8");
|
|
|
List<BatchInquiry> inquiries = JSONObject.parseArray(jsonStr, BatchInquiry.class);
|
|
|
publicInquiryService.save(inquiries, enuu, address);
|
|
|
+ logger.log("公共询价", "ERP上传公共询价", "size: " + inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name());
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -64,6 +69,7 @@ public class PublicInquiryController {
|
|
|
String jsonStr = URLDecoder.decode(data, "UTF-8");
|
|
|
List<BatchInquiry> inquiries = JSONObject.parseArray(jsonStr, BatchInquiry.class);
|
|
|
publicInquiryService.updateStatus(inquiries, enuu);
|
|
|
+ logger.log("公共询价", "ERP设置公共询价不能报价", "size: " + inquiries.size(), Constant.UU, enuu, InquirySource.ERP.name());
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -76,6 +82,7 @@ public class PublicInquiryController {
|
|
|
@RequestMapping(value = "/quotation", method = RequestMethod.GET)
|
|
|
public List<InquiryDetail> getReply(Long enuu) {
|
|
|
List<InquiryDetail> details = publicInquiryService.findNotUploadReply(enuu);
|
|
|
+ logger.log("公共询价", "ERP获取供应商报价信息", "size: " + details.size(), Constant.UU, enuu, "ERP");
|
|
|
return details;
|
|
|
}
|
|
|
|
|
|
@@ -89,6 +96,7 @@ public class PublicInquiryController {
|
|
|
@RequestMapping(value = "/reply/back", method = RequestMethod.POST)
|
|
|
public void onReplySuccess(@RequestParam("data") String data, Long enuu) throws UnsupportedEncodingException {
|
|
|
String[] idArray = URLDecoder.decode(data, "UTF-8").split(",");
|
|
|
+ logger.log("公共询价", "ERP获取报价信息返回id", "id: " + idArray, Constant.UU, enuu, "ERP");
|
|
|
publicInquiryService.onReplyUploadSuccess(idArray);
|
|
|
}
|
|
|
|
|
|
@@ -102,6 +110,7 @@ public class PublicInquiryController {
|
|
|
public void checkInquiry(@RequestParam("data") String data, Long enuu) throws UnsupportedEncodingException {
|
|
|
String jsonStr = URLDecoder.decode(data, "UTF-8");
|
|
|
List<Inquiry> inquiries = JSONObject.parseArray(jsonStr, Inquiry.class);
|
|
|
+ logger.log("公共询价", "ERP提交报价信息应用禁止报价", "size: " + inquiries.size(), Constant.UU, enuu, "ERP");
|
|
|
publicInquiryService.updateInquiryStatus(inquiries);
|
|
|
}
|
|
|
|
|
|
@@ -115,6 +124,7 @@ public class PublicInquiryController {
|
|
|
public void onReplyDecide(@RequestParam("data") String data, Long enuu) throws UnsupportedEncodingException {
|
|
|
String jsonStr = URLDecoder.decode(data, "UTF-8");
|
|
|
List<InquiryDecide> decides = JSONObject.parseArray(jsonStr, InquiryDecide.class);
|
|
|
+ logger.log("公共询价", "ERP针对供应报价信息进行(不)采纳操作", "size: " + decides.size(), Constant.UU, enuu, "ERP");
|
|
|
publicInquiryService.onReplyDecide(decides, enuu);
|
|
|
}
|
|
|
|
|
|
@@ -129,6 +139,7 @@ public class PublicInquiryController {
|
|
|
public void onReplyInvalid(@RequestParam("data") String data, Long enuu) throws UnsupportedEncodingException {
|
|
|
String jsonStr = URLDecoder.decode(data, "UTF-8");
|
|
|
List<Inquiry> inquiries = JSONObject.parseArray(jsonStr, Inquiry.class);
|
|
|
+ logger.log("公共询价", "ERP作废公共询价单返回数据到公共服务", "size: " + inquiries.size(), Constant.UU, enuu, "ERP");
|
|
|
publicInquiryService.onReplyInvalid(inquiries, enuu);
|
|
|
}
|
|
|
|
|
|
@@ -163,6 +174,7 @@ public class PublicInquiryController {
|
|
|
pageInfo.setOffset(pageInfo.getPageSize() * (pageInfo.getPageNumber() - 1));
|
|
|
}
|
|
|
pageInfo.setSort(sort);
|
|
|
+ logger.log("公共询价", "查询公共询价信息", null, searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name());
|
|
|
return publicInquiryService.findTodoByPageInfo(pageInfo, searchFilter);
|
|
|
}
|
|
|
|
|
|
@@ -186,6 +198,7 @@ public class PublicInquiryController {
|
|
|
if (null != searchFilter.getEnUU()) {
|
|
|
pageInfo.filter("inquiry.enUU", searchFilter.getEnUU());
|
|
|
}
|
|
|
+ logger.log("公共询价", "查询已发布公共询价信息", null, searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.MALL.name());
|
|
|
return publicInquiryService.findTodoByPageInfo(pageInfo, searchFilter);
|
|
|
}
|
|
|
|
|
|
@@ -224,14 +237,17 @@ public class PublicInquiryController {
|
|
|
filter.setKeyword(keyword);
|
|
|
if (StringUtils.hasText(_state)) {
|
|
|
if (_state.equals(OrderStatus.end.name())) {
|
|
|
+ logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
|
|
|
pageInfo.filter("overdue", Constant.YES);
|
|
|
map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
|
|
|
return map;
|
|
|
} else if (_state.equals(OrderStatus.invalid)) {
|
|
|
+ logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
|
|
|
pageInfo.filter("invalid", Constant.YES);
|
|
|
map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
|
|
|
return map;
|
|
|
} else if (_state.equals(OrderStatus.done.name())) {
|
|
|
+ logger.log("公共询价", "查询已转报价询价列表信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
|
|
|
filter.setVendUU(en_uu);
|
|
|
filter.setKeyword(keyword);
|
|
|
map.put("content", publicInquiryService.findByPageInfo(pageInfo, filter).getContent());
|
|
|
@@ -239,6 +255,7 @@ public class PublicInquiryController {
|
|
|
}
|
|
|
} else {
|
|
|
filter.setEnUU(en_uu);
|
|
|
+ logger.log("公共询价", "查询公共询价信息", "tel: " + user_tel, Constant.UU, en_uu, InquirySource.UU.name());
|
|
|
map.put("content", publicInquiryService.findTodoByPageInfo(pageInfo, filter).getContent());
|
|
|
return map;
|
|
|
}
|
|
|
@@ -272,6 +289,7 @@ public class PublicInquiryController {
|
|
|
if (null != _state) {
|
|
|
pageInfo = publicInquiryService.covert(pageInfo, _state);
|
|
|
}
|
|
|
+ logger.log("公共询价", "查询已转报价询价列表信息", "状态: " + _state == null ? "all" : _state, searchFilter.getUserUU(), searchFilter.getEnUU(), InquirySource.PLAIN.name());
|
|
|
return publicInquiryService.findByPageInfo(pageInfo, searchFilter);
|
|
|
}
|
|
|
|
|
|
@@ -284,6 +302,7 @@ public class PublicInquiryController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/messageList", method = RequestMethod.GET)
|
|
|
public List<InquiryMessage> getList(Long enuu, Integer size) {
|
|
|
+ logger.log("公共询价", "获取最新的公共询价", "大小: " + size, Constant.UU, enuu, InquirySource.PLAIN.name());
|
|
|
return publicInquiryService.getMessageList(enuu, size);
|
|
|
}
|
|
|
|
|
|
@@ -305,7 +324,8 @@ public class PublicInquiryController {
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/findInquiryById", method = RequestMethod.GET)
|
|
|
- public PurcInquiry findById(Long id) {
|
|
|
+ public PurcInquiry findById(Long id, Long enuu) {
|
|
|
+ logger.log("公共询价", "获取询价信息", "id: " + id, Constant.UU, enuu, InquirySource.PLAIN.name());
|
|
|
return publicInquiryService.findInquiryById(id);
|
|
|
}
|
|
|
}
|