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

Merge remote-tracking branch 'origin/master' into 22年七月工作

Browse Source 
# Conflicts:
#	jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java
#	jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
This commit is contained in:
lijiarao
2022-08-08 09:48:50 +08:00
parent d53adee4a7 bd63856f3d
commit 305de4cb9b
45 changed files with 1535 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
+40
View File
@@ -460,4 +460,44 @@ public class PayMeetingSituation implements Serializable {
@TableField(exist = false)
@Dict(dicCode = "sign_up_status")
private Integer signUpStatus;
@ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））")
private Integer affirmIncome;
/**确认金额税额*/
@ApiModelProperty(value = "确认金额税额")
@DecimalMax(value = "9999999999.99",message = "确认金额税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal confirmTax;
/**确认金额未税*/
@ApiModelProperty(value = "确认金额未税")
@DecimalMax(value = "9999999999.99",message = "确认金额未税")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal confirmNoTaxAmount;
/**到账金额税额*/
@ApiModelProperty(value = "到账金额税额")
@DecimalMax(value = "9999999999.99",message = "到账金额税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal paidTax;
/**到账金额未税*/
@ApiModelProperty(value = "到账金额未税")
@DecimalMax(value = "9999999999.99",message = "到账金额未税")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal paidNoTaxAmount;
/**开票金额税额*/
@ApiModelProperty(value = "开票金额税额")
@DecimalMax(value = "9999999999.99",message = "开票金额税额")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal invoiceTax;
/**开票金额未税*/
@ApiModelProperty(value = "开票金额未税")
@DecimalMax(value = "9999999999.99",message = "开票金额未税")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal invoiceNoTaxAmount;
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+10 -6
View File
@@ -482,10 +482,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
if (!registerCheckResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_1)) {
throw new JeroBootException("报名信息未审核通过");
}
String paymentRecord = payMeetingSituation.getPaymentRecord();
if (StrUtil.isBlank(paymentRecord)) {
throw new JeroBootException("缴费凭证为空不能审核");
}
//String paymentRecord = payMeetingSituation.getPaymentRecord();
//if (StrUtil.isBlank(paymentRecord)) {
// throw new JeroBootException("缴费凭证为空不能审核");
//}
Integer oldCheckResult = payMeetingSituation.getCheckResult();
if (oldCheckResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_1)) {
throw new JeroBootException("审核通过之后就无法在审核");
@@ -496,6 +496,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
Integer registerProcess = payMeetingSituation.getRegisterProcess();
if (checkResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_2)) {
payMeetingSituation.setCheckRemark(checkRemark);
if (Objects.equals(registerProcess,3)||Objects.equals(registerProcess,8)){
throw new JeroBootException("提前审核无法驳回");
}
if (Objects.equals(registerProcess,4)){
payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_5);
}else if (Objects.equals(registerProcess,9)){
@@ -510,9 +514,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
//payMeetingSituation.setInAccount(PayProjectCommon.YES);
//设置实收金额
//payMeetingSituation.setPaidAmount(payMeetingSituation.getAmountReceivable());
if (Objects.equals(registerProcess,4)||Objects.equals(registerProcess,5)){
if (Objects.equals(registerProcess,3)||Objects.equals(registerProcess,4)||Objects.equals(registerProcess,5)){
payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_6);
}else if (Objects.equals(registerProcess,9)||Objects.equals(registerProcess,10)){
}else if (Objects.equals(registerProcess,8)||Objects.equals(registerProcess,9)||Objects.equals(registerProcess,10)){
payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_11);
}
payMeetingSituation.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/StandardsSituationExcel.java
+10
View File
@@ -1,9 +1,13 @@
package com.jero.meeting.vo.excel;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.jero.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.math.BigDecimal;
/**
* @author liJiaRao
* @date 2021-09-22 15:40
@@ -64,6 +68,12 @@ public class StandardsSituationExcel extends SituationBaseExcel {
@Excel(name = "邮编", width = 15)
private String postCode;
/**
* 应收金额
*/
@Excel(name = "应收金额", width = 15)
private BigDecimal amountReceivable;
/**缴费方式*/
@Excel(name = "缴费方式", width = 15,dicCode = "meeting_pay_type")
private Integer payMode;