|
@@ -36,9 +36,11 @@ import com.goafanti.common.enums.DemandImportFields;
|
|
|
import com.goafanti.common.enums.DemandOrderStatus;
|
|
import com.goafanti.common.enums.DemandOrderStatus;
|
|
|
import com.goafanti.common.enums.DemandReleaseStatus;
|
|
import com.goafanti.common.enums.DemandReleaseStatus;
|
|
|
import com.goafanti.common.enums.DemandSwitchSign;
|
|
import com.goafanti.common.enums.DemandSwitchSign;
|
|
|
|
|
+import com.goafanti.common.enums.MarketingPage;
|
|
|
import com.goafanti.common.model.AftFile;
|
|
import com.goafanti.common.model.AftFile;
|
|
|
import com.goafanti.common.model.Demand;
|
|
import com.goafanti.common.model.Demand;
|
|
|
import com.goafanti.common.model.DemandOrder;
|
|
import com.goafanti.common.model.DemandOrder;
|
|
|
|
|
+import com.goafanti.common.model.MarketingManagement;
|
|
|
import com.goafanti.common.utils.LoggerUtils;
|
|
import com.goafanti.common.utils.LoggerUtils;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
@@ -46,6 +48,7 @@ import com.goafanti.demand.bo.DemandImportBo;
|
|
|
import com.goafanti.demand.bo.InputDemand;
|
|
import com.goafanti.demand.bo.InputDemand;
|
|
|
import com.goafanti.demand.service.DemandOrderService;
|
|
import com.goafanti.demand.service.DemandOrderService;
|
|
|
import com.goafanti.demand.service.DemandService;
|
|
import com.goafanti.demand.service.DemandService;
|
|
|
|
|
+import com.goafanti.marketing.service.MarketingManagementService;
|
|
|
import com.goafanti.user.service.UserService;
|
|
import com.goafanti.user.service.UserService;
|
|
|
|
|
|
|
|
@RestController
|
|
@RestController
|
|
@@ -59,7 +62,8 @@ public class AdminDemandApiController extends CertifyApiController {
|
|
|
private AftFileService aftFileService;
|
|
private AftFileService aftFileService;
|
|
|
@Resource
|
|
@Resource
|
|
|
private DemandOrderService demandOrderService;
|
|
private DemandOrderService demandOrderService;
|
|
|
-
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private MarketingManagementService marketingManagementService;
|
|
|
/**
|
|
/**
|
|
|
* 科技需求匹配科技成果
|
|
* 科技需求匹配科技成果
|
|
|
*/
|
|
*/
|
|
@@ -192,7 +196,7 @@ public class AdminDemandApiController extends CertifyApiController {
|
|
|
public Result userList(String employerName, Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
|
|
public Result userList(String employerName, Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
|
|
|
Integer infoSources, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
|
|
Integer infoSources, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
|
|
|
String username, Integer status, Integer releaseStatus, String releaseDateStartDate,
|
|
String username, Integer status, Integer releaseStatus, String releaseDateStartDate,
|
|
|
- String releaseDateEndDate, String pageNo, String pageSize) {
|
|
|
|
|
|
|
+ String releaseDateEndDate, String pageNo, String pageSize,Integer boutique,Integer hot) {
|
|
|
Result res = new Result();
|
|
Result res = new Result();
|
|
|
Integer pNo = 1;
|
|
Integer pNo = 1;
|
|
|
Integer pSize = 10;
|
|
Integer pSize = 10;
|
|
@@ -205,7 +209,7 @@ public class AdminDemandApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
res.setData(demandService.selectUserDemandManageList(employerName, auditStatus, province, serialNumber, name, keyword,
|
|
res.setData(demandService.selectUserDemandManageList(employerName, auditStatus, province, serialNumber, name, keyword,
|
|
|
infoSources, demandType, validityPeriodStartDate, validityPeriodEndDate, username, status,
|
|
infoSources, demandType, validityPeriodStartDate, validityPeriodEndDate, username, status,
|
|
|
- releaseStatus, releaseDateStartDate, releaseDateEndDate, pNo, pSize));
|
|
|
|
|
|
|
+ releaseStatus, releaseDateStartDate, releaseDateEndDate, pNo, pSize,boutique,hot));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -216,7 +220,7 @@ public class AdminDemandApiController extends CertifyApiController {
|
|
|
public Result orgList(String employerName, Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
|
|
public Result orgList(String employerName, Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
|
|
|
Integer infoSources, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
|
|
Integer infoSources, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
|
|
|
String unitName, Integer status, Integer releaseStatus, String releaseDateStartDate,
|
|
String unitName, Integer status, Integer releaseStatus, String releaseDateStartDate,
|
|
|
- String releaseDateEndDate, String pageNo, String pageSize) {
|
|
|
|
|
|
|
+ String releaseDateEndDate, String pageNo, String pageSize,Integer boutique,Integer hot) {
|
|
|
Result res = new Result();
|
|
Result res = new Result();
|
|
|
Integer pNo = 1;
|
|
Integer pNo = 1;
|
|
|
Integer pSize = 10;
|
|
Integer pSize = 10;
|
|
@@ -229,7 +233,7 @@ public class AdminDemandApiController extends CertifyApiController {
|
|
|
}
|
|
}
|
|
|
res.setData(demandService.selectOrgDemandManageList(employerName, auditStatus, province, serialNumber, name, keyword,
|
|
res.setData(demandService.selectOrgDemandManageList(employerName, auditStatus, province, serialNumber, name, keyword,
|
|
|
infoSources, demandType, validityPeriodStartDate, validityPeriodEndDate, unitName, status,
|
|
infoSources, demandType, validityPeriodStartDate, validityPeriodEndDate, unitName, status,
|
|
|
- releaseStatus, releaseDateStartDate, releaseDateEndDate, pNo, pSize));
|
|
|
|
|
|
|
+ releaseStatus, releaseDateStartDate, releaseDateEndDate, pNo, pSize,boutique,hot));
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -239,7 +243,7 @@ public class AdminDemandApiController extends CertifyApiController {
|
|
|
@RequestMapping(value = "/apply", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/apply", method = RequestMethod.POST)
|
|
|
public Result userApply(@Valid InputDemand demand, BindingResult bindingResult,
|
|
public Result userApply(@Valid InputDemand demand, BindingResult bindingResult,
|
|
|
@RequestParam(name = "keywords[]", required = false) String[] keywords,
|
|
@RequestParam(name = "keywords[]", required = false) String[] keywords,
|
|
|
- String validityPeriodFormattedDate) {
|
|
|
|
|
|
|
+ String validityPeriodFormattedDate,String coverImg,Integer hot) {
|
|
|
Result res = new Result();
|
|
Result res = new Result();
|
|
|
if (bindingResult.hasErrors()) {
|
|
if (bindingResult.hasErrors()) {
|
|
|
res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
@@ -256,10 +260,25 @@ public class AdminDemandApiController extends CertifyApiController {
|
|
|
if (!res.getError().isEmpty()) {
|
|
if (!res.getError().isEmpty()) {
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
Demand d = new Demand();
|
|
Demand d = new Demand();
|
|
|
BeanUtils.copyProperties(demand, d);
|
|
BeanUtils.copyProperties(demand, d);
|
|
|
demandService.saveUserDemand(d, validityPeriodFormattedDate, keywords);
|
|
demandService.saveUserDemand(d, validityPeriodFormattedDate, keywords);
|
|
|
|
|
+ if (null != hot && hot == 1) { // 属于营销活动
|
|
|
|
|
+ int marketHisCount = marketingManagementService.getMarketingCount(MarketingPage.mainDemand.getPageUrl(),
|
|
|
|
|
+ MarketingPage.mainDemand.getBoothType(), 1);
|
|
|
|
|
+ if (marketHisCount >= MarketingPage.mainDemand.getBoothSize()) { // 展位已满
|
|
|
|
|
+ res.getError().add(buildError(ErrorConstants.MARKET_BOOTH_MAX, "",marketHisCount));
|
|
|
|
|
+ return res;
|
|
|
|
|
+ } else { // 保存营销记录
|
|
|
|
|
+ MarketingManagement mm = new MarketingManagement();
|
|
|
|
|
+ mm.setShowPage(MarketingPage.mainDemand.getPageUrl()); // 营销页面
|
|
|
|
|
+ mm.setCategory(MarketingPage.mainDemand.getBoothType()); // 营销分类
|
|
|
|
|
+ if (StringUtils.isNotBlank(coverImg)) mm.setCoverImg(coverImg);
|
|
|
|
|
+ mm.setProductId(d.getId());
|
|
|
|
|
+ mm.setEffective(1);
|
|
|
|
|
+ marketingManagementService.save(mm);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -328,7 +347,7 @@ public class AdminDemandApiController extends CertifyApiController {
|
|
|
|
|
|
|
|
AttachmentType attachmentType = AttachmentType.getField(sign);
|
|
AttachmentType attachmentType = AttachmentType.getField(sign);
|
|
|
|
|
|
|
|
- if (attachmentType == AttachmentType.DEMAND_PICTURE) {
|
|
|
|
|
|
|
+ if (attachmentType == AttachmentType.DEMAND_PICTURE|| attachmentType == AttachmentType.DEMAND_COVER_PICTURE) {
|
|
|
res.setData(handleFiles(res, "/demand/", false, req, sign, uid));
|
|
res.setData(handleFiles(res, "/demand/", false, req, sign, uid));
|
|
|
} else {
|
|
} else {
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "附件标示"));
|
|
@@ -365,7 +384,7 @@ public class AdminDemandApiController extends CertifyApiController {
|
|
|
@RequestMapping(value = "/update", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/update", method = RequestMethod.POST)
|
|
|
public Result updateUser(@Valid InputDemand demand, BindingResult bindingResult, Integer switchSign,
|
|
public Result updateUser(@Valid InputDemand demand, BindingResult bindingResult, Integer switchSign,
|
|
|
@RequestParam(name = "keywords[]", required = false) String[] keywords,
|
|
@RequestParam(name = "keywords[]", required = false) String[] keywords,
|
|
|
- String validityPeriodFormattedDate) {
|
|
|
|
|
|
|
+ String validityPeriodFormattedDate,String coverImg,Integer hot) {
|
|
|
Result res = new Result();
|
|
Result res = new Result();
|
|
|
if (bindingResult.hasErrors()) {
|
|
if (bindingResult.hasErrors()) {
|
|
|
res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
res.getError().add(buildErrorByMsg(bindingResult.getFieldError().getDefaultMessage(),
|
|
@@ -404,6 +423,44 @@ public class AdminDemandApiController extends CertifyApiController {
|
|
|
Demand d = new Demand();
|
|
Demand d = new Demand();
|
|
|
BeanUtils.copyProperties(demand, d);
|
|
BeanUtils.copyProperties(demand, d);
|
|
|
res.setData(demandService.updateUserDemand(d, validityPeriodFormattedDate, keywords, switchSign));
|
|
res.setData(demandService.updateUserDemand(d, validityPeriodFormattedDate, keywords, switchSign));
|
|
|
|
|
+ // 更新营销活动
|
|
|
|
|
+ MarketingManagement mm = marketingManagementService.selectMarket(MarketingPage.mainDemand.getPageUrl(),
|
|
|
|
|
+ MarketingPage.mainDemand.getBoothType(), d.getId());
|
|
|
|
|
+ if (null != mm) {
|
|
|
|
|
+ if(mm.getEffective() == 1){
|
|
|
|
|
+ if (null != coverImg) mm.setCoverImg(coverImg);
|
|
|
|
|
+ if (null != hot) mm.setEffective(hot);
|
|
|
|
|
+ marketingManagementService.update(mm);
|
|
|
|
|
+ }else if(mm.getEffective() == 0){
|
|
|
|
|
+ int marketHisCount = marketingManagementService.getMarketingCount(
|
|
|
|
|
+ MarketingPage.mainDemand.getPageUrl(), MarketingPage.mainDemand.getBoothType(), 1);
|
|
|
|
|
+ if (marketHisCount >= MarketingPage.mainDemand.getBoothSize()) { // 展位已满
|
|
|
|
|
+ res.getError().add(buildError(ErrorConstants.MARKET_BOOTH_MAX,"", marketHisCount));
|
|
|
|
|
+ return res;
|
|
|
|
|
+ }else{
|
|
|
|
|
+ if (null != hot) mm.setEffective(hot);
|
|
|
|
|
+ if (null != coverImg) mm.setCoverImg(coverImg);
|
|
|
|
|
+ marketingManagementService.update(mm);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ } else {
|
|
|
|
|
+ if (null != hot && hot == 1) { // 属于营销活动
|
|
|
|
|
+ int marketHisCount = marketingManagementService.getMarketingCount(
|
|
|
|
|
+ MarketingPage.mainDemand.getPageUrl(), MarketingPage.mainDemand.getBoothType(), 1);
|
|
|
|
|
+ if (marketHisCount >= MarketingPage.mainDemand.getBoothSize()) { // 展位已满
|
|
|
|
|
+ res.getError().add(buildError(ErrorConstants.MARKET_BOOTH_MAX,"", marketHisCount));
|
|
|
|
|
+ return res;
|
|
|
|
|
+ } else { // 保存营销记录
|
|
|
|
|
+ mm = new MarketingManagement();
|
|
|
|
|
+ mm.setShowPage(MarketingPage.mainDemand.getPageUrl()); // 营销页面
|
|
|
|
|
+ mm.setCategory(MarketingPage.mainDemand.getBoothType()); // 营销分类
|
|
|
|
|
+ if (StringUtils.isNotBlank(coverImg)) mm.setCoverImg(coverImg);
|
|
|
|
|
+ mm.setProductId(d.getId());
|
|
|
|
|
+ mm.setEffective(1);
|
|
|
|
|
+ marketingManagementService.save(mm);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -467,6 +524,7 @@ public class AdminDemandApiController extends CertifyApiController {
|
|
|
return res;
|
|
return res;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ marketingManagementService.deleteByProductId(Arrays.asList(ids));
|
|
|
res.setData(demandService.deleteByPrimaryKey(Arrays.asList(ids)));
|
|
res.setData(demandService.deleteByPrimaryKey(Arrays.asList(ids)));
|
|
|
}
|
|
}
|
|
|
return res;
|
|
return res;
|