diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java index 7d9d199..143f93b 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java @@ -35,6 +35,10 @@ public class TbsActivity implements Serializable { @TableId(type = IdType.AUTO) private Long id; + private Long rebateId; + + private Long rebatePeriodId; + /** 附件id */ @TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR) private String[] attachIds; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityTemplateBo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityTemplateBo.java index d7cfda5..9c0539a 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityTemplateBo.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityTemplateBo.java @@ -31,6 +31,11 @@ public class TbsActivityTemplateBo implements Serializable { /** id */ private Long id; + /** + * 模板类型:0-费用申请(默认);1-返利申请 + */ + private Integer templateType; + /** 模板名称 */ @NotBlank(message = "模板名称不能为空") private String templateName; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplication4CostServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplication4CostServiceImpl.java index e531942..3a30309 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplication4CostServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplication4CostServiceImpl.java @@ -85,6 +85,8 @@ public class TzcRebateApplication4CostServiceImpl implements TzcRebateApplicatio TbsCostApply costApply = new TbsCostApply(); costApply.setRebateId(rebateId); costApply.setCode(rebate.getRebateCode()); + // 标记为返利类型 + costApply.setContractFlag(3); costApply.setMatchType(1); costApply.setChargeTheme(rebate.getRebateName()); costApply.setChargeState(TbsCostApplyState.State_0_unPublish.getCode()); @@ -108,6 +110,8 @@ public class TzcRebateApplication4CostServiceImpl implements TzcRebateApplicatio TzcRebatePeriod period = periodList.get(i); //构建活动 TbsActivity activity = new TbsActivity(); + activity.setRebateId(rebateId); + activity.setRebatePeriodId(period.getId()); activity.setCostApplyId(costApplyId); activity.setActivityCode(rebate.getRebateCode()+"_"+(i+1)); activity.setActivityState(TbsActivityState.STATE_1_Finished); @@ -145,7 +149,8 @@ public class TzcRebateApplication4CostServiceImpl implements TzcRebateApplicatio // 平摊商品的比重 = 100 / goodsList.size() BigDecimal goodsAvgRate = n100.divide(new BigDecimal(goodsList.size()),1, RoundingMode.DOWN); // 平摊商品的金额 = centerAmount * 平摊商品的比重 - BigDecimal goodsAvgAmount = rebateCenter.getCenterAmount().multiply(goodsAvgRate); + BigDecimal goodsAvgAmount = rebateCenter.getCenterAmount().multiply(goodsAvgRate) + .divide(n100,1,RoundingMode.DOWN); // 剩余的比重和金额 BigDecimal surplusRate = n100; BigDecimal surplusAmt = rebateCenter.getCenterAmount(); @@ -189,6 +194,7 @@ public class TzcRebateApplication4CostServiceImpl implements TzcRebateApplicatio activitySubject.setCountSession(0); activitySubject.setCountPerson(0); activitySubject.setRemark(rebateSubject.getRemark()); + activitySubject.setTmpUk(rebateSubject.getTmpUk()); return activitySubject; } @@ -206,6 +212,7 @@ public class TzcRebateApplication4CostServiceImpl implements TzcRebateApplicatio activityCenter.setCenterCode(rebateCenter.getCenterCode()); activityCenter.setCenterName(rebateCenter.getCenterName()); activityCenter.setRemark(rebateCenter.getRemark()); + activityCenter.setTmpUk(rebateCenter.getTmpUk()); return activityCenter; } diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplicationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplicationServiceImpl.java index 0ecb8da..3fc5a57 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplicationServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplicationServiceImpl.java @@ -234,6 +234,7 @@ public class TzcRebateApplicationServiceImpl implements TzcRebateApplicationServ ); // 绑定费用id + rebate.setCostApplyId(costApplyId); tzcRebateService.update( new LambdaUpdateWrapper() .eq(TzcRebate::getId,rebateId) @@ -484,6 +485,7 @@ public class TzcRebateApplicationServiceImpl implements TzcRebateApplicationServ rebateSubject.setTmpUk(subjectParam.getTmpUk()); // 保存科目 tzcRebateSubjectService.save(rebateSubject); + rebateSubjectList.add(rebateSubject); Long rebateSubjectId = rebateSubject.getId(); List centerParamList= subjectParam.getCenterList();