|
@@ -37,22 +37,26 @@ public class StmtController
|
|
|
@Autowired
|
|
|
private CampusService campusService;
|
|
|
|
|
|
- @RequestMapping(value = "/campus/list", method = RequestMethod.GET)
|
|
|
- public APIResult<Page<Campus>> search(CampusSearchDTO searchDTO) {
|
|
|
+ @RequestMapping(value = "/campus/page", method = RequestMethod.GET)
|
|
|
+ public APIResult<Page<Campus>> page(CampusSearchDTO searchDTO)
|
|
|
+ {
|
|
|
Campus campus = new Campus();
|
|
|
|
|
|
String name = searchDTO.getName();
|
|
|
- if (!StringUtils.isEmpty(name)) {
|
|
|
+ if (!StringUtils.isEmpty(name))
|
|
|
+ {
|
|
|
campus.setName("%" + name + "%");
|
|
|
}
|
|
|
|
|
|
String code = searchDTO.getCode();
|
|
|
- if (!StringUtils.isEmpty(code)) {
|
|
|
+ if (!StringUtils.isEmpty(code))
|
|
|
+ {
|
|
|
campus.setCode("%" + code + "%");
|
|
|
}
|
|
|
|
|
|
String merchantId = searchDTO.getMerchantId();
|
|
|
- if (!StringUtils.isEmpty(merchantId)) {
|
|
|
+ if (!StringUtils.isEmpty(merchantId))
|
|
|
+ {
|
|
|
campus.setMerchantId(merchantId);
|
|
|
}
|
|
|
|
|
@@ -61,7 +65,8 @@ public class StmtController
|
|
|
sort.put("gmtModified", BaseOrderEnum.DESC);
|
|
|
|
|
|
APIResult<Page<Campus>> apiResult = campusService.search(campus, searchDTO.getPageNo(), searchDTO.getPageSize(), sort);
|
|
|
- if (apiResult.getSuccess() && apiResult.getData() != null) {
|
|
|
+ if (apiResult.getSuccess() && apiResult.getData() != null)
|
|
|
+ {
|
|
|
List<Campus> campusList = apiResult.getData().getList();
|
|
|
setMerchantName(campusList);
|
|
|
|
|
@@ -70,17 +75,54 @@ public class StmtController
|
|
|
return apiResult;
|
|
|
}
|
|
|
|
|
|
+ @RequestMapping(value = "/campus/list", method = RequestMethod.GET)
|
|
|
+ public APIResult<List<Campus>> search(CampusSearchDTO searchDTO)
|
|
|
+ {
|
|
|
+ Campus campus = new Campus();
|
|
|
+
|
|
|
+ String name = searchDTO.getName();
|
|
|
+ if (!StringUtils.isEmpty(name))
|
|
|
+ {
|
|
|
+ campus.setName("%" + name + "%");
|
|
|
+ }
|
|
|
+
|
|
|
+ String code = searchDTO.getCode();
|
|
|
+ if (!StringUtils.isEmpty(code))
|
|
|
+ {
|
|
|
+ campus.setCode("%" + code + "%");
|
|
|
+ }
|
|
|
+
|
|
|
+ String merchantId = searchDTO.getMerchantId();
|
|
|
+ if (!StringUtils.isEmpty(merchantId))
|
|
|
+ {
|
|
|
+ campus.setMerchantId(merchantId);
|
|
|
+ }
|
|
|
+
|
|
|
+ // sort
|
|
|
+ LinkedHashMap<String, BaseOrderEnum> sort = new LinkedHashMap<>();
|
|
|
+ sort.put("gmtModified", BaseOrderEnum.DESC);
|
|
|
+
|
|
|
+ APIResult<List<Campus>> apiResult = campusService.find(campus,sort);
|
|
|
+
|
|
|
+ setMerchantName(apiResult.getData());
|
|
|
+
|
|
|
+ return apiResult;
|
|
|
+ }
|
|
|
+
|
|
|
@RequestMapping(method = RequestMethod.GET)
|
|
|
- public APIResult<List<Campus>> findByCondition(CampusSearchDTO searchDTO) {
|
|
|
+ public APIResult<List<Campus>> findByCondition(CampusSearchDTO searchDTO)
|
|
|
+ {
|
|
|
Campus campus = new Campus();
|
|
|
|
|
|
String name = searchDTO.getName();
|
|
|
- if (!StringUtils.isEmpty(name)) {
|
|
|
+ if (!StringUtils.isEmpty(name))
|
|
|
+ {
|
|
|
campus.setName("%" + name + "%");
|
|
|
}
|
|
|
|
|
|
String code = searchDTO.getCode();
|
|
|
- if (!StringUtils.isEmpty(code)) {
|
|
|
+ if (!StringUtils.isEmpty(code))
|
|
|
+ {
|
|
|
campus.setCode("%" + code + "%");
|
|
|
}
|
|
|
|
|
@@ -94,19 +136,23 @@ public class StmtController
|
|
|
|
|
|
@Transactional
|
|
|
@RequestMapping(method = RequestMethod.POST)
|
|
|
- public APIResult<Campus> create(@RequestBody @Valid CampusDTO campusDTO) {
|
|
|
+ public APIResult<Campus> create(@RequestBody @Valid CampusDTO campusDTO)
|
|
|
+ {
|
|
|
String merchantId = campusDTO.getMerchantId();
|
|
|
- if (StringUtils.isEmpty(merchantId)) {
|
|
|
+ if (StringUtils.isEmpty(merchantId))
|
|
|
+ {
|
|
|
return APIResult.error(UserServiceAPICode.error("缺少渠道id"));
|
|
|
}
|
|
|
|
|
|
Merchant merchant = merchantService.findOne(merchantId);
|
|
|
- if (merchant == null) {
|
|
|
+ if (merchant == null)
|
|
|
+ {
|
|
|
return APIResult.error(UserServiceAPICode.error("渠道不存在"));
|
|
|
}
|
|
|
|
|
|
String provinceCode = campusDTO.getProvinceCode();
|
|
|
- if (StringUtils.isEmpty(provinceCode)) {
|
|
|
+ if (StringUtils.isEmpty(provinceCode))
|
|
|
+ {
|
|
|
return APIResult.error(UserServiceAPICode.PARAMETER_ERROR);
|
|
|
}
|
|
|
|
|
@@ -114,7 +160,8 @@ public class StmtController
|
|
|
|
|
|
Integer serialNo = campusService.getSerialNo(merchantId, provinceCode);
|
|
|
StudentNo studentNo = StudentNumberUtil.getStudentNo(merchant.getCode(), provinceCode, serialNo);
|
|
|
- if (studentNo == null) {
|
|
|
+ if (studentNo == null)
|
|
|
+ {
|
|
|
return APIResult.error(UserServiceAPICode.CAMPUS_NO_ERROR);
|
|
|
}
|
|
|
|
|
@@ -123,7 +170,8 @@ public class StmtController
|
|
|
campusDTO.setCode(studentNo.getCampusNo());
|
|
|
|
|
|
APIResult<Campus> result = campusService.create(campusDTO);
|
|
|
- if (result.getSuccess()) {
|
|
|
+ if (result.getSuccess())
|
|
|
+ {
|
|
|
Campus campus = result.getData();
|
|
|
setMerchantName(campus);
|
|
|
}
|
|
@@ -134,12 +182,15 @@ public class StmtController
|
|
|
/**
|
|
|
* 判断是否贝尔安亲,湖南校区。
|
|
|
* 因湖南校区已达到最大限额,使用湖南新编号
|
|
|
+ *
|
|
|
* @param merchant
|
|
|
* @param provinceCode
|
|
|
* @return
|
|
|
*/
|
|
|
- private String converProvinceCode(Merchant merchant, String provinceCode) {
|
|
|
- if("6666".equals(merchant.getCode()) && provinceCode.equals(ProvinceUtil.HN_ORIGINAL)){
|
|
|
+ private String converProvinceCode(Merchant merchant, String provinceCode)
|
|
|
+ {
|
|
|
+ if ("6666".equals(merchant.getCode()) && provinceCode.equals(ProvinceUtil.HN_ORIGINAL))
|
|
|
+ {
|
|
|
provinceCode = ProvinceUtil.HN;
|
|
|
}
|
|
|
|
|
@@ -147,20 +198,24 @@ public class StmtController
|
|
|
}
|
|
|
|
|
|
@RequestMapping(value = "/ids", method = RequestMethod.GET)
|
|
|
- public APIResult<Map<String, Campus>> findByIds(@RequestParam("id") List<String> campusIds) {
|
|
|
+ public APIResult<Map<String, Campus>> findByIds(@RequestParam("id") List<String> campusIds)
|
|
|
+ {
|
|
|
Map<String, Campus> campusMap = campusService.getCampusMap(campusIds);
|
|
|
return APIResult.ok(campusMap);
|
|
|
}
|
|
|
|
|
|
@RequestMapping(method = RequestMethod.PUT)
|
|
|
- public APIResult<Campus> update(@RequestBody @Valid CampusDTO campusDTO) {
|
|
|
+ public APIResult<Campus> update(@RequestBody @Valid CampusDTO campusDTO)
|
|
|
+ {
|
|
|
String id = campusDTO.getId();
|
|
|
- if (StringUtils.isEmpty(id)) {
|
|
|
+ if (StringUtils.isEmpty(id))
|
|
|
+ {
|
|
|
return APIResult.error(UserServiceAPICode.PARAMETER_ERROR);
|
|
|
}
|
|
|
|
|
|
APIResult<Campus> result = campusService.update(campusDTO);
|
|
|
- if (result.getSuccess()) {
|
|
|
+ if (result.getSuccess())
|
|
|
+ {
|
|
|
Campus campus = result.getData();
|
|
|
setMerchantName(campus);
|
|
|
}
|
|
@@ -168,35 +223,42 @@ public class StmtController
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
- public void setMerchantName(List<Campus> campusList) {
|
|
|
- if (CollectionUtils.isEmpty(campusList)) {
|
|
|
+ public void setMerchantName(List<Campus> campusList)
|
|
|
+ {
|
|
|
+ if (CollectionUtils.isEmpty(campusList))
|
|
|
+ {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
Set<String> merchantIdSet = new HashSet<>();
|
|
|
campusList.forEach(campus -> merchantIdSet.add(campus.getMerchantId()));
|
|
|
|
|
|
- if (merchantIdSet.size() == 0) {
|
|
|
+ if (merchantIdSet.size() == 0)
|
|
|
+ {
|
|
|
return;
|
|
|
}
|
|
|
List<String> merchantIdList = new ArrayList<>();
|
|
|
merchantIdList.addAll(merchantIdSet);
|
|
|
Map<String, Merchant> merchantMap = merchantService.getMerchantMap(merchantIdList);
|
|
|
|
|
|
- for (Campus campus : campusList) {
|
|
|
+ for (Campus campus : campusList)
|
|
|
+ {
|
|
|
String merchantId = campus.getMerchantId();
|
|
|
Merchant merchant = merchantMap.get(merchantId);
|
|
|
campus.setMerchantName(merchant.getName());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- public void setMerchantName(Campus campus) {
|
|
|
- if (campus == null) {
|
|
|
+ public void setMerchantName(Campus campus)
|
|
|
+ {
|
|
|
+ if (campus == null)
|
|
|
+ {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
Merchant merchant = merchantService.findOne(campus.getMerchantId());
|
|
|
- if (merchant != null) {
|
|
|
+ if (merchant != null)
|
|
|
+ {
|
|
|
campus.setMerchantName(merchant.getName());
|
|
|
}
|
|
|
}
|