LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/branch20211008' into branch20211008

Browse Source
This commit is contained in:
梁琦涛
2021-10-27 18:13:25 +08:00
parent 199307bbf7 1c1f3d0aca
commit 320e348ba3
19 changed files with 212 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/AuthenticationUtils.java
+19 -1
View File
@@ -96,8 +96,9 @@ public class AuthenticationUtils {
public static void checkResult(String response) {
JSONObject jsonObject = JSONObject.parseObject(response);
String code = jsonObject.getString("code");
String message = jsonObject.getString("message");
if (!"200".equals(code)){
throw new JeroBootException("数据同步失败！");
throw new JeroBootException("数据同步失败！"+message);
}
}
@@ -136,4 +137,21 @@ public class AuthenticationUtils {
String post = HttpUtil.post(urlBuilder.toString(), paramMap);
checkResult(post);
}
/**
* 调用会员系统get接口
* @param methodName
*/
public static void get(String methodName, HashMap<String, Object> paramMap) {
Map<String, String> stringStringMap = encryptByRsaPriKey();
paramMap.put("pushToken", stringStringMap.get("token"));
paramMap.put("publicKey", stringStringMap.get("publicKey"));
//拼接url路径
StringBuilder urlBuilder = new StringBuilder(AuthenticationUtils.URL);
urlBuilder.append(methodName);
urlBuilder.append("?");
paramMap.forEach((k,v) -> urlBuilder.append(k).append("=").append(v).append("&"));
String get = HttpUtil.get(urlBuilder.toString());
checkResult(get);
}
}
jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/ValidUtil.java
+16
View File
@@ -66,6 +66,22 @@ public class ValidUtil {
return list;
}
/**
* 手动校验@Vaild并抛出异常信息list
*
* @param object 待校验对象
* @param groups 待校验的组
* @return errorList
*/
public static List<String> validateReturnListWithNum(Object object, int errorRowNum, Class<?>... groups){
List<String> list = new ArrayList<>();
Set<ConstraintViolation<Object>> set = validator.validate(object, groups);
for (ConstraintViolation<Object> constraintViolation : set) {
list.add("第" + errorRowNum + "行："+constraintViolation.getMessage());
}
return list;
}
/**
* @Description 校验全部数据格式
* @Author lqt
jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java
+4 -2
View File
@@ -77,12 +77,14 @@ public class SendMessageServiceImpl implements SendMessageService {
if(!Objects.isNull(map)) {
// 替换企业端系统url与小程序名称
// todo 替换系统地址，小程序名称
if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode())
if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG1.getCode())
||Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode())
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG3.getCode())
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG4.getCode())
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG6.getCode())
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG7.getCode())
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode())){
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode())
|| Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG13.getCode())){
map.put("systemAddress",env.getProperty("message.systemUrl"));
map.put("wxName",env.getProperty("message.wxName"));
}
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+33 -3
View File
@@ -17,6 +17,7 @@ import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.ImportExcelUtil;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.ValidUtil;
@@ -42,6 +43,7 @@ import com.jero.project.service.IPayWorkingGroupSubItemService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -632,19 +634,47 @@ public class PayContactsManagementController extends JeroController<PayContactsM
* @return
*/
@ApiOperation(value="联系人管理-通过id查询-会议对外开放接口", notes="联系人管理-通过id查询-会议对外开放接口")
@GetMapping(value = "/queryByIdGetContract")
public Result<?> queryByIdGetContract(@RequestParam(name="id") String id) {
PayContactsManagement payContactsManagement = payContactsManagementService.getById(id);
if (payContactsManagement == null) {
return Result.error("未找到对应数据");
}
if (!StringUtils.isBlank(payContactsManagement.getPhone())) {
payContactsManagement.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone()));
}
if (!StringUtils.isBlank(payContactsManagement.getEmail())) {
payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
}
return Result.OK(payContactsManagement);
}
/**
* 企业端通过id查询联系人信息
*
* @param id
* @return
*/
@ApiOperation(value="企业端-通过id查询联系人信息", notes="企业端-通过id查询联系人信息")
@GetMapping(value = "/queryByIdMeeting")
public Result<?> queryByIdMeeting(@RequestParam(name="id") String id) {
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
if(sysUser.getId().equals(id)) {
PayContactsManagement payContactsManagement = payContactsManagementService.getById(id);
if(payContactsManagement == null) {
if (payContactsManagement == null) {
return Result.error("未找到对应数据");
}
if (!StringUtils.isBlank(payContactsManagement.getPhone())){
if (!StringUtils.isBlank(payContactsManagement.getPhone())) {
payContactsManagement.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone()));
}
if (!StringUtils.isBlank(payContactsManagement.getEmail())){
if (!StringUtils.isBlank(payContactsManagement.getEmail())) {
payContactsManagement.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
}
return Result.OK(payContactsManagement);
}else{
return Result.OK("权限异常");
}
}
/**
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java
+2 -1
View File
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.enums.CompanyMessageEnums;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.base.controller.JeroController;
@@ -331,7 +332,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
@ApiOperation(value = "发布提醒", notes = "发布提醒")
@PostMapping(value = "/publishReminder")
public Result<?> publishReminder(@RequestBody PublishReminderVO publishReminderVO) {
payMeetingService.publishReminder(publishReminderVO);
payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG13,"C_OPEN_TYPE13");
return Result.OK();
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+23 -34
View File
@@ -246,29 +246,30 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*/
@RequiresPermissions("meeting:delete")
@AutoLog(value = "会议管理-通过id删除")
@ApiOperation(value = "会议管理-通过id删除", notes = "会议管理-通过id删除")
@GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id") String id) {
payMeetingService.deleteById(id);
return Result.OK("删除成功!");
}
///**
// * 通过id删除
//@RequiresPermissions("meeting:delete")
//@AutoLog(value = "会议管理-通过id删除")
//@ApiOperation(value = "会议管理-通过id删除", notes = "会议管理-通过id删除")
//@GetMapping(value = "/delete")
//public Result<?> delete(@RequestParam(name = "id") String id) {
// payMeetingService.deleteById(id);
// return Result.OK("删除成功!");
//}*/
/**
* 批量删除
*/
@RequiresPermissions("meeting:batchDel")
@AutoLog(value = "会议管理-批量删除")
@ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除")
@GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
this.payMeetingService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
///**
// * 批量删除
// */
//@RequiresPermissions("meeting:batchDel")
//@AutoLog(value = "会议管理-批量删除")
//@ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除")
//@GetMapping(value = "/deleteBatch")
//public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
// this.payMeetingService.deleteByIds(Arrays.asList(ids.split(",")));
// return Result.OK("批量删除成功!");
//}
/**
* 通过id查询
@@ -426,18 +427,6 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
return Result.OK("上传资料成功!");
}
/**
* 发布提醒
*/
@AutoLog("发布提醒")
@RequiresPermissions("meeting:publish")
@ApiOperation(value = "发布提醒", notes = "发布提醒")
@PostMapping(value = "/publishReminder")
public Result<?> publishReminder(@RequestBody PublishReminderVO publishReminderVO) {
payMeetingService.publishReminder(publishReminderVO);
return Result.OK();
}
@ApiOperation(value = "生成base64")
@GetMapping(value = "/createBase64")
@ApiImplicitParam(name = "contact", value = "内容", required = true, paramType = "query")
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java
+27
View File
@@ -45,6 +45,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -145,8 +146,21 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
@AutoLog(value = "会议管理-通过id删除")
@ApiOperation(value = "会议管理-通过id删除", notes = "会议管理-通过id删除")
@GetMapping(value = "/delete")
@Transactional
public Result<?> delete(@RequestParam(name = "id") String id) {
extracted(id);
payMeetingService.deleteById(id);
HashMap<String, Object> paramMap = new HashMap<>();
paramMap.put("id",id);
AuthenticationUtils.get("/stablecrosstraining/stableCrossTraining/deleteIncome",paramMap);
return Result.OK("删除成功!");
}
/**
* 会员系统删除会议
*/
@GetMapping(value = "/deleteStandard")
public Result<?> deleteStandard(@RequestParam(name = "id") String id) {
payMeetingService.deleteById(id);
return Result.OK("删除成功!");
}
@@ -158,12 +172,25 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
@AutoLog(value = "会议管理-批量删除")
@ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除")
@GetMapping(value = "/deleteBatch")
@Transactional
public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
List<String> idList = Arrays.asList(ids.split(","));
for (String id : idList) {
extracted(id);
}
this.payMeetingService.deleteByIds(idList);
HashMap<String, Object> paramMap = new HashMap<>();
paramMap.put("ids",ids);
AuthenticationUtils.get("/stablecrosstraining/stableCrossTraining/deleteBatchIncome",paramMap);
return Result.OK("批量删除成功!");
}
/**
* 会员系统删除会议
*/
@GetMapping(value = "/deleteBatchStandard")
public Result<?> deleteBatchStandard(@RequestParam(name = "ids") String ids) {
this.payMeetingService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java
+2 -1
View File
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.enums.CompanyMessageEnums;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.base.controller.JeroController;
@@ -332,7 +333,7 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
@ApiOperation(value = "发布提醒", notes = "发布提醒")
@PostMapping(value = "/publishReminder")
public Result<?> publishReminder(@RequestBody PublishReminderVO publishReminderVO) {
payMeetingService.publishReminder(publishReminderVO);
payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG1,"C_OPEN_TYPE1");
return Result.OK();
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java
+2 -2
View File
@@ -3,6 +3,7 @@ package com.jero.meeting.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.enums.CompanyMessageEnums;
import com.jero.meeting.entity.PayMeeting;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.meeting.vo.PayMeetingVO;
@@ -61,9 +62,8 @@ public interface IPayMeetingService extends IService<PayMeeting> {
* @param publishReminderVO
* @author lijiarao
* @date 2021/9/27
* @return void
*/
void publishReminder(PublishReminderVO publishReminderVO);
void publishReminder(PublishReminderVO publishReminderVO, CompanyMessageEnums companyMessageEnums, String busType);
IPage<PayMeeting> pageListContract(Page<PayMeeting> page, QueryWrapper<PayMeeting> queryWrapper, String now);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+3 -13
View File
@@ -385,10 +385,6 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
if (integer > 0) {
throw new JeroBootException("该会议有参会人无法删除");
}
PayMeeting payMeeting = getById(id);
if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
stableCrossTrainingService.delete(id);
}
removeById(id);
LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayMeetingHotelContacts::getMeetingId, id);
@@ -411,12 +407,6 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
if (meetingList.size() > 0) {
throw new JeroBootException(meetingList + "会议下有参会人，无法删除");
}
for (String id : ids) {
PayMeeting payMeeting = getById(id);
if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
stableCrossTrainingService.delete(id);
}
}
removeByIds(ids);
LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
wrapper.in(PayMeetingHotelContacts::getMeetingId, ids);
@@ -441,7 +431,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
@Override
@Transactional
public void publishReminder(PublishReminderVO publishReminderVO) {
public void publishReminder(PublishReminderVO publishReminderVO,CompanyMessageEnums companyMessageEnums,String busType) {
List<String> meetingIds = publishReminderVO.getMeetingIds();
List<String> subitemIds = publishReminderVO.getSubitemIds();
Integer projectType = publishReminderVO.getProjectType();
@@ -532,9 +522,9 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
sendMessageDTO.setPhone(PasswordUtil.decrypt(phone));
sendMessageDTO.setFromUser(director.getUsername());
sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG1.getCode());
sendMessageDTO.setTemplateCode(companyMessageEnums.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("C_OPEN_TYPE1");
sendMessageDTO.setBusType(busType);
JSONObject jsonObject = new JSONObject();
jsonObject.put("id", meetingId);
sendMessageDTO.setBusId(jsonObject.toJSONString());
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+10 -3
View File
@@ -674,7 +674,15 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
@Override
public void editTerminal(PayMeetingSituationVO payMeetingSituationVO) {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String id = payMeetingSituationVO.getId();
PayMeetingSituation payMeetingSituation1 = getById(id);
String meetingId = payMeetingSituation1.getMeetingId();
String loginUserId = loginUser.getId();
//参会人id不是自己
if (!Objects.equals(payMeetingSituation1.getCompanyContactId(), loginUserId)) {
throw new JeroBootException("不是参会人无法上传缴费凭证");
}
String paymentRecord = payMeetingSituationVO.getPaymentRecord();
String orderCode = payMeetingSituationVO.getOrderCode();
PayMeetingSituation payMeetingSituation = new PayMeetingSituation();
@@ -683,8 +691,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
payMeetingSituation.setOrderCode(orderCode);
updateById(payMeetingSituation);
PayMeetingSituation payMeetingSituation1 = getById(id);
String meetingId = payMeetingSituation1.getMeetingId();
PayMeeting payMeeting = meetingService.getById(meetingId);
SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
}
@@ -863,7 +870,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
}
}
if (!validateReturnList.isEmpty()){
throw new JeroBootException(StringUtils.strip(validateReturnList.toString(),"[]"));
throw new JeroBootException(StringUtils.join(validateReturnList,"，"));
}
}
BeanUtils.copyProperties(internationalGuestVO, payMeetingSituation1);
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
+21 -21
View File
@@ -217,47 +217,47 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
}
int errorRowNum = 2;
List<String> errorMessage = new ArrayList<>();
//来款方式
List<DictModel> paymentType = sysBaseAPI.queryDictItemsByCode("payment_type");
Map<String, String> paymentTypeMap = paymentType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue));
//需要发票
List<DictModel> invoiceType = sysBaseAPI.queryDictItemsByCode("invoice_type");
Map<String, String> invoiceTypeMap = invoiceType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue));
for (Object obj : excelData) {
errorRowNum += 1;
//复制属性
PayMemberProjectSubitemExcel projectSubitemExcel = (PayMemberProjectSubitemExcel) obj;
projectSubitemExcel.setProjectId(projectId);
PayMemberProjectSubitem projectSubitem = new PayMemberProjectSubitem();
errorMessage.addAll(ValidUtil.validateReturnListWithNum(projectSubitemExcel,errorRowNum));
//应收金额
String amountReceivable = projectSubitemExcel.getAmountReceivable();
if (!NumberUtil.isNumber(amountReceivable)) {
errorMessage.add("第" + errorRowNum + "行：应收金额格式错误");
} else {
if (errorMessage.isEmpty()) {
projectSubitem.setAmountReceivable(new BigDecimal(amountReceivable));
}
//来款方式
List<DictModel> paymentType = sysBaseAPI.queryDictItemsByCode("payment_type");
Map<String, String> paymentTypeMap = paymentType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue));
String paymentMethod = projectSubitemExcel.getPaymentMethod();
if (StringUtils.isBlank(paymentMethod)){
errorMessage.add("第" + errorRowNum + "行：来款方式不能为空");
}else if (paymentTypeMap.containsKey(paymentMethod)) {
projectSubitem.setPaymentMethod(Integer.parseInt(paymentTypeMap.get(paymentMethod)));
} else {
errorMessage.add("第" + errorRowNum + "行：来款方式不符合规范");
if (errorMessage.isEmpty()) {
if (paymentTypeMap.containsKey(paymentMethod)) {
projectSubitem.setPaymentMethod(Integer.parseInt(paymentTypeMap.get(paymentMethod)));
} else {
errorMessage.add("第" + errorRowNum + "行：来款方式格式错误");
}
}
//需要发票
List<DictModel> invoiceType = sysBaseAPI.queryDictItemsByCode("invoice_type");
Map<String, String> invoiceTypeMap = invoiceType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue));
String needInvoice = projectSubitemExcel.getNeedInvoice();
if (StringUtils.isBlank(needInvoice)){
errorMessage.add("第" + errorRowNum + "行：需要发票不能为空");
}else if (invoiceTypeMap.containsKey(needInvoice)) {
projectSubitem.setNeedInvoice(Integer.parseInt(invoiceTypeMap.get(needInvoice)));
} else {
errorMessage.add("第" + errorRowNum + "行：需要发票不符合规范");
if (errorMessage.isEmpty()) {
if (invoiceTypeMap.containsKey(needInvoice)) {
projectSubitem.setNeedInvoice(Integer.parseInt(invoiceTypeMap.get(needInvoice)));
} else {
errorMessage.add("第" + errorRowNum + "行：需要发票不符合规范");
}
}
//复制属性
BeanUtils.copyProperties(projectSubitemExcel, projectSubitem);
try {
ValidUtil.validate(projectSubitem);
//ValidUtil.validate(projectSubitem);
memberProjectSubitemService.add(projectSubitem);
} catch (JeroBootException e) {
errorMessage.add("第" + errorRowNum + "行：" + e.getMessage());
jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java
+2 -2
View File
@@ -115,7 +115,7 @@ public class PayMemberProjectSubitem implements Serializable {
/**
* 企业联系人临时id
*/
@Excel(name = "企业联系人名称", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "2")
@Excel(name = "企业联系人", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "2")
private String companyContactTemporaryId;
/**
@@ -134,7 +134,7 @@ public class PayMemberProjectSubitem implements Serializable {
/**
* 邮寄联系人临时id
*/
@Excel(name = "邮寄联系人姓名", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "3")
@Excel(name = "邮寄联系人", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "3")
private String postContactTemporaryId;
/**
jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java
+36 -24
View File
@@ -29,14 +29,12 @@ import com.jero.member.service.IPayMemberProjectService;
import com.jero.member.service.IPayMemberProjectSubitemService;
import com.jero.valid.group.ChargeNotice;
import com.jero.valid.group.Contract;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
@@ -212,38 +210,52 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
* @param payMemberProjectSubitem 会员项目成员
*/
public void validMemberProjectSubitemAdd(PayMemberProjectSubitem payMemberProjectSubitem) {
List<String> errors = new ArrayList<>();
// 企业
PayCompanyManagementTemporary chargeCompanyName = companyManagementTemporaryService.insertCompanyManagementTemporary(payMemberProjectSubitem.getCompanyId());
if(Objects.isNull(chargeCompanyName)){
throw new JeroBootException("企业名称为空！");
try {
PayCompanyManagementTemporary chargeCompanyName = companyManagementTemporaryService.insertCompanyManagementTemporary(payMemberProjectSubitem.getCompanyId());
if (Objects.isNull(chargeCompanyName)) {
throw new JeroBootException("企业名称为空！");
}
payMemberProjectSubitem.setCompanyTemporaryId(chargeCompanyName.getId());
payMemberProjectSubitem.setCompanyName(chargeCompanyName.getCompanyName());
} catch (JeroBootException e) {
errors.add("会员单位不存在");
}
payMemberProjectSubitem.setCompanyTemporaryId(chargeCompanyName.getId());
payMemberProjectSubitem.setCompanyName(chargeCompanyName.getCompanyName());
// 联系人
PayContactsManagementTemporary contactsName = contactsManagementTemporaryService.insertContactsManagementTemporary(payMemberProjectSubitem.getCompanyContactId());
if(Objects.isNull(contactsName)){
throw new JeroBootException("联系人名称为空！");
try {
PayContactsManagementTemporary contactsName = contactsManagementTemporaryService.insertContactsManagementTemporary(payMemberProjectSubitem.getCompanyContactId());
if (Objects.isNull(contactsName)) {
throw new JeroBootException("联系人名称为空！");
}
payMemberProjectSubitem.setCompanyContactTemporaryId(contactsName.getId());
payMemberProjectSubitem.setCompanyContactName(contactsName.getName());
} catch (JeroBootException e) {
errors.add("企业联系人不存在");
}
payMemberProjectSubitem.setCompanyContactTemporaryId(contactsName.getId());
payMemberProjectSubitem.setCompanyContactName(contactsName.getName());
// 联系人
PayContactsManagementTemporary postContactsName = contactsManagementTemporaryService.insertContactsManagementTemporary(payMemberProjectSubitem.getPostContactId());
if(Objects.isNull(postContactsName)){
throw new JeroBootException("邮寄联系人为空！");
try {
// 联系人
PayContactsManagementTemporary postContactsName = contactsManagementTemporaryService.insertContactsManagementTemporary(payMemberProjectSubitem.getPostContactId());
if (Objects.isNull(postContactsName)) {
throw new JeroBootException("邮寄联系人为空！");
}
payMemberProjectSubitem.setPostContactTemporaryId(postContactsName.getId());
payMemberProjectSubitem.setPostContactName(postContactsName.getName());
} catch (JeroBootException e) {
errors.add("邮寄联系人不存在");
}
payMemberProjectSubitem.setPostContactTemporaryId(postContactsName.getId());
payMemberProjectSubitem.setPostContactName(postContactsName.getName());
if (!errors.isEmpty()) {
throw new JeroBootException(StringUtils.join(errors, "，"));
}
//校验来款方式
Integer paymentMethod = payMemberProjectSubitem.getPaymentMethod();
//合同
if (Objects.equals(paymentMethod,2)){
if (Objects.equals(paymentMethod, 2)) {
ValidUtil.validate(payMemberProjectSubitem, Contract.class);
}
//收费通知
if (Objects.equals(paymentMethod,3)){
if (Objects.equals(paymentMethod, 3)) {
ValidUtil.validate(payMemberProjectSubitem, ChargeNotice.class);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/member/vo/PayMemberProjectSubitemExcel.java
+6 -4
View File
@@ -40,7 +40,7 @@ public class PayMemberProjectSubitemExcel {
/**
* 企业联系人id
*/
@Excel(name = "企业联系人名称", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id",orderNum = "2")
@Excel(name = "企业联系人", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id",orderNum = "2")
@ApiModelProperty(value = "企业联系人id")
@NotBlank(message = "企业联系人不能为空")
@Size(max = 50, message = "企业联系人最大为50字符")
@@ -49,7 +49,7 @@ public class PayMemberProjectSubitemExcel {
/**
* 邮寄联系人id
*/
@Excel(name = "邮寄联系人姓名", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id",orderNum = "3")
@Excel(name = "邮寄联系人", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id",orderNum = "3")
@ApiModelProperty(value = "邮寄联系人id")
@NotBlank(message = "邮寄联系人不能为空")
private String postContactId;
@@ -59,8 +59,8 @@ public class PayMemberProjectSubitemExcel {
*/
@Excel(name = "应收金额", width = 15,orderNum = "4")
@ApiModelProperty(value = "应收金额")
@NotNull(message = "应收金额不能为空")
@DecimalMax(value = "9999999999.99", message = "应收金额格式错误")
@NotBlank(message = "应收金额不能为空")
@Pattern(regexp = "^[0-9]{1,10}(\\.[0-9]{1,2})?$",message = "应收金额格式错误")
private String amountReceivable;
@@ -69,6 +69,7 @@ public class PayMemberProjectSubitemExcel {
*/
@Excel(name = "来款方式", width = 15, orderNum = "7")
@ApiModelProperty(value = "来款方式(2:合同，3:收费通知)")
@NotBlank(message = "来款方式不能为空")
private String paymentMethod;
/**
@@ -109,6 +110,7 @@ public class PayMemberProjectSubitemExcel {
*/
@Excel(name = "需要发票", width = 15, orderNum = "6")
@ApiModelProperty(value = "需要发票")
@NotBlank(message = "需要发票不能为空")
private String needInvoice;
}
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java
+2 -2
View File
@@ -404,7 +404,7 @@ public class SysDepartController {
//导入Excel格式校验，看匹配的字段文本概率
Boolean t = ExcelImportCheckUtil.check(file.getInputStream(), SysDepartExcel.class, params,1.0);
if(!t){
return Result.error("文件格式有误,请下载模板后上传 ！");
return Result.error("文件格式有误！");
}
try {
// orgCode编码长度
@@ -443,7 +443,7 @@ public class SysDepartController {
try {
List<String> errorList = ValidUtil.validateReturnList(sysDepart);
if (!errorList.isEmpty()){
errorMessage.add("第 " + lineNumber + " 行："+ StringUtils.strip(errorList.toString(),"[]"));
errorMessage.add("第 " + lineNumber + " 行："+ StringUtils.join(errorList,"，"));
}
LambdaQueryWrapper<SysDepart> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SysDepart::getDepartName,sysDepart.getDepartName());
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+1 -1
View File
@@ -773,7 +773,7 @@ public class SysUserController {
List<String> errorList = ValidUtil.validateReturnList(sysUser);
if (!errorList.isEmpty()){
errorLines++;
errorMessage.add("第 " + lineNumber + " 行："+ StringUtils.strip(errorList.toString(),"[]"));
errorMessage.add("第 " + lineNumber + " 行："+ StringUtils.join(errorList,"，"));
}
//处理邮箱和手机号的加密
UserUtil.encryptUser(sysUser);
jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserRoleMapper.java
+2 -2
View File
@@ -16,10 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
@Select("select role_code from sys_role where id in (select role_id from sys_user_role where user_id = (select id from sys_user where username=#{username}))")
@Select("select role_code from sys_role where id in (select role_id from sys_user_role where user_id = (select id from sys_user where username=#{username} and del_flag = 0))")
List<String> getRoleByUserName(@Param("username") String username);
@Select("select id from sys_role where id in (select role_id from sys_user_role where user_id = (select id from sys_user where username=#{username}))")
@Select("select id from sys_role where id in (select role_id from sys_user_role where user_id = (select id from sys_user where username=#{username} and del_flag = 0))")
List<String> getRoleIdByUserName(@Param("username") String username);
}
pom.xml
+1 -1
View File
@@ -42,7 +42,7 @@
<justauth-spring-boot-starter.version>1.3.4</justauth-spring-boot-starter.version>
<dom4j.version>1.6.1</dom4j.version>
<qiniu-java-sdk.version>7.4.0</qiniu-java-sdk.version>
<tomcat.version>9.0.48</tomcat.version>
<tomcat.version>9.0.54</tomcat.version>
</properties>
<modules>