diff --git a/src/main/java/com/qs/serve/modules/pay/entity/dto/PayPaymentAmountDto.java b/src/main/java/com/qs/serve/modules/pay/entity/dto/PayPaymentAmountDto.java index fae9bae1..f39f5f5f 100644 --- a/src/main/java/com/qs/serve/modules/pay/entity/dto/PayPaymentAmountDto.java +++ b/src/main/java/com/qs/serve/modules/pay/entity/dto/PayPaymentAmountDto.java @@ -25,6 +25,11 @@ public class PayPaymentAmountDto { */ private BigDecimal hasPayment; + /** + * 不再支付 + */ + private BigDecimal notPayment; + /** * 可支付核销明细 */ diff --git a/src/main/java/com/qs/serve/modules/pay/service/impl/PayPaymentServiceImpl.java b/src/main/java/com/qs/serve/modules/pay/service/impl/PayPaymentServiceImpl.java index 35aa9419..9f4084b9 100644 --- a/src/main/java/com/qs/serve/modules/pay/service/impl/PayPaymentServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/pay/service/impl/PayPaymentServiceImpl.java @@ -392,8 +392,17 @@ public class PayPaymentServiceImpl extends ServiceImpl unPayList = this.list( + new LambdaQueryWrapper() + .eq(PayPayment::getPayType,PaymentType.UN_PAYMENT) + .eq(PayPayment::getSupplierId,supplierId) + ); + BigDecimal totalUnPay = BigDecimal.ZERO; + for (PayPayment payment : unPayList) { + totalUnPay = totalUnPay.add(payment.getPayAmount()); + } + return new PayPaymentAmountDto(totalAmount,hasAmount,totalUnPay,vtbVerificationSubjectList); } } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityPayCondition.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityPayCondition.java index 5e5dca7b..88193fd9 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityPayCondition.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityPayCondition.java @@ -45,6 +45,11 @@ public class TbsActivityPayCondition implements Serializable { @NotNull(message = "活动id不能为空") private Long activityId; + /** + * 支付次数 + */ + private Integer payTimes; + /** 付款条件 */ @NotBlank(message = "付款条件不能为空") @Length(max = 4000,message = "付款条件长度不能超过4000字") diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityPayConditionBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityPayConditionBo.java index 42b311a2..d75717a7 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityPayConditionBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityPayConditionBo.java @@ -14,6 +14,7 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; import org.springframework.format.annotation.DateTimeFormat; +import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; import javax.validation.constraints.NotBlank; @@ -47,6 +48,13 @@ public class TbsActivityPayConditionBo implements Serializable { @NotNull(message = "付款金额不能为空") private BigDecimal paymentPrice; + /** + * 支付次数 + */ + @Min(value = 1,message = "支付最少1次数") + @Min(value = 30,message = "支付最多30次数") + private Integer payTimes; + /** 付款时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate paymentDate; diff --git a/src/main/resources/mapper/tag/TagDataMapper.xml b/src/main/resources/mapper/tag/TagDataMapper.xml index 364ce0da..08dbb72b 100644 --- a/src/main/resources/mapper/tag/TagDataMapper.xml +++ b/src/main/resources/mapper/tag/TagDataMapper.xml @@ -31,6 +31,8 @@ tag_data.`target_name`, tag_data.`remark`, tag_data.`create_time`, + tag_data.`start_date`, + tag_data.`end_date`, tag_data.`update_time`, tag_data.`create_by`, tag_data.`update_by`, @@ -78,6 +80,8 @@ select target_id from tag_data left join tag_info on tag_data.tag_id = tag_info.id and tag_info.del_flag=0 where tag_data.del_flag = 0 + and (tag_data.start_date is null or tag_data.start_date >= now() ) + and (tag_data.end_date is null or tag_data.end_date <= now() ) and tag_id in