From a97c6a3bd386983ea8442c05f0c2cdae7edcbf59 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 11 Sep 2023 09:36:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=B8=E9=94=80=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bms/entity/bo/BmsSupplierExcelBo.java | 2 +- .../modules/tbs/entity/TbsCostApply.java | 17 +++++++++++ .../modules/tbs/entity/vo/TbsCostApplyVo.java | 10 +++++++ .../service/impl/TbsCostApplyServiceImpl.java | 30 +++++++++++++++++-- .../impl/VtbVerificationServiceImpl.java | 4 ++- 5 files changed, 58 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java index f3d5796d..40f36554 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java @@ -124,7 +124,7 @@ public class BmsSupplierExcelBo { if(StringUtils.hasText(bmsSupplier.getOtherUserNames())) { bo.setMinorHeadNames(bmsSupplier.getOtherUserNames().replaceAll(",", ";")); } - if(StringUtils.hasText(bmsSupplier.if(StringUtils.hasText(bmsSupplier.getUserCode())) {())) { + if(StringUtils.hasText(bmsSupplier.getOtherUserCodes())) { bo.setMinorHeadCodes(bmsSupplier.getOtherUserCodes().replaceAll(",", ";")); } bo.setIsExpendableExpense(bmsSupplier.getCostFlag()); 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 1f792f49..2ff9e4a9 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 @@ -68,6 +68,22 @@ public class TbsCostApply implements Serializable { @NotNull(message = "状态不能为空") private Integer chargeState; + /** + * 核销状态： + * 有这四个状态： + * 0-未核销：代表这案子里面的所有活动都还未开始核销； + * 1-已通过：代表这个案子的所有活动都已经核销完成； + * 2-核销中：代表这个案子的某些活动在核销中； + * 3-被拒绝；代表这个案子里面的所有活动金额都被释放了 + */ + private Integer checkState; + + /** + * 记录核销状态 + * 用于记录核销前状态 + */ + //private Integer logCheckState; + /** 备注 */ @Length(max = 255,message = "备注长度不能超过255字") private String remark; @@ -229,5 +245,6 @@ public class TbsCostApply implements Serializable { @TableField(exist = false) List selectUserIds; + } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java index 27ebb5b8..46cf515c 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsCostApplyVo.java @@ -94,5 +94,15 @@ public class TbsCostApplyVo implements Serializable { private String templateTitle; + /** + * 核销状态： + * 有这四个状态： + * 0-未核销：代表这案子里面的所有活动都还未开始核销； + * 1-已通过：代表这个案子的所有活动都已经核销完成； + * 2-核销中：代表这个案子的某些活动在核销中； + * 3-被拒绝；代表这个案子里面的所有活动金额都被释放了 + */ + private Integer checkState; + } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index d30413ca..2f92253d 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -889,18 +889,22 @@ public class TbsCostApplyServiceImpl extends ServiceImpl actLqw = new LambdaQueryWrapper<>(); + actLqw.eq(TbsActivity::getCostApplyId,costApplyId); + List activityList = tbsActivityMapper.selectList(actLqw); if(isContractFlag){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(TbsActivityPayCondition::getCostApplyId,costApplyId); lqw.ne(TbsActivityPayCondition::getFinishedFlag,1); Long count = tbsActivityPayConditionMapper.selectCount(lqw); if (count>0){ + TbsCostApply costApply = new TbsCostApply(); + costApply.setId(costApplyId); + costApply.setCheckState(2); + this.updateById(costApply); return; } }else { - LambdaQueryWrapper actLqw = new LambdaQueryWrapper<>(); - actLqw.eq(TbsActivity::getCostApplyId,costApplyId); - List activityList = tbsActivityMapper.selectList(actLqw); for (TbsActivity activity : activityList) { if(activity.getActivityState().equals(TbsActivityState.STATE_4_Release)){ continue; @@ -908,12 +912,32 @@ public class TbsCostApplyServiceImpl extends ServiceImpl Date: Mon, 11 Sep 2023 10:06:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B4=AD=E7=89=A9?= =?UTF-8?q?=E8=BD=A6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oms/controller/api/OmsShoppingCartApi.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsShoppingCartApi.java b/src/main/java/com/qs/serve/modules/oms/controller/api/OmsShoppingCartApi.java index 56030bbe..9d81e83c 100644 --- a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsShoppingCartApi.java +++ b/src/main/java/com/qs/serve/modules/oms/controller/api/OmsShoppingCartApi.java @@ -92,8 +92,24 @@ public class OmsShoppingCartApi { public R save(@RequestBody @Valid OmsShoppingCartSaveBo param){ BmsSupplier supplier = AuthContextUtils.getCurrentSupplier(); OmsShoppingCart shoppingCart = CopierUtil.copy(param,new OmsShoppingCart()); - shoppingCart.setUserId(AuthContextUtils.getSysUserId()); GoodsSku goodsSku = goodsSkuService.getById(shoppingCart.getSkuId()); + //用于修改sku + OmsShoppingCart orgShopCart = omsShoppingCartService.getOne( + new LambdaQueryWrapper() + .eq(OmsShoppingCart::getSkuCode,goodsSku.getSkuCode()) + .ne(param.getCartId()!=null,OmsShoppingCart::getId,param.getCartId()) + ,false + ); + if(orgShopCart!=null){ + orgShopCart.setQuantity(orgShopCart.getQuantity()+param.getQuantity()); + omsShoppingCartService.updateById(orgShopCart); + //移除多余 + omsShoppingCartService.remove(new LambdaQueryWrapper() + .eq(OmsShoppingCart::getSkuCode,goodsSku.getSkuCode()) + .ne(OmsShoppingCart::getId,param.getCartId())); + return R.ok(); + } + shoppingCart.setUserId(AuthContextUtils.getSysUserId()); GoodsSpu goodsSpu = goodsSpuService.getById(goodsSku.getSpuId()); if(!goodsSku.getEnable().equals(1)){ return R.error("商品项["+goodsSku.getSpecInfos()+"]停用中"); From 3d4c9292ec8c9f7fa2ee6f438222d09ef75a9c31 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 11 Sep 2023 10:22:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E7=B1=BB=E6=8B=93?= =?UTF-8?q?=E5=B1=95OA=E9=83=A8=E9=97=A8id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qs/serve/modules/bms/entity/BmsDutyInfo.java | 3 +++ .../serve/modules/bms/service/BmsDutyInfoService.java | 2 ++ .../bms/service/impl/BmsDutyInfoServiceImpl.java | 7 +++++++ .../tbs/controller/TbsCostContractController.java | 11 +++++++++++ .../qs/serve/modules/tbs/entity/TbsCostContract.java | 3 +++ 5 files changed, 26 insertions(+) diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsDutyInfo.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsDutyInfo.java index 03961e0d..55b13d43 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsDutyInfo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsDutyInfo.java @@ -39,6 +39,9 @@ public class BmsDutyInfo implements Serializable { @Length(max = 255,message = "税号长度不能超过255字") private String dutyCode; + /** 致远的部门id */ + private String oaDeptId; + /** 是否显示 */ private Integer showFlag; diff --git a/src/main/java/com/qs/serve/modules/bms/service/BmsDutyInfoService.java b/src/main/java/com/qs/serve/modules/bms/service/BmsDutyInfoService.java index c4d1a7df..773beb17 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/BmsDutyInfoService.java +++ b/src/main/java/com/qs/serve/modules/bms/service/BmsDutyInfoService.java @@ -10,5 +10,7 @@ import com.qs.serve.modules.bms.entity.BmsDutyInfo; */ public interface BmsDutyInfoService extends IService { + BmsDutyInfo getByDutyNumber(String code); + } diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsDutyInfoServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsDutyInfoServiceImpl.java index 35a93e2c..ab0fe333 100644 --- a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsDutyInfoServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsDutyInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.qs.serve.modules.bms.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -18,5 +19,11 @@ import com.qs.serve.modules.bms.mapper.BmsDutyInfoMapper; @AllArgsConstructor public class BmsDutyInfoServiceImpl extends ServiceImpl implements BmsDutyInfoService { + @Override + public BmsDutyInfo getByDutyNumber(String code) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(BmsDutyInfo::getDutyCode,code); + return getOne(lqw,false); + } } diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostContractController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostContractController.java index eccd9569..2b2b9395 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostContractController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostContractController.java @@ -10,6 +10,8 @@ import com.qs.serve.common.util.CollectionUtil; import com.qs.serve.common.util.PageUtil; import com.qs.serve.common.util.CopierUtil; import com.qs.serve.common.util.StringUtils; +import com.qs.serve.modules.bms.entity.BmsDutyInfo; +import com.qs.serve.modules.bms.service.BmsDutyInfoService; import com.qs.serve.modules.sys.entity.SysAttach; import com.qs.serve.modules.sys.service.SysAttachService; import com.qs.serve.modules.tbs.entity.bo.TbsCostContractBo; @@ -38,6 +40,7 @@ public class TbsCostContractController { private TbsCostContractService tbsCostContractService; private SysAttachService attachService; + private BmsDutyInfoService bmsDutyInfoService; /** * 列表 @@ -123,6 +126,10 @@ public class TbsCostContractController { contract.setExpireTime(param.getExpireTime()); contract.setBusinessCompany(param.getBusinessCompany()); contract.setDutyNumber(param.getDutyNumber()); + BmsDutyInfo bmsDutyInfo = bmsDutyInfoService.getByDutyNumber(param.getDutyNumber()); + if(bmsDutyInfo!=null){ + contract.setOaDeptId(bmsDutyInfo.getOaDeptId()); + } boolean result = tbsCostContractService.updateById(contract); return R.isTrue(result); } @@ -157,6 +164,10 @@ public class TbsCostContractController { contract.setFileNum(param.getFileNum()); contract.setBusinessCompany(param.getBusinessCompany()); contract.setDutyNumber(param.getDutyNumber()); + BmsDutyInfo bmsDutyInfo = bmsDutyInfoService.getByDutyNumber(param.getDutyNumber()); + if(bmsDutyInfo!=null){ + contract.setOaDeptId(bmsDutyInfo.getOaDeptId()); + } } if(contract.getId()==null){ tbsCostContractService.save(contract); diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostContract.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostContract.java index d4b884be..187536e5 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostContract.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostContract.java @@ -73,6 +73,9 @@ public class TbsCostContract implements Serializable { /** 税号 */ private String dutyNumber; + /** 致远的部门id */ + private String oaDeptId; + /** 创建时间 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")