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

Merge branch 'branch20211008'

Browse Source
This commit is contained in:
lijiarao
2021-10-27 09:16:41 +08:00
parent 199307bbf7 002d61c5f0
commit 32e3ffc4e6
10 changed files with 92 additions and 57 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-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/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
+9 -2
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);
}
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>