From da192d780708d664f0495d02f658a5b85396db5b Mon Sep 17 00:00:00 2001 From: Yen Date: Fri, 1 Sep 2023 11:10:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?his=E5=AE=A2=E6=88=B7=E9=97=AD=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=9B=E9=A2=84=E7=AE=97=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D=EF=BC=9B=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E7=B1=BB=E5=85=B3=E8=81=94=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/framework/manager/AsyncFactory.java | 7 ++++--- .../serve/modules/bms/entity/BmsSupplier.java | 4 ++++ .../modules/his/entity/HisUserSupplier.java | 18 ++++++++++++++++++ .../his/entity/HisUserSupplierTemp.java | 15 +++++++++++++++ .../controller/TbsCostContractController.java | 4 ++++ .../modules/tbs/entity/TbsCostContract.java | 6 ++++++ .../tbs/entity/bo/TbsAffairCommitBo.java | 2 ++ .../tbs/entity/bo/TbsCostContractBo.java | 6 ++++++ .../TbsBudgetApplyOperationServiceImpl.java | 3 +-- .../service/impl/TbsCostApplyServiceImpl.java | 3 +++ 10 files changed, 63 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java b/src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java index 07e5235b..386267fa 100644 --- a/src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java +++ b/src/main/java/com/qs/serve/common/framework/manager/AsyncFactory.java @@ -16,6 +16,7 @@ import com.qs.serve.modules.tbs.entity.TbsCostApply; import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo; import com.qs.serve.modules.tbs.service.impl.TbsBudgetApplyOperationServiceImpl; import com.qs.serve.modules.tbs.service.impl.TbsBudgetBatchOperationServiceImpl; +import com.qs.serve.modules.tbs.service.impl.TbsBudgetChangeOperationServiceImpl; import com.qs.serve.modules.tbs.service.impl.TbsCostApplyOperationServiceImpl; import com.qs.serve.modules.tzc.service.impl.TzcPolicyOperationServiceImpl; import com.qs.serve.modules.vtb.common.VtbVerificationState; @@ -92,9 +93,9 @@ public class AsyncFactory { public void run() { try { AuthContextUtils.setTenant("001"); - log.debug("--------------------------SubmitBudgetApply CallbackTimer Sleep Start------------------------------"); + log.debug("--------------------------SubmitBudgetApply CallbackTimer Sleep Start :{}------------------------------",budgetId); Thread.sleep(7*1000); - TbsBudgetApplyOperationServiceImpl applyOperationService = SpringUtils.getBean(TbsBudgetApplyOperationServiceImpl.class); + TbsBudgetChangeOperationServiceImpl applyOperationService = SpringUtils.getBean(TbsBudgetChangeOperationServiceImpl.class); String summeryResult = applyOperationService.checkAffairSummery(budgetId); if(summeryResult.equals(SeeYonOperationService.SummeryState_Success)){ @@ -173,7 +174,7 @@ public class AsyncFactory { public void run() { try { AuthContextUtils.setTenant("001"); - log.debug("--------------------------SubmitBudgetApply CallbackTimer Sleep Start------------------------------"); + log.debug("--------------------------submitBudgetApply CallbackTimer Sleep Start :{}------------------------------",budgetId); Thread.sleep(7*1000); TbsBudgetApplyOperationServiceImpl applyOperationService = SpringUtils.getBean(TbsBudgetApplyOperationServiceImpl.class); String summeryResult = applyOperationService.checkAffairSummery(budgetId); diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java index 78e1afe3..6d8dd3b6 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java @@ -385,6 +385,10 @@ public class BmsSupplier implements Serializable { userSupplier.setSupplierFlag(this.getSupplierFlag()); userSupplier.setType(type); userSupplier.setCostFlag(this.costFlag); + userSupplier.setStopFlag(this.stopFlag); + userSupplier.setStopFlagDate(this.stopFlagDate); + userSupplier.setCooperatePauseFlag(this.cooperatePauseFlag); + userSupplier.setCooperatePauseFlagDate(this.getCooperatePauseFlagDate()); return userSupplier; } diff --git a/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java b/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java index 353917ec..a9abf94b 100644 --- a/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java +++ b/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplier.java @@ -108,6 +108,24 @@ public class HisUserSupplier implements Serializable { /** 是否供应商 */ private Integer supplierFlag; + + /** 闭户 */ + private Integer stopFlag; + + /** 闭户日期 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime stopFlagDate; + + /** 暂不合作 */ + private Integer cooperatePauseFlag; + + /** 暂不合作日期 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime cooperatePauseFlagDate; + + @TableField(exist = false) private String queryAddress; diff --git a/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplierTemp.java b/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplierTemp.java index 55499803..c035fdcc 100644 --- a/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplierTemp.java +++ b/src/main/java/com/qs/serve/modules/his/entity/HisUserSupplierTemp.java @@ -108,6 +108,21 @@ public class HisUserSupplierTemp implements Serializable { /** */ private Integer costFlag; + /** 闭户 */ + private Integer stopFlag; + + /** 闭户日期 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime stopFlagDate; + + /** 暂不合作 */ + private Integer cooperatePauseFlag; + + /** 暂不合作日期 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private LocalDateTime cooperatePauseFlagDate; public static HisUserSupplierTemp toNewObject(HisUserSupplierTemp source){ HisUserSupplierTemp userSupplierTemp = new HisUserSupplierTemp(); 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 19774b08..eccd9569 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 @@ -121,6 +121,8 @@ public class TbsCostContractController { contract.setAttachIds(param.getAttachIds()); contract.setSignTime(param.getSignTime()); contract.setExpireTime(param.getExpireTime()); + contract.setBusinessCompany(param.getBusinessCompany()); + contract.setDutyNumber(param.getDutyNumber()); boolean result = tbsCostContractService.updateById(contract); return R.isTrue(result); } @@ -153,6 +155,8 @@ public class TbsCostContractController { contract.setSealId(param.getSealId()); contract.setSealNum(param.getSealNum()); contract.setFileNum(param.getFileNum()); + contract.setBusinessCompany(param.getBusinessCompany()); + contract.setDutyNumber(param.getDutyNumber()); } 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 dae9c79d..d4b884be 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 @@ -67,6 +67,12 @@ public class TbsCostContract implements Serializable { @Length(max = 255,message = "备注长度不能超过255字") private String remark; + /** 业务所属公司 */ + private String businessCompany; + + /** 税号 */ + private String dutyNumber; + /** 创建时间 */ @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/bo/TbsAffairCommitBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java index 0c944e8d..b34c52d1 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java @@ -59,6 +59,8 @@ public class TbsAffairCommitBo { */ private List affairSubjectLines; + + @Data public static class AffairSubjectLine{ diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostContractBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostContractBo.java index 4f9b48db..5afea2f3 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostContractBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsCostContractBo.java @@ -40,6 +40,12 @@ public class TbsCostContractBo implements Serializable { /** 合同条件(文本框) */ private String contractCondition; + /** 业务所属公司 */ + private String businessCompany; + + /** 税号 */ + private String dutyNumber; + /** 合同附件地址 */ private String[] attachIds; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java index 8184f5dd..f4ae70ba 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java @@ -82,8 +82,7 @@ public class TbsBudgetApplyOperationServiceImpl implements SeeYonOperationServic //启用预算 tbsBudget.setBudgetState(1); budgetMapper.updateById(tbsBudget); - - SysUser sysUser = getSysUserService().getById(AuthContextUtils.getSysUserId()); + SysUser sysUser = getSysUserService().getById(tbsBudget.getUserId()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(TbsScheduleItemBudget::getBudgetId,param.getTargetId()); List scheduleItemBudgets = scheduleItemBudgetService.list(lqw); 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 e5d76443..d30413ca 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 @@ -601,6 +601,9 @@ public class TbsCostApplyServiceImpl extends ServiceImpl Date: Mon, 4 Sep 2023 10:19:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A2=84=E7=AE=97?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E4=B8=A2=E5=A4=B1=E5=93=81?= =?UTF-8?q?=E7=B1=BB=E6=9D=A1=E4=BB=B6=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serve/common/util/AuthContextUtils.java | 38 ++--- .../BmsSupplierVisitAddressController.java | 2 + .../bms/entity/so/BmsSupplierVisitSo.java | 9 ++ .../controller/api/OmsShoppingCartApi.java | 2 +- .../impl/TbsBudgetBatchServiceImpl.java | 135 +++++++++++++++--- .../mapper/his/HisUserSupplierMapper.xml | 3 +- 6 files changed, 151 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/qs/serve/common/util/AuthContextUtils.java b/src/main/java/com/qs/serve/common/util/AuthContextUtils.java index 04114b7c..9fdcf7fe 100644 --- a/src/main/java/com/qs/serve/common/util/AuthContextUtils.java +++ b/src/main/java/com/qs/serve/common/util/AuthContextUtils.java @@ -84,25 +84,25 @@ public class AuthContextUtils { Long supplierId = AuthContextUtils.getSupplierId(); BmsSupplierService supplierService = SpringUtils.getBean(BmsSupplierService.class); BmsSupplier supplier = supplierService.getById(supplierId); - if(supplier==null){ - Assert.throwEx(4106,"供应商无效或未授权"); - } - boolean isOther = false; - - if(CollectionUtil.isNotEmpty(supplier.getOtherUserIds())){ - for (String otherUserId : supplier.getOtherUserIds()) { - if(userId.equals(otherUserId)){ - isOther = true; - break; - } - } - } - if(isOther && !supplier.getUserId().equals(userId)){ - Assert.throwEx(4106,"供应商无效或未授权"); - } - if(supplier.getStopFlag().equals(1)){ - Assert.throwEx(4106,"供应商已停用"); - } +// if(supplier==null){ +// Assert.throwEx(4106,"供应商无效或未授权"); +// } +// boolean isOther = false; +// +// if(CollectionUtil.isNotEmpty(supplier.getOtherUserIds())){ +// for (String otherUserId : supplier.getOtherUserIds()) { +// if(userId.equals(otherUserId)){ +// isOther = true; +// break; +// } +// } +// } +// if(isOther && !supplier.getUserId().equals(userId)){ +// Assert.throwEx(4106,"供应商无效或未授权"); +// } +// if(supplier.getStopFlag().equals(1)){ +// Assert.throwEx(4106,"供应商已停用"); +// } return supplier; } diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java index 364df836..41eae882 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java @@ -77,6 +77,8 @@ public class BmsSupplierVisitAddressController { userSupplier.setQueryValue(param.getSearchValue()); userSupplier.setLocalX(param.getLocalX()); userSupplier.setLocalY(param.getLocalY()); + userSupplier.setStopFlag(param.getStopFlag()); + userSupplier.setCooperatePauseFlag(param.getCooperatePauseFlag()); List userIds = sysPostUserService.listByChildIds(userId); userIds.add(userId); userSupplier.setSelectUserIds(userIds); diff --git a/src/main/java/com/qs/serve/modules/bms/entity/so/BmsSupplierVisitSo.java b/src/main/java/com/qs/serve/modules/bms/entity/so/BmsSupplierVisitSo.java index 8b19428e..a69fcd7b 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/so/BmsSupplierVisitSo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/so/BmsSupplierVisitSo.java @@ -43,4 +43,13 @@ public class BmsSupplierVisitSo { /** 翻页参数2 */ private Integer pageSize; + + + /** 闭户 */ + private Integer stopFlag; + + + /** 暂不合作 */ + private Integer cooperatePauseFlag; + } 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 3adfca2d..919a216b 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 @@ -123,7 +123,7 @@ public class OmsShoppingCartApi { @DeleteMapping("/deleteById/{id}") public R deleteById(@PathVariable("id") Long id){ omsShoppingCartService.removeById(id); - return R.error(); + return R.ok(); } } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java index 614148ec..68e1b855 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java @@ -189,30 +189,41 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl categoryMap = loadGoodsCategoryMap(param); - //有错误信息退出 - if(param.isErrorFlag()){ - return null; - } - - this.save(budgetBatch); - //保存后赋值 - Long batchId = budgetBatch.getId(); //修改的生成为更变记录 List updBudgetList = paramBudgetList.stream() .filter(a->StringUtils.hasText(a.getBudgetNumber())).collect(Collectors.toList()); + List budgetList = new ArrayList<>(); if(updBudgetList.size()>0){ List budgetNumbers = updBudgetList.stream() .map(TbsBudgetBatchBo.BudgetMain::getBudgetNumber).collect(Collectors.toList()); - List budgetList = tbsBudgetService.list( + budgetList = tbsBudgetService.list( new LambdaQueryWrapper().in( TbsBudget::getBudgetNumber,budgetNumbers - ) + ) ); for (TbsBudget budget : budgetList) { if(budget.getBudgetCheckState()==TbsBudgetCheckState.State_1_apply){ - Assert.throwEx("预算["+budget.getBudgetCode()+"]审批中，无法导入修改"); + for (TbsBudgetBatchBo.BudgetMain budgetMain : updBudgetList) { + if(budgetMain.getBudgetNumber().equals(budget.getBudgetNumber())){ + budgetMain.getErrorInfos().add("预算["+budget.getBudgetCode()+"]审批中，无法导入修改"); + param.setErrorFlag(true); + } + } } } + } + + //有错误信息退出 + if(param.isErrorFlag()){ + return null; + } + + this.save(budgetBatch); + //保存后赋值 + Long batchId = budgetBatch.getId(); + + if(updBudgetList.size()>0){ + for (TbsBudget budget : budgetList) { TbsBudgetBatchBo.BudgetMain paramItem = null; for (TbsBudgetBatchBo.BudgetMain budgetMain : updBudgetList) { @@ -303,7 +314,7 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl scheduleMap, Map subjectMap, Map centerDtoMap, Map categoryMap, TbsBudgetBatchBo.BudgetMain paramItem, Long budgetId) { - tbsBudgetService.removeById(budgetId); + //tbsBudgetService.removeById(budgetId); tbsBudgetConditionService.remove( new LambdaQueryWrapper() .eq(TbsBudgetCondition::getBudgetId, budgetId) @@ -427,7 +438,37 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpla.getName().equals(categoryName)); - if(!exist){ - //Assert.throwEx("无效的品类："+categoryName); + List tempList = goodsCategories.stream() + .filter(a->a.getName().equals(categoryName)).collect(Collectors.toList()); + if(tempList.size()<1){ for (TbsBudgetBatchBo.BudgetMain budgetMain : paramBudgetList) { boolean bandNamesFlag = budgetMain.getBrandNames() != null && budgetMain.getBrandNames().contains(categoryName); boolean categoryNamesFlag = budgetMain.getCategoryNames() != null && budgetMain.getCategoryNames().contains(categoryName); boolean seriesNamesFlag = budgetMain.getSeriesNames() != null && budgetMain.getSeriesNames().contains(categoryName); - if(bandNamesFlag||categoryNamesFlag||seriesNamesFlag){ + if(bandNamesFlag){ + budgetMain.getErrorInfos().add("无效的品牌："+categoryName); + param.setErrorFlag(true); + break; + } + if(categoryNamesFlag){ + budgetMain.getErrorInfos().add("无效的品类："+categoryName); + param.setErrorFlag(true); + break; + } + if(seriesNamesFlag){ + budgetMain.getErrorInfos().add("无效的系列："+categoryName); + param.setErrorFlag(true); + break; + } + } + } + } + }else{ + for (String categoryName : goodsCategoryNames) { + List tempList = goodsCategories.stream() + .filter(a->a.getName().equals(categoryName)).collect(Collectors.toList()); + for (TbsBudgetBatchBo.BudgetMain budgetMain : paramBudgetList) { + boolean bandNamesFlag = budgetMain.getBrandNames() != null && budgetMain.getBrandNames().contains(categoryName); + boolean categoryNamesFlag = budgetMain.getCategoryNames() != null && budgetMain.getCategoryNames().contains(categoryName); + boolean seriesNamesFlag = budgetMain.getSeriesNames() != null && budgetMain.getSeriesNames().contains(categoryName); + if(bandNamesFlag){ + boolean isTrue = false; + for (GoodsCategory category : tempList) { + if(category.getLevel().equals(1)){ + isTrue = true; + break; + } + } + if(!isTrue){ + budgetMain.getErrorInfos().add("无效的品牌："+categoryName); + param.setErrorFlag(true); + } + } + if(categoryNamesFlag){ + boolean isTrue = false; + for (GoodsCategory category : tempList) { + if(category.getLevel().equals(2)){ + isTrue = true; + break; + } + } + if(!isTrue){ budgetMain.getErrorInfos().add("无效的品类："+categoryName); param.setErrorFlag(true); } } + if(seriesNamesFlag){ + boolean isTrue = false; + for (GoodsCategory category : tempList) { + if(category.getLevel().equals(3)){ + isTrue = true; + break; + } + } + if(!isTrue){ + budgetMain.getErrorInfos().add("无效的系列："+categoryName); + param.setErrorFlag(true); + } + } } } } diff --git a/src/main/resources/mapper/his/HisUserSupplierMapper.xml b/src/main/resources/mapper/his/HisUserSupplierMapper.xml index 2761df1c..c1b1a8f7 100644 --- a/src/main/resources/mapper/his/HisUserSupplierMapper.xml +++ b/src/main/resources/mapper/his/HisUserSupplierMapper.xml @@ -45,7 +45,8 @@ and `his_user_supplier`.`biz_region_third` = #{query.bizRegionThird} and `his_user_supplier`.`biz_region_fourthly` = #{query.bizRegionFourthly} and `his_user_supplier`.`tenant_id` = #{query.tenantId} - and `his_user_supplier`.`cost_flag` = #{query.costFlag} + and `his_user_supplier`.`stop_flag` = #{query.stopFlag} + and `his_user_supplier`.`cooperate_puse_flag` = #{query.cooperatePauseFlag} and `bms_supplier_visit_address`.`address_detail` like concat('%',#{query.queryAddress},'%') and (`bms_supplier_visit_address`.`address_detail` like concat('%',#{query.queryValue},'%') From 5610abd3f502757c2a72f0746f7505e09c4fdb1e Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 4 Sep 2023 11:07:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E9=A2=84=E7=AE=97=E4=BF=AE=E6=94=B9=E9=87=91=E9=A2=9D=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/framework/mvc/HttpServletRequestFilter.java | 2 +- .../modules/oms/controller/api/OmsShoppingCartApi.java | 8 +++++++- .../modules/oms/entity/bo/OmsShoppingCartSaveBo.java | 2 ++ .../tbs/service/impl/TbsBudgetBatchServiceImpl.java | 6 +++--- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java b/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java index 18db5cc2..11ac0373 100644 --- a/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java +++ b/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java @@ -71,7 +71,7 @@ public class HttpServletRequestFilter implements Filter{ } StringBuffer buffer = new StringBuffer("["+method+"] "+url); if(supplierId!=null){ - buffer.append("供应商ID: "+supplierId); + buffer.append(" 供应商ID: "+supplierId); } if(!StringUtils.isEmpty(queryStr)){ buffer.append("\n参数: "+queryStr); 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 919a216b..9d33dbc9 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 @@ -98,6 +98,7 @@ public class OmsShoppingCartApi { } shoppingCart.setPicUrl(goodsSku.getPicUrl()); shoppingCart.setSpuId(goodsSku.getSpuId()); + shoppingCart.setAddPrice(goodsSku.getSalesPrice()); GoodsSpu goodsSpu = goodsSpuService.getById(shoppingCart.getSpuId()); if(!goodsSpu.getShelf().equals(1)){ return R.error("商品已下架"); @@ -111,7 +112,12 @@ public class OmsShoppingCartApi { List skuSpecValues = goodsSkuSpecValueService.listSpecValueBySkuId(goodsSku.getId()); String specInfo = skuSpecValues.stream().map(GoodsSkuSpecValueVo::getSpecValue).collect(Collectors.joining(";")); shoppingCart.setSpecInfo(specInfo); - omsShoppingCartService.save(shoppingCart); + if(param.getCartId()==null){ + omsShoppingCartService.save(shoppingCart); + }else { + shoppingCart.setId(param.getCartId()); + omsShoppingCartService.updateById(shoppingCart); + } return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsShoppingCartSaveBo.java b/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsShoppingCartSaveBo.java index 9f6894ca..f8abfe6b 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsShoppingCartSaveBo.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/bo/OmsShoppingCartSaveBo.java @@ -14,6 +14,8 @@ import java.math.BigDecimal; @Data public class OmsShoppingCartSaveBo { + private Long cartId; + /** 商品SKU */ @NotNull(message = "商品SKU不能为空") private Long skuId; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java index 68e1b855..02b95d3b 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java @@ -389,12 +389,12 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl