From c571508a2c0d97d0d3d3eee9b290893f9e1beb44 Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 3 Jan 2023 17:49:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=94=80=E8=AE=B0=E5=BD=95=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E5=88=B0=E9=94=80=E8=B7=AF=E9=80=9A=E4=B8=AD=E9=97=B4?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/seeyon/service/SeeYonService.java | 1 + .../TbsActivityTemplateController.java | 19 +++++++++++ .../controller/TbsCostApplyController.java | 1 + .../tbs/entity/TbsActivityTemplate.java | 12 +++++++ .../modules/tbs/entity/TbsCostApply.java | 2 ++ .../tbs/entity/bo/TbsActivityTemplateBo.java | 14 ++++++++ .../modules/vtb/entity/VtbVerification.java | 3 ++ .../vtb/entity/VtbVerificationSubject.java | 3 ++ .../impl/VtbVerificationServiceImpl.java | 34 ++++++++++++++++--- 9 files changed, 85 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java index 2e2b9be8..02860c60 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonService.java @@ -49,6 +49,7 @@ public interface SeeYonService { */ R affairCommit(CtpAffairCommit affairCommit); + /** * 取消流程 * @param affairCancel diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java index d2833858..3d1b1286 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java @@ -109,6 +109,25 @@ public class TbsActivityTemplateController { return R.ok(template); } + /** + * 更新状态 + * @param param + * @return + */ + @PostMapping("/updateState") + @SysLog(module = SystemModule.Budget, title = "活动模板", biz = BizType.UPDATE) + @PreAuthorize("hasRole('tbs:activityTemplate:update')") + public R updateState(@RequestBody TbsActivityTemplateBo param){ + if(param.getId()==null){ + return R.error("id is null"); + } + TbsActivityTemplate template = new TbsActivityTemplate(); + template.setId(param.getId()); + template.setTemplateState(param.getTemplateState()); + tbsActivityTemplateService.updateById(template); + return R.ok(template); + } + /** * 新增 * @param param diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index edab41a2..e2cff5e5 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -217,6 +217,7 @@ public class TbsCostApplyController { public R save(@RequestBody @Valid TbsCostApplyBo param){ TbsCostApply entity = CopierUtil.copy(param,new TbsCostApply()); BmsSupplier supplier = bmsSupplierService.getById(entity.getSupplierId()); + entity.setCode("CA"+IdUtil.timeStampId()); entity.setSupplierCode(supplier.getCode()); entity.setSupplierName(supplier.getName()); SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId()); diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplate.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplate.java index 3349ee4d..853175c4 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplate.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplate.java @@ -58,6 +58,18 @@ public class TbsActivityTemplate implements Serializable { @Length(max = 255,message = "备注长度不能超过255字") private String remark; + /** 开始时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime startTime; + + /** 结束时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime endTime; + /** 创建时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java index ee917eb3..5be10b5e 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java @@ -31,6 +31,8 @@ public class TbsCostApply implements Serializable { @TableId(type = IdType.AUTO) private Long id; + private String code; + /** 主题 */ @NotBlank(message = "主题不能为空") @Length(max = 60,message = "主题长度不能超过60字") diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityTemplateBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityTemplateBo.java index a5d4b546..5156129d 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityTemplateBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityTemplateBo.java @@ -6,6 +6,8 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; @@ -59,5 +61,17 @@ public class TbsActivityTemplateBo implements Serializable { /** 销售区域id列表 */ private List bizRegionIds; + /** 开始时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime startTime; + + /** 结束时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime endTime; + } 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 6e8fa301..ff045275 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 @@ -35,6 +35,9 @@ public class VtbVerification implements Serializable { @TableId(type = IdType.AUTO) private Long id; + /** 核销编码 */ + private String verificationCode; + /** 活动id */ private Long activityId; 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 5f5ba448..eb1cfc95 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 @@ -31,6 +31,9 @@ public class VtbVerificationSubject implements Serializable { @TableId(type = IdType.AUTO) private Long id; + /** 科目核销编码 */ + private String verificationSubCode; + /** 核算id */ @NotNull(message = "核算id不能为空") private Long verificationId; diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index 74b6ccdf..8048d00a 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -15,14 +15,13 @@ import com.qs.serve.modules.bms.service.BmsSubjectService; import com.qs.serve.modules.bms.service.BmsSupplierService; import com.qs.serve.modules.seeyon.entity.BaseCreateProcessBo; import com.qs.serve.modules.seeyon.service.SeeYonService; +import com.qs.serve.modules.seeyon.service.XiaoLuTonService; import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.tbs.common.TbsActivityState; import com.qs.serve.modules.tbs.common.TbsCostApplyState; import com.qs.serve.modules.tbs.common.TbsSeeYonConst; import com.qs.serve.modules.tbs.entity.*; -import com.qs.serve.modules.tbs.entity.bo.TbsActivityChannelBo; -import com.qs.serve.modules.tbs.entity.bo.TbsActivityChannelPointBo; import com.qs.serve.modules.tbs.entity.bo.TbsActivityReopenBo; import com.qs.serve.modules.tbs.service.*; import com.qs.serve.modules.vtb.common.VtbFundFlowType; @@ -32,6 +31,7 @@ import com.qs.serve.modules.vtb.entity.bo.VtbVerificationBo; import com.qs.serve.modules.vtb.entity.bo.VtbVerificationChannelBo; import com.qs.serve.modules.vtb.entity.bo.VtbVerificationChannelPointBo; import com.qs.serve.modules.vtb.entity.bo.VtbVerificationSubjectBo; +import com.qs.serve.modules.seeyon.entity.XltApticlaim; import com.qs.serve.modules.vtb.mapper.VtbVerificationMapper; import com.qs.serve.modules.vtb.service.*; import lombok.AllArgsConstructor; @@ -73,6 +73,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl verificationSubjects = validCreateVeriSubject(verificationBo, activity, costApply, supplier); + List verificationSubjects = validCreateVeriSubject(verification.getVerificationCode(),verificationBo, activity, costApply, supplier); //设置总金额 BigDecimal totalAmount = BigDecimal.ZERO; for (VtbVerificationSubject verificationSubject : verificationSubjects) { @@ -317,13 +319,14 @@ public class VtbVerificationServiceImpl extends ServiceImpl validCreateVeriSubject(VtbVerificationBo verificationBo, TbsActivity activity, TbsCostApply costApply,BmsSupplier supplier) { + private List validCreateVeriSubject(String verificationCode,VtbVerificationBo verificationBo, TbsActivity activity, TbsCostApply costApply,BmsSupplier supplier) { List verificationSubjects = new ArrayList<>(); List activitySubjects = activitySubjectService.listByActivityId(activity.getId()); List existFundFlowList = fundFlowService.listByActivity(activity.getId(), VtbFundFlowType.Verification); //校验余额 Map> funFlowListMap = existFundFlowList.stream().collect(Collectors.groupingBy(VtbFundFlow::getSubjectId)); List subjectBoList = verificationBo.getSubjectList(); + int countCode = 1; for (VtbVerificationSubjectBo subjectBo : subjectBoList) { //忽略金额为0的数据 if (subjectBo.getAmount() == null || subjectBo.getAmount().compareTo(BigDecimal.ZERO) < 1) { @@ -351,6 +354,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.eq(VtbFundFlow::getVerificationId,verificationId); @@ -386,6 +393,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl> centerMapBySubject = activityCenterList.stream() .collect(Collectors.groupingBy(TbsActivityCenter::getSubjectId)); List addFundFlowList = new ArrayList<>(); + LocalDateTime now = LocalDateTime.now(); for (VtbVerificationSubject verificationSubject : verificationSubjects) { Long subjectId = verificationSubject.getSubjectId(); BigDecimal usedAmount = verificationSubject.getUsedAmount(); @@ -412,6 +420,24 @@ public class VtbVerificationServiceImpl extends ServiceImpl