From 5fb3d89a26b29a752b93fa446d937ec3a462ddd5 Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 15 Jan 2025 10:21:12 +0800 Subject: [PATCH] =?UTF-8?q?opt(oms):=20=E6=A0=B9=E6=8D=AE=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=9D=83=E9=99=90=E6=9F=A5=E8=AF=A2=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../his/service/HisUserSupplierService.java | 5 +++++ .../impl/HisUserSupplierServiceImpl.java | 13 ++++++++++++ .../oms/controller/api/OmsSaleOrderApi.java | 10 +++++++-- .../modules/oms/entity/OmsSaleOrderItem.java | 6 ++---- .../service/impl/OmsSaleOrderServiceImpl.java | 3 +++ .../entity/ProcessCreatePolicyCostBo.java | 9 ++++++++ .../service/PortalOfCostApplication.java | 9 +++++++- .../controller/TzcPolicyTestController.java | 12 +++++++++-- .../impl/VtbVerificationServiceImpl.java | 8 +++++++ src/main/java/com/qs/serve/task/TbsTask.java | 7 ------- src/main/java/com/qs/serve/task/TestTasj.java | 21 ------------------- 11 files changed, 66 insertions(+), 37 deletions(-) delete mode 100644 src/main/java/com/qs/serve/task/TestTasj.java diff --git a/src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java b/src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java index 2b1602ec..5990fcb1 100644 --- a/src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java +++ b/src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java @@ -6,7 +6,10 @@ import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.his.entity.HisUserSupplier; import java.io.Serializable; +import java.util.Collection; import java.util.List; +import java.util.Set; + /** * 供应商负责人 服务接口 * @author YenHex @@ -40,5 +43,7 @@ public interface HisUserSupplierService extends IService { */ void cleanTable(); + Set listSupplierIdByUserIds(Collection userIds); + } diff --git a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java index 99d381e5..4a59b252 100644 --- a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java @@ -1,5 +1,6 @@ package com.qs.serve.modules.his.service.impl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -238,5 +239,17 @@ public class HisUserSupplierServiceImpl extends ServiceImpl listSupplierIdByUserIds(Collection userIds) { + if(CollUtil.isNotEmpty(userIds)){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.select(HisUserSupplier::getSupplierId); + lqw.in(HisUserSupplier::getUserId,userIds); + List list = this.list(lqw); + return list.stream().map(HisUserSupplier::getSupplierId).collect(Collectors.toSet()); + } + return null; + } } diff --git a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java b/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java index ab268a54..4f30f803 100644 --- a/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java +++ b/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java @@ -24,6 +24,7 @@ import com.qs.serve.modules.goods.service.GoodsCategoryRuleService; import com.qs.serve.modules.goods.service.GoodsCategoryService; import com.qs.serve.modules.goods.service.GoodsSkuService; import com.qs.serve.modules.goods.service.GoodsSpuService; +import com.qs.serve.modules.his.service.HisUserSupplierService; import com.qs.serve.modules.oms.common.OmsOrderCheckState; import com.qs.serve.modules.oms.common.OmsSaleYearUtil; import com.qs.serve.modules.oms.entity.OmsOrder; @@ -74,6 +75,7 @@ public class OmsSaleOrderApi { private GoodsImminentBatchMapper goodsImminentBatchMapper; private OmsSaleOrderPart1Service omsSaleOrderPart1Service; private OmsSaleOrderOptionsService omsSaleOrderOptionsService; + private HisUserSupplierService hisUserSupplierService; /** * 查询客户特殊加 @@ -218,9 +220,11 @@ public class OmsSaleOrderApi { */ @GetMapping("/page4pc") public R> getPage4Pc(OmsSaleOrder param){ + Set supplierIds = hisUserSupplierService.listSupplierIdByUserIds(Arrays.asList(AuthContextUtils.getSysUserId())); + supplierIds.add(0L); PageUtil.startPage(); LambdaQueryWrapper orderWrapper = new LambdaQueryWrapper<>(param); - orderWrapper.eq(OmsSaleOrder::getUserId,AuthContextUtils.getSysUserId()); + orderWrapper.in(OmsSaleOrder::getSupplierId,supplierIds); orderWrapper.eq(OmsSaleOrder::getOrderType,param.getOrderType()==null?0:param.getOrderType()); orderWrapper.orderByDesc(OmsSaleOrder::getId); if(param.getCheckStartTime()!=null){ @@ -295,9 +299,11 @@ public class OmsSaleOrderApi { String loginUserId = AuthContextUtils.getSysUserId(); List userIds = postUserService.listByChildIds(loginUserId); userIds.add(loginUserId); + Set supplierIds = hisUserSupplierService.listSupplierIdByUserIds(userIds); + supplierIds.add(0L); PageUtil.startPage(); LambdaQueryWrapper orderWrapper = new LambdaQueryWrapper<>(param); - orderWrapper.in(OmsSaleOrder::getUserId,userIds); + orderWrapper.in(OmsSaleOrder::getSupplierId,supplierIds); orderWrapper.orderByDesc(OmsSaleOrder::getId); List list = omsSaleOrderService.list(orderWrapper); if(CollectionUtil.isEmpty(list)){ diff --git a/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrderItem.java b/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrderItem.java index 02de1da2..2e7aeff8 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrderItem.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrderItem.java @@ -62,6 +62,8 @@ public class OmsSaleOrderItem implements Serializable { @Length(max = 20,message = "sku编码长度不能超过20字") private String skuCode; + private String skuAddCode; + /** sku单位 */ @Length(max = 20,message = "sku单位长度不能超过20字") private String skuUnit; @@ -148,10 +150,6 @@ public class OmsSaleOrderItem implements Serializable { /** skuBelong */ 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/oms/service/impl/OmsSaleOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java index 4e9f6be4..53bd7b4b 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java @@ -386,6 +386,7 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl syncPolicy(Long policyId){ - tzcPolicyApplicationService.syncPolicyItem(policyId); + AuthContextUtils.setTenant("001"); + LambdaQueryWrapper itemLqw = new LambdaQueryWrapper<>(); + itemLqw.select(TzcPolicyItem::getId); + itemLqw.eq(TzcPolicyItem::getPolicyItemStatus,TzPolicyItemStatus.Status_1_PassSuccess); + List policyItemList = policyItemService.list(itemLqw); + for (TzcPolicyItem policyItem : policyItemList) { + policyApplicationService.syncPolicyItem(policyItem.getId()); + } return R.ok(); } 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 d493c239..77e96ee3 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 @@ -63,6 +63,7 @@ import com.qs.serve.modules.vtb.mapper.VtbVerificationMapper; import com.qs.serve.modules.vtb.mapper.VtbVerificationYardItemMapper; import com.qs.serve.modules.vtb.mapper.VtbVerificationYardMapper; import com.qs.serve.modules.vtb.service.*; +import io.netty.internal.tcnative.SSL; import lombok.AllArgsConstructor; import lombok.Data; import lombok.extern.slf4j.Slf4j; @@ -1693,6 +1694,13 @@ public class VtbVerificationServiceImpl extends ServiceImpl logLqw = new LambdaQueryWrapper<>(); + logLqw.eq(SysSyncLog::getFailReason,"{\"status\":500,\"message\":\"已存在支付信息，不能修改\",\"data\":null}"); + logLqw.like(SysSyncLog::getRemark,"["+verification.getVerificationCode()+"]"); + long count = sysSyncLogService.count(logLqw); + if (count>0){ + return; + } for (VtbVerificationSubject verificationSubject : verificationSubjects) { subject.setSubjectCode(verificationSubject.getSubjectCode()); subject.setSubjectName(verificationSubject.getSubjectName()); diff --git a/src/main/java/com/qs/serve/task/TbsTask.java b/src/main/java/com/qs/serve/task/TbsTask.java index c4c79283..0f42c252 100644 --- a/src/main/java/com/qs/serve/task/TbsTask.java +++ b/src/main/java/com/qs/serve/task/TbsTask.java @@ -58,13 +58,6 @@ public class TbsTask { } - //启用和停用模板规则 - //@Scheduled(cron="0 0 1 * * ?") - public void task2(){ - - - } - /** * 每半小时执行一次 */ diff --git a/src/main/java/com/qs/serve/task/TestTasj.java b/src/main/java/com/qs/serve/task/TestTasj.java deleted file mode 100644 index 2399528e..00000000 --- a/src/main/java/com/qs/serve/task/TestTasj.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.qs.serve.task; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -/** - * @author YenHex - * @since 2023/6/1 - */ -@Slf4j -//@Component -public class TestTasj { - - @Scheduled(cron="*/10 * * * * ?") - public void test11(){ - System.out.println("test------------------------"); - } - -}