diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java index 9c74e790..167e2554 100644 --- a/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java +++ b/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java @@ -91,8 +91,7 @@ public class BirActivityCenterGoodsController { @GetMapping("/toSyncBirToday") public R toSyncBirEcro2(){ - Long[] ids = new Long[]{277466L,277498L,277516L,277533L,277551L,277615L,277651L,277666L,280941L,278119L,278096L,278432L,281315L,281522L,277464L,277471L,277503L,277696L,277714L,277754L,277881L,277890L,277915L,277954L,281632L,281759L,278147L,278383L,277320L,277495L,277506L,277536L,277595L,277604L,277629L,277663L,277695L,298987L,277748L,277755L,277798L,277805L,277930L,278048L,278141L,278473L,298922L,277441L,277475L,277560L,277609L,277641L,277660L,277726L,277741L,277760L,300889L,301023L,278427L,278478L,278495L,278578L,277725L,277891L,295609L,277733L,277734L,277766L,277834L,278001L,278020L,278838L,279305L,282278L,281006L,278984L,278098L,278566L,298143L,297182L,295914L,277730L,277762L,277412L,277455L,277512L,277519L,277548L,295578L,282378L,276919L,298961L,277763L,277865L,277897L,277906L,277963L,299262L,295443L,295513L,293573L,293648L,278068L,278136L,279121L,279139L,279240L,300963L,277732L,277768L,277985L,299696L,277846L,282151L,282165L,276921L,298856L,278121L,278375L,279157L,278557L,278582L,277478L,277514L,277546L,277571L,277596L,277628L,292736L,292915L,294801L,277889L,277165L,277166L,280306L,295599L,295649L,279156L,299294L,300729L,293078L,293191L,278129L,295084L,295145L,282175L,280178L,295586L,295720L,276734L,298923L,277385L,277399L,277435L,277550L,277582L,277667L,277685L,277718L,276731L,299027L,277738L,277872L,277940L,277965L,299632L,299187L,299332L,277102L,278708L,278094L,278111L,278145L,299186L,299220L,277509L,277592L,277594L,277658L,277707L,281579L,277485L,277568L,277618L,277700L,277717L,295451L,277967L,279154L,282255L,301422L,292768L,292866L,292983L,276773L,298884L,298916L,278745L,277472L,277504L,277529L,277563L,277640L,280203L,277806L,293514L,293541L,277593L,277676L,277691L,277693L,277727L,277993L,279112L,299183L,299185L,277460L,277541L,277575L,277607L,277626L,277675L,278428L,277877L,277977L,278095L,299168L,277410L,277491L,277508L,277591L,277657L,277708L,301740L,300623L,277879L,277888L,277981L,278049L,281423L,278090L,279126L,299382L,278581L,281899L,281906L,276887L,298847L,298904L,282292L,282349L,277530L,277555L,277723L,277486L,277522L,277545L,277579L,277588L,277611L,277613L,281966L,277622L,278251L,300948L,277015L,298576L,279188L,279206L,295049L,295063L,292524L,296253L,277014L,277017L,277081L,300964L,301081L,299863L,279304L,299292L,292490L,296083L,278762L,277809L,277892L,277945L,277958L,281587L,277624L,277694L,277709L,277342L,277540L,277576L,278112L,300019L,300153L,291280L,296094L,296375L,294624L,277749L,277886L,277903L,278003L,278018L,278371L,276682L,299009L,299042L,296183L,278859L,278491L,279127L,277830L,277887L,299583L,296307L,294567L,294578L,280179L,278089L,299924L,277739L,277896L,277914L,277946L,279175L,296162L,296248L,277743L,277826L,277894L,277943L,295693L,296980L,296127L,296210L,295259L,296546L,277679L,277686L,277688L,277690L,277722L,295631L,299280L,299337L,278783L,278324L,291331L,292584L,296377L,295107L,295158L,294503L,294690L,294203L,296475L,296560L,295775L,296041L,277744L,277842L,277859L,296092L,292565L,295075L,292733L,301218L,277747L,277949L,278013L,278054L,293932L,279124L,291324L,294393L,292562L,283088L,277161L,296079L,296254L,292737L,292873L,302440L,277772L,277870L,299666L,277465L,277484L,277652L,277752L,277866L,277883L,277952L,278120L,292492L,278114L,278357L,299349L,294394L,294426L,294076L,292622L,295112L,281272L,302071L,294432L,294593L,294368L,292360L,292619L,295136L,295304L,296408L,277447L,277547L,296134L,294697L,294712L,296470L,296552L,296584L,292961L,280307L,295601L,300701L,293081L,296082L,296132L,295078L,295160L,295353L,296471L,296557L,293799L,295319L,293883L,292729L,292890L,281004L,277589L,277603L,277614L,295537L,277711L,277090L,298533L,278377L,300152L,296159L,292364L,292883L,292900L,295825L,279190L,296102L,294679L,294162L,292493L,293843L,279086L,295651L,295852L,295884L,277994L,278126L,278143L,299988L,295559L,294421L,296495L,294002L,295759L,295774L,281172L,278132L,278139L,278350L,278382L,277328L,277446L,277521L,277539L,277553L,277096L,277160L,277746L,278014L,293065L,296087L,295094L,294283L,296491L,293890L,281745L,281946L,299930L,276648L,296167L,294481L,294649L,294682L,281278L,279037L,278844L,277325L,277391L,277459L,277627L,277659L,277710L,282320L,299268L,278418L,300478L,300699L,294512L,296401L,294047L,292794L,292876L,277650L,295533L,295081L,295114L,294614L,292860L,292877L,292909L, - 277683L,295750L,296886L,296954L,295238L,292887L,280998L,277445L,277511L,277513L,277620L,295527L,295795L,296029L,278790L,278392L,278515L,295661L,295663L,299884L,277788L,296163L,296165L,292519L,295120L,294516L,296747L,294050L,281005L,295756L,295811L,295820L,297190L,297619L,296335L,295099L,295132L,300111L,292641L,292777L,295799L,298857L,293627L,293710L,301061L,295077L,295109L,277463L,277572L,277665L,301293L,299155L,298151L,277653L,277664L,277689L,295930L,295973L,296023L,297241L,297416L,277864L,277957L,295083L,292793L,280893L,277518L,277535L,295466L,295634L,282030L,295801L,300631L,281284L,278780L,302191L,282056L,282356L,296060L,300957L,298902L,297866L,293520L,279279L,291281L,294523L,295240L,292683L,292985L,280251L,295457L,295757L,299133L,278011L,295123L,298899L,278445L,299301L,296091L,296161L,296442L,296561L,277456L,277681L,277713L,295602L,295904L,298946L,296174L,295134L,296397L,277483L,277566L,277602L,277616L,277633L,277669L,295618L,300983L,301098L,296594L,294052L,292801L,278778L,295726L,296996L,276738L,301089L,293320L,293335L,301905L,280213L,295528L,277169L,278130L,295385L,293881L,295896L,298947L,297268L,299936L,292548L,295088L,294522L,294605L,296477L,296492L,293854L,295541L,277586L,277654L,277656L,295470L,295706L,295761L,295838L,295970L,296967L,299107L,294051L,281283L,302439L,282233L,295605L,295637L,295898L,295980L,280322L,297745L,299624L,293483L,293715L,294351L,298931L,299106L,299131L,281365L,298270L,298295L,298979L,281456L,300962L,295121L,293824L,294049L,292906L,302516L,277537L,277544L,295161L,294200L,296440L,296565L,292889L,281155L,277388L,277520L,277581L,282393L,296073L,296305L,294401L,292497L,295137L,295144L,295162L,296505L,293747L,293908L,293973L,298921L,298930L,299132L,277729L,277765L,294511L,294075L,295386L,277761L,277893L,278142L,278493L,300689L,296077L,296175L,296309L,294437L,277898L,277905L,277955L,298597L,294342L,292731L,292756L,292963L,277444L,277587L,278134L,296136L,296303L,294596L,294077L,294164L,292491L,295214L,292741L,277619L,294556L,295239L,295341L,296562L,277457L,277525L,277610L,303746L,299134L,296100L,294431L,292423L,295350L,296436L,296554L,293845L,292660L,277502L,277515L,277612L,277623L,277662L,280295L,295503L,295546L,296032L,299472L,305170L,295715L,295765L,281662L,298909L,298991L,299159L,293662L,294798L,294916L,297600L,293463L,293181L,293356L,277948L,278030L,278055L,305763L,294835L,295053L,293582L,294618L,295352L,296558L,293984L,279135L,303876L,279074L,299123L,294752L,296739L,280970L,302441L,277523L,277598L,277655L,295921L,299833L,294910L,295060L,296901L,298937L,299137L,281389L,298312L,297274L,293632L,278422L,294861L,292882L,295592L,295624L,298030L,297379L,300804L,294807L,299953L,300170L,293121L,296329L,296374L,294693L,299105L,281498L,301052L,298169L,294759L,294800L,277500L,277585L,277600L,277668L,277682L,295130L,281630L,282330L,277817L,280958L,295751L,295851L,296034L,301099L,293512L,293579L,277750L,278053L,295065L,293061L,277438L,277538L,277597L,277661L,302204L,281648L,299096L,297492L,293137L,299321L,299135L,281519L,301056L,297380L,280315L,300054L,294989L,295057L,303879L,304315L,294048L,277461L,277697L,295788L,281641L,281843L,296990L,293650L,294820L,303878L,277684L,281896L,281359L,281510L,301083L,297690L,282396L,293445L,293660L,293309L,296559L,295808L,295859L,299118L,300958L,298297L,300739L,295040L,295055L,299320L,280965L,277639L,277678L,282008L,299120L,281608L,280379L,294819L,298413L,296497L,296599L,296742L,296808L,282302L,293255L,293289L,298203L,278549L,277120L,294975L,278125L,277106L,277159L,293303L,299468L,299470L,299485L,299838L,277687L,295664L,282010L,297014L,299004L,297257L,293563L,295067L,300151L,293038L,292734L,293885L,293000L,293036L,293317L,277458L,277507L,277524L,277692L,296827L,295891L,276707L,298869L,281568L,301071L,278560L,293270L,294740L,294821L,305519L,301728L,295644L,296834L,297009L,293558L,306933L,293140L,293333L,305104L,305740L,303880L,299500L,298381L,298632L,298610L,299845L,278092L,299456L,294862L,298806L,299799L,305522L,305245L,298611L,304438L,277951L,293259L,299494L,293509L,293542L,293577L,293677L,300012L,292992L,305142L,294751L,299488L,305147L,305240L,299855L,299158L,293510L,293678L,278469L,294932L,293195L,293327L,299844L,299963L,300128L,293244L,299378L,295857L,296042L,294891L,293002L,293351L,299318L,305370L,293131L,279116L,299433L,299454L,299254L,299279L,299340L,299465L,277155L,277552L,277583L,277716L,295432L,292991L,298943L,298708L,305695L,294993L,303853L,293123L,305221L,306928L,293381L,293387L,305253L,295544L,281915L,296984L,298988L,294808L,306939L,293086L,293267L,295061L,299675L,293180L,293271L,298652L,305172L,299498L,296888L,293175L,293312L,301049L,294933L,294998L,277150L,277164L,293673L,277163L,277168L,277170L,299857L,299330L,299823L,293623L,293396L,294802L,293532L,305966L,300150L,294868L,306936L,299239L,293355L,299850L,298166L,297381L,298417L,294739L,300004L,293001L,293252L,299964L,299376L,278002L,299843L,293003L,293139L,294886L,299357L,299832L,281618L,293484L,294839L,294958L,299419L,293318L,304999L,305520L,292738L,277630L,277705L,298343L,293681L,294810L,295066L,299895L,299492L,298623L,299763L,281293L,295648L,295665L,295684L,295783L,295902L,296887L,294797L,277167L,293044L,299495L,305244L}; + Long[] ids = new Long[]{}; //List ids = tbsActivityMapper.selectReleaseCostIds(); //Set ids = tbsActivityCenterGoodsMapper.selectUpdateCostApplyIds(); List errIds = new ArrayList<>(); diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java index 890323c9..f6ba100b 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java @@ -209,6 +209,9 @@ public class GoodsSpu implements Serializable { @TableField(exist = false) private String skuName; + @TableField(exist = false) + private String skuBelong; + @TableField(exist = false) private String belong; diff --git a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java b/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java index 926aa929..f13ac039 100644 --- a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java +++ b/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java @@ -260,6 +260,8 @@ public class OmsOrderApi { GoodsSku goodsSku = goodsSkuService.getById(orderItem.getSkuId()); if(goodsSku!=null){ orderItem.setSkuSpecialFlag(goodsSku.getSpecialFlag()); + orderItem.setSkuBelong(goodsSku.getBelong()); + orderItem.setSkuAddCode(goodsSku.getSkuAddCode()); } } omsOrder.setOrderItems(list); diff --git a/src/main/java/com/qs/serve/modules/oms/entity/OmsOrderItem.java b/src/main/java/com/qs/serve/modules/oms/entity/OmsOrderItem.java index 60c9334e..7e7db682 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/OmsOrderItem.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/OmsOrderItem.java @@ -129,6 +129,14 @@ public class OmsOrderItem implements Serializable { @TableField(exist = false) private Object spuInfo; + /** skuBelong */ + @TableField(exist = false) + private Object skuBelong; + + /** skuBelong */ + @TableField(exist = false) + private Object skuAddCode; + /** 分类 */ @TableField(exist = false) private Object categoryInfo; diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java index 319f1060..1027e5a6 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java @@ -110,9 +110,11 @@ public class TbsActivityController { @GetMapping("/resetList") public R reset(){ Long[] ids = new Long[]{ + 1701432L,1701437L,1701438L,1701439L,1701440L,1701441L,1701442L,1701443L,1701444L,1701741L,1701743L,1701744L, + 1701895L,1701898L,1701943L,1701988L,1701989L,1701990L,1701991L,1701993L,1701994L,1701996L,1702000L,1702001L,1702003L,1702005L,1702007L,1702009L,1702010L,1702012L,1702028L,1702207L,1702212L,1702213L,1702214L,1702269L,1702283L,1702284L,1702342L,1702344L,1702345L,1702346L,1702349L,1702380L }; for (Long id : ids) { - tbsActivityDebugApplicationService.reset(id); + System.out.println(tbsActivityDebugApplicationService.reset(id)); } return R.ok(); } @@ -535,6 +537,7 @@ public class TbsActivityController { public R getDefaultCenter(@RequestBody TbsActivityDefaultCenterBo defaultCenterBo){ String goodsType = defaultCenterBo.getActivityGoodsType(); List goodsIds = defaultCenterBo.getGoodsIds(); + goodsIds = goodsIds.stream().filter(Objects::nonNull).collect(Collectors.toList()); Long subjectId = defaultCenterBo.getSubjectId(); Long supplierId = defaultCenterBo.getSupplierId(); BmsSupplier supplier = bmsSupplierService.getById(supplierId); @@ -572,7 +575,7 @@ public class TbsActivityController { } } } - List budgetIds = budgetList.stream().map(a->a.getId()).collect(Collectors.toList()); + List budgetIds = budgetList.stream().map(TbsBudget::getId).collect(Collectors.toList()); LambdaQueryWrapper lqwCon = new LambdaQueryWrapper<>(); lqwCon.in(TbsBudgetCondition::getBudgetId,budgetIds); List budgetConditionsAll = tbsBudgetConditionService.list(lqwCon); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetLogController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetLogController.java index 8845b540..a56a1b01 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetLogController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetLogController.java @@ -17,6 +17,7 @@ import com.qs.serve.modules.tbs.entity.so.TbsBudgetSo; import com.qs.serve.modules.tbs.entity.vo.TbsBudgetVo; import com.qs.serve.modules.tbs.mapper.TbsBudgetLogMapper; import com.qs.serve.modules.tbs.mapper.TbsBudgetMapper; +import com.qs.serve.modules.tbs.service.TbsBudgetReleaseApplicationService; import com.qs.serve.modules.tbs.service.TbsBudgetService; import com.qs.serve.modules.tbs.service.TbsScheduleItemBudgetService; import lombok.AllArgsConstructor; @@ -46,6 +47,7 @@ import java.util.stream.Collectors; @RequestMapping("tbs/budgetLog") public class TbsBudgetLogController { + private TbsBudgetReleaseApplicationService tbsBudgetReleaseApplicationService; private TbsBudgetLogService tbsBudgetLogService; private TbsBudgetService tbsBudgetService; private TbsBudgetLogMapper tbsBudgetLogMapper; @@ -53,6 +55,16 @@ public class TbsBudgetLogController { private TbsScheduleItemBudgetService tbsScheduleItemBudgetService; private TbsBudgetLogService budgetLogService; + /** + * 修复释放费用 + * @return + */ + @GetMapping("/debug") + public R debug(){ + tbsBudgetReleaseApplicationService.check(); + return R.ok(); + } + /** * 翻页 * @param param diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityDebugApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityDebugApplicationService.java index 8c0c0181..56bfc633 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityDebugApplicationService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityDebugApplicationService.java @@ -79,6 +79,9 @@ public class TbsActivityDebugApplicationService { //校验核销金额，错误则不执行 BigDecimal totalVerificationAmt = verificationMapper.getActivityVerificationAmt(activityId); + if(totalVerificationAmt==null){ + totalVerificationAmt = BigDecimal.ZERO; + } if(activity.getUsedAmount().compareTo(BigDecimal.ZERO)!=0 &&activity.getUsedAmount().compareTo(totalVerificationAmt)!=0){ return "核销金额异常"; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetReleaseApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetReleaseApplicationService.java index b71e5714..d01f882a 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetReleaseApplicationService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetReleaseApplicationService.java @@ -1,18 +1,128 @@ package com.qs.serve.modules.tbs.service; +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.model.enums.BudgetLogOptFlag; +import com.qs.serve.common.util.CollectionUtil; +import com.qs.serve.modules.sys.entity.SysUser; +import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil; +import com.qs.serve.modules.tbs.entity.*; +import com.qs.serve.modules.vtb.common.VtbFundFlowType; +import com.qs.serve.modules.vtb.entity.VtbFundFlow; +import com.qs.serve.modules.vtb.mapper.VtbFundFlowMapper; +import com.qs.serve.modules.vtb.service.VtbFundFlowService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * @author YenHex * @since 2024/5/28 */ +@Slf4j +@Service +@AllArgsConstructor public class TbsBudgetReleaseApplicationService { + private final VtbFundFlowService fundFlowService; + private final VtbFundFlowMapper vtbFundFlowMapper; + private final TbsBudgetService budgetService; + private final TbsBudgetLogService budgetLogService; + private final TbsBudgetCostItemService budgetCostItemService; + private final TbsActivityService activityService; + private final TbsActivityCenterGoodsService activityCenterGoodsService; + private final TbsCostApplyService costApplyService; + private final TbsActivityPayConditionService activityPayConditionService; + public void check(){ //校验活动的核销金额是否匹配，不匹配则中断 //查询需要补偿释放的活动ID - List activitIds = new ArrayList<>(); + List activityIds = vtbFundFlowMapper.listMissReleaseActivityId(); + for (Long activityId : activityIds) { + TbsActivity activity = activityService.getById(activityId); + TbsCostApply costApply = costApplyService.getById(activity.getCostApplyId()); + + //保存预算日志 + List centerGoodsList = activityCenterGoodsService.listByActivityId(activityId); + LambdaQueryWrapper itemLqw = new LambdaQueryWrapper<>(); + itemLqw.eq(TbsBudgetCostItem::getActivityId,activityId); + List budgetCostItemList = budgetCostItemService.list(itemLqw); + List budgetIds = budgetCostItemList.stream().map(TbsBudgetCostItem::getBudgetId).collect(Collectors.toList()); + if(CollUtil.isEmpty(budgetIds)){ + continue; + } + List budgetLIst = budgetService.listByIds(budgetIds); + List budgetLogList = new ArrayList<>(); + for (TbsActivityCenterGoods centerGoods : centerGoodsList) { + if(centerGoods.getCenterGoodsAmount().compareTo(centerGoods.getUsedAmount())<1){ + continue; + } + TbsBudgetCostItem currCostItem = null; + TbsBudget currentBudget = null; + for (TbsBudgetCostItem costItem : budgetCostItemList) { + if(centerGoods.getId().equals(costItem.getCenterGoodItemId())){ + currCostItem = costItem; + break; + } + } + for (TbsBudget budget : budgetLIst) { + if (currCostItem.getBudgetId().equals(budget.getId())){ + currentBudget = budget; + } + } + BigDecimal amount = centerGoods.getCenterGoodsAmount().subtract(centerGoods.getUsedAmount()); + SysUser sysUser = new SysUser(); + sysUser.setId("0"); + sysUser.setName("系统执行"); + sysUser.setCode("0"); + TbsBudgetLog budgetLog = TbsBudgetLogBuildUtil.buildTbsBudgetLog(BudgetLogOptFlag.State_4,sysUser,costApply,currCostItem,currentBudget,amount,activity); + budgetLogList.add(budgetLog); + } + + //移除历史记录 + fundFlowService.remove( + new LambdaQueryWrapper() + .eq(VtbFundFlow::getFundType, VtbFundFlowType.Release) + .eq(VtbFundFlow::getCostApplyId,activity.getCostApplyId()) + .eq(VtbFundFlow::getActivityId,activity.getId()) + ); + VtbFundFlow fundFlow = new VtbFundFlow(); + fundFlow.setFundType(VtbFundFlowType.Release); + fundFlow.setVerificationId(0L); + fundFlow.setCenterGoodsCode(activity.getActivityCode()+"_00"); + fundFlow.setCostApplyId(activity.getCostApplyId()); + fundFlow.setActivityId(activity.getId()); + fundFlow.setUsedAmount(activity.getReleaseAmount()); + fundFlow.setSupplierId(activity.getSupplierId()); + fundFlow.setSupplierCode(activity.getSupplierCode()); + fundFlow.setSupplierName(activity.getSupplierName()); + fundFlowService.save(fundFlow); + + //移除历史记录 + budgetLogService.remove(new LambdaQueryWrapper() + .eq(TbsBudgetLog::getCostApplyId,activity.getCostApplyId()) + .eq(TbsBudgetLog::getOptType, BudgetLogOptFlag.State_4.getCode()) + .eq(TbsBudgetLog::getActivityId,activity.getId())); + + //更新付款条件状态 + LambdaQueryWrapper updLqw = new LambdaQueryWrapper<>(); + updLqw.eq(TbsActivityPayCondition::getActivityId,activityId); + TbsActivityPayCondition payCondition = new TbsActivityPayCondition(); + payCondition.setFinishedFlag(1); + activityPayConditionService.update(payCondition,updLqw); + + //重新保存 + if(CollectionUtil.isNotEmpty(budgetLogList)){ + budgetLogService.saveBatch(budgetLogList); + } + + } + } diff --git a/src/main/java/com/qs/serve/modules/vtb/mapper/VtbFundFlowMapper.java b/src/main/java/com/qs/serve/modules/vtb/mapper/VtbFundFlowMapper.java index 43f0717d..ae1347f5 100644 --- a/src/main/java/com/qs/serve/modules/vtb/mapper/VtbFundFlowMapper.java +++ b/src/main/java/com/qs/serve/modules/vtb/mapper/VtbFundFlowMapper.java @@ -1,5 +1,6 @@ package com.qs.serve.modules.vtb.mapper; +import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qs.serve.common.model.AmountDTO; import com.qs.serve.modules.vtb.entity.VtbFundFlow; @@ -14,6 +15,9 @@ import java.util.List; */ public interface VtbFundFlowMapper extends BaseMapper { + @InterceptorIgnore(tenantLine = "1") + List listMissReleaseActivityId(); + /** * 统计金额 * @param flow diff --git a/src/main/resources/mapper/goods/GoodsSpuMapper.xml b/src/main/resources/mapper/goods/GoodsSpuMapper.xml index 0979dd54..b1c54251 100644 --- a/src/main/resources/mapper/goods/GoodsSpuMapper.xml +++ b/src/main/resources/mapper/goods/GoodsSpuMapper.xml @@ -36,7 +36,8 @@ goods_sku.sku_name as sku_name, goods_sku.id as sku_id, goods_sku.sku_code as sku_code, - goods_sku.special_flag as sku_special_flag + goods_sku.special_flag as sku_special_flag, + goods_sku.belong as sku_belong diff --git a/src/main/resources/mapper/vtb/VtbFundFlowMapper.xml b/src/main/resources/mapper/vtb/VtbFundFlowMapper.xml index 43f2271f..48054895 100644 --- a/src/main/resources/mapper/vtb/VtbFundFlowMapper.xml +++ b/src/main/resources/mapper/vtb/VtbFundFlowMapper.xml @@ -98,6 +98,26 @@ GROUP BY center_good_item_id + +