diff --git a/src/main/java/com/qs/serve/modules/pay/entity/bo/PayPaymentBo.java b/src/main/java/com/qs/serve/modules/pay/entity/bo/PayPaymentBo.java index 89070136..4b407d79 100644 --- a/src/main/java/com/qs/serve/modules/pay/entity/bo/PayPaymentBo.java +++ b/src/main/java/com/qs/serve/modules/pay/entity/bo/PayPaymentBo.java @@ -36,7 +36,7 @@ public class PayPaymentBo implements Serializable { private BigDecimal payAmount; /** ERP编码 */ - @NotNull(message = "ERP编码不能为空") +// @NotNull(message = "ERP编码不能为空") private String erpId; /** 发票编号 */ 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 19cdc7ac..8d13f9ba 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 @@ -243,7 +243,7 @@ public class PayPaymentServiceImpl extends ServiceImpla.setPayReleaseFlag(1)); + verificationService.updateBatchById(verificationList); +// verificationAmount = verificationList.stream().map(a -> a.getAmount()).reduce(BigDecimal.ZERO, BigDecimal::add); + } + return payPayment; } diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java index 59d07a34..839f000f 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java @@ -7,6 +7,7 @@ import com.qs.serve.modules.vtb.entity.dto.VtbActivityCheckDTO; import com.qs.serve.modules.vtb.entity.dto.VtbVerificationDTO; import com.qs.serve.modules.vtb.entity.so.VtbActivityCheckSo; import com.qs.serve.modules.vtb.entity.so.VtbVerificationCheckSo; +import com.qs.serve.modules.vtb.mapper.VtbVerForPayReportMapper; import com.qs.serve.modules.vtb.mapper.VtbVerReportMapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -30,6 +31,9 @@ public class VtbVerificationDataController { private final VtbVerReportMapper verReportMapper; + private final VtbVerForPayReportMapper verPayReportMapper; + + /** * 获取活动的核销情况 * @param query @@ -42,7 +46,12 @@ public class VtbVerificationDataController { query.setOpenPage(1); query.setStartRow(PageUtil.getStartRow()); List activityIds = verReportMapper.getActiveIdsForDataAmount(query); + if(activityIds.size()==0){ + activityIds.add(0L); + } query.setActivityIds(activityIds); + query.setOpenPage(0); + List list = verReportMapper.pageActiveAndVtbDataAmount(query); PageVo page = new PageVo<>(); page.initPageByTotal(count); @@ -76,11 +85,19 @@ public class VtbVerificationDataController { */ @GetMapping("pageVerificationCheck") public R> getVerificationData(VtbVerificationCheckSo query){ - Long count = verReportMapper.countVerificationCheck(query); + Long count = verPayReportMapper.countVerificationCheck(query); if(count>0){ query.setOpenPage(1); query.setStartRow(PageUtil.getStartRow()); - List list = verReportMapper.pageVerificationCheck(query); + + List ids = verPayReportMapper.getVerificationIdsForPay(query); + if(ids.size()==0){ + ids.add(0L); + } + query.setVtbIds(ids); + query.setOpenPage(0); + + List list = verPayReportMapper.pageVerificationCheck(query); PageVo page = new PageVo<>(); page.initPageByTotal(count); page.setList(list); @@ -96,7 +113,18 @@ public class VtbVerificationDataController { */ @GetMapping("exportVerificationCheck") public R> exportVerificationCheck(VtbVerificationCheckSo query){ - List list = verReportMapper.pageVerificationCheck(query); + List list = new ArrayList<>(); + + Long count = verPayReportMapper.countVerificationCheck(query); + if(count>0) { + List ids = verPayReportMapper.getVerificationIdsForPay(query); + if(ids.size()==0){ + ids.add(0L); + } + query.setVtbIds(ids); + + list = verPayReportMapper.pageVerificationCheck(query); + } return R.ok(list); } diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java index d0e7606e..18f49638 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java @@ -76,6 +76,8 @@ public class VtbVerification implements Serializable { /** 支付状态:0-未支付;1-已支付 */ private Integer paymentState; + private Integer payReleaseFlag; + /** 记录释放标识 */ private Integer regReleaseFlag; diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationSubject.java b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationSubject.java index 045e37be..ec967173 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationSubject.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerificationSubject.java @@ -88,6 +88,8 @@ public class VtbVerificationSubject implements Serializable { /** 支付完成标识 */ private Integer payFinishedFlag; + private Integer payReleaseFlag; + /** 场次 */ @NotNull(message = "场次不能为空") private Integer countSession; diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/dto/VtbVerificationDTO.java b/src/main/java/com/qs/serve/modules/vtb/entity/dto/VtbVerificationDTO.java index f2cbbc8c..ceec18fb 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/dto/VtbVerificationDTO.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/dto/VtbVerificationDTO.java @@ -17,6 +17,22 @@ public class VtbVerificationDTO { /** 核销编码 */ private String verificationCode; + + /** 提交实际 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime createTime; + + /** 提交实际 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime finishedTime; + + /** 供应商编码 */ + private String userCode; + /** 供应商 */ + private String userName; + /** 供应商编码 */ private String supplierCode; /** 供应商 */ @@ -26,15 +42,24 @@ public class VtbVerificationDTO { /** 核销金额 */ private String amount; /** 支付金额 */ - private String payAmt; + private String payAmount; /** 不再支付金额 */ - private String notPayAmt; + private String notPayAmount; + + private String unpayAmount; + /** 费用编码 */ private String costApplyCode; /** 费用主题 */ private String chargeTheme; /** 费用申请时间 */ private String submitTime; + + /** 提交实际 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime costPassTime; + /** 活动编码 */ private String activityCode; /** 活动内容 */ diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationCheckSo.java b/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationCheckSo.java index 4a2fd2ab..ea557c02 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationCheckSo.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationCheckSo.java @@ -5,6 +5,7 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; +import java.util.List; /** * @author YenHex @@ -14,10 +15,17 @@ import java.time.LocalDateTime; public class VtbVerificationCheckSo { /** 核销编码 */ private String verificationCode; + /** 供应商编码 */ private String supplierCode; /** 供应商 */ private String supplierName; + + private Integer stopSupplierFlag; + + private String userCode; + + private String userName; /** 费用编码 */ private String costApplyCode; /** 费用主题 */ @@ -27,14 +35,27 @@ public class VtbVerificationCheckSo { /** 活动内容 */ private String actTitle; - /** 开始核销时间 */ + private String wayTitle; + + /** 核销开始时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private LocalDateTime startCheckTime; + private LocalDateTime queryStartCheckTime; + /** 核销开始时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - private LocalDateTime endCheckTime; + private LocalDateTime queryEndCheckTime; + + /** 核销完成时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime queryStartFinishCheckTime; + + /** 核销完成时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime queryEndFinishCheckTime; /** 开始支付时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -53,4 +74,7 @@ public class VtbVerificationCheckSo { * 当openPage=1时,进行翻页(后台维护) */ private Integer openPage; + + private List vtbIds; + } diff --git a/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerForPayReportMapper.java b/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerForPayReportMapper.java new file mode 100644 index 00000000..d796a5a8 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerForPayReportMapper.java @@ -0,0 +1,32 @@ +package com.qs.serve.modules.vtb.mapper; + +import com.qs.serve.modules.vtb.entity.dto.VtbActivityCheckDTO; +import com.qs.serve.modules.vtb.entity.dto.VtbVerificationDTO; +import com.qs.serve.modules.vtb.entity.so.VtbActivityCheckSo; +import com.qs.serve.modules.vtb.entity.so.VtbVerificationCheckSo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author YenHex + * @since 2023/9/4 + */ +public interface VtbVerForPayReportMapper { + +// List pageActivityCheck(@Param("query") VtbActivityCheckSo query); +// Long countActivityCheck(@Param("query") VtbActivityCheckSo query); + + List pageVerificationCheck(@Param("query") VtbVerificationCheckSo query); + + Long countVerificationCheck(@Param("query") VtbVerificationCheckSo query); + + List getVerificationIdsForPay(@Param("query") VtbVerificationCheckSo query); + + +// List pageActiveAndVtbDataAmount(@Param("query") VtbActivityCheckSo query); +// +// Long countActiveAndVtbDataAmount(@Param("query") VtbActivityCheckSo query); +// + +} diff --git a/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerReportMapper.java b/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerReportMapper.java index fa02100f..557a48ba 100644 --- a/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerReportMapper.java +++ b/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerReportMapper.java @@ -17,9 +17,9 @@ public interface VtbVerReportMapper { // List pageActivityCheck(@Param("query") VtbActivityCheckSo query); // Long countActivityCheck(@Param("query") VtbActivityCheckSo query); - List pageVerificationCheck(@Param("query") VtbVerificationCheckSo query); - - Long countVerificationCheck(@Param("query") VtbVerificationCheckSo query); +// List pageVerificationCheck(@Param("query") VtbVerificationCheckSo query); +// +// Long countVerificationCheck(@Param("query") VtbVerificationCheckSo query); List pageActiveAndVtbDataAmount(@Param("query") VtbActivityCheckSo query); diff --git a/src/main/resources/mapper/vtb/VtbVerForPayReportMapper.xml b/src/main/resources/mapper/vtb/VtbVerForPayReportMapper.xml new file mode 100644 index 00000000..aeb354ac --- /dev/null +++ b/src/main/resources/mapper/vtb/VtbVerForPayReportMapper.xml @@ -0,0 +1,199 @@ + + + + + + + + + + + + diff --git a/src/main/resources/mapper/vtb/VtbVerReportMapper.xml b/src/main/resources/mapper/vtb/VtbVerReportMapper.xml index fb85295a..e3cbc3a0 100644 --- a/src/main/resources/mapper/vtb/VtbVerReportMapper.xml +++ b/src/main/resources/mapper/vtb/VtbVerReportMapper.xml @@ -3,171 +3,171 @@ - - where 1=1 - and tbs_activity.del_flag = 0 - and tbs_activity.cancel_flag = 0 - and tbs_cost_apply.del_flag = 0 - and tbs_cost_apply.charge_state in(2,3) - and tbs_cost_apply.cancel_flag = 0 - and `tbs_activity`.`activity_code` like concat('%',#{query.activityCode},'%') - and `tbs_activity`.`act_title` like concat('%',#{query.activityTitle},'%') - and `tbs_cost_apply`.`submit_time` >= #{query.queryStartSubmitTime} - and `tbs_cost_apply`.`submit_time` <= #{query.queryEndSubmitTime} - and `tbs_cost_apply`.`supplier_code` like concat('%',#{query.supplierCode},'%') - and `tbs_cost_apply`.`supplier_name` like concat('%',#{query.supplierName},'%') - and `tbs_cost_apply`.`code` like concat('%',#{query.costApplyCode},'%') - and `tbs_cost_apply`.`charge_theme` like concat('%',#{query.costTitle},'%') - + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + +