opt(oms): 根据用户权限查询对应供应商订单

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<HisUserSupplier> {
      */
     void cleanTable();
 
+    Set<Long> listSupplierIdByUserIds(Collection<String> userIds);
+
 }
 

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<HisUserSupplierMappe
             redisService.set(RedisCacheKeys.HIS_UPDATE,1);
         }
     }
+
+    @Override
+    public Set<Long> listSupplierIdByUserIds(Collection<String> userIds) {
+        if(CollUtil.isNotEmpty(userIds)){
+            LambdaQueryWrapper<HisUserSupplier> lqw = new LambdaQueryWrapper<>();
+            lqw.select(HisUserSupplier::getSupplierId);
+            lqw.in(HisUserSupplier::getUserId,userIds);
+            List<HisUserSupplier> list = this.list(lqw);
+            return list.stream().map(HisUserSupplier::getSupplierId).collect(Collectors.toSet());
+        }
+        return null;
+    }
 }
 

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<PageVo<OmsSaleOrder>> getPage4Pc(OmsSaleOrder param){
+        Set<Long> supplierIds = hisUserSupplierService.listSupplierIdByUserIds(Arrays.asList(AuthContextUtils.getSysUserId()));
+        supplierIds.add(0L);
         PageUtil.startPage();
         LambdaQueryWrapper<OmsSaleOrder> 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<String> userIds = postUserService.listByChildIds(loginUserId);
         userIds.add(loginUserId);
+        Set<Long> supplierIds = hisUserSupplierService.listSupplierIdByUserIds(userIds);
+        supplierIds.add(0L);
         PageUtil.startPage();
         LambdaQueryWrapper<OmsSaleOrder> orderWrapper = new LambdaQueryWrapper<>(param);
-        orderWrapper.in(OmsSaleOrder::getUserId,userIds);
+        orderWrapper.in(OmsSaleOrder::getSupplierId,supplierIds);
         orderWrapper.orderByDesc(OmsSaleOrder::getId);
         List<OmsSaleOrder> list = omsSaleOrderService.list(orderWrapper);
         if(CollectionUtil.isEmpty(list)){

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;

src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java

@@ -386,6 +386,7 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl<OmsSaleOrderMapper, Oms
                 orderItem.setSpecValues(goodsSku.getSpecInfos());
                 orderItem.setSkuBelong(goodsSku.getBelong());
                 orderItem.setSkuUnit(goodsSku.getUnitName());
+                orderItem.setSkuAddCode(goodsSku.getSkuAddCode());
                 orderItem.setSkuImg(goodsSku.getPicUrl());
                 orderItem.setSalesPrice(goodsSku.getSalesPrice());
                 orderItem.setCusPrice(goodsSku.getSalesPrice());
@@ -723,6 +724,7 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl<OmsSaleOrderMapper, Oms
                 orderItem.setSkuTitle(goodsSpu.getSkuName());
                 orderItem.setSkuId(goodSkuVo.getId());
                 orderItem.setSkuCode(goodSkuVo.getSkuCode());
+                orderItem.setSkuAddCode(goodSkuVo.getSkuAddCode());
                 orderItem.setSkuUnit(goodSkuVo.getUnitName());
                 orderItem.setSkuImg(goodSkuVo.getPicUrl());
                 orderItem.setSpecValues(goodSkuVo.getSpecInfos());
@@ -1092,6 +1094,7 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl<OmsSaleOrderMapper, Oms
         orderItem.setSkuTitle(sku.getSkuName());
         orderItem.setSkuCode(sku.getSkuCode());
         orderItem.setSpecValues(sku.getSpecInfos());
+        orderItem.setSkuAddCode(sku.getSkuAddCode());
         orderItem.setSkuUnit(sku.getUnitName());
         orderItem.setSkuImg(sku.getPicUrl());
         orderItem.setSalesPrice(sku.getSalesPrice());

src/main/java/com/qs/serve/modules/third/entity/ProcessCreatePolicyCostBo.java

@@ -1,9 +1,13 @@
 package com.qs.serve.modules.third.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -59,4 +63,9 @@ public class ProcessCreatePolicyCostBo {
      */
     private Integer ignoreTime;
 
+    /**
+     * 初始化时间，当ignoreTime=1时必传
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate initTime;
 }

src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java

@@ -192,7 +192,15 @@ public class PortalOfCostApplication {
      */
     @Transactional(rollbackFor = Exception.class)
     public void createCostProcessByPolicy(ProcessCreatePolicyCostBo createBo){
+        if(createBo.getIgnoreTime()!=null&&createBo.getIgnoreTime()!=1&&createBo.getInitTime()==null){
+            Assert.throwEx("忽略时间时，默认时间不可为空");
+        }
         LocalDateTime nowTime = LocalDateTime.now();
+        LocalDate nowDate = LocalDate.now();
+        if(createBo.getInitTime()!=null){
+            nowTime = createBo.getInitTime().atStartOfDay();
+            nowDate = createBo.getInitTime();
+        }
         SysUser user = userService.getByAccount(createBo.getUserCode());
         if(user==null){Assert.throwEx("用户不存在，请重新编辑");}
         TzcPolicyItem policyItem = policyItemServiceService.getByPolicyItemCode(createBo.getPolicyItemCode());
@@ -241,7 +249,6 @@ public class PortalOfCostApplication {
         //常用参数
         final String GOODS_TYPE = "sku";
         final BigDecimal OneHundred = new BigDecimal("100");
-        LocalDate nowDate = LocalDate.now();
         Long supplierId = Long.parseLong(supplier.getId());
         BigDecimal totalAmount = createBo.getTotalAmount();
         String costTheme = createBo.getCostTheme();

src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyTestController.java

@@ -75,11 +75,19 @@ public class TzcPolicyTestController {
     private SysUserService sysUserService;
     private SysTableTempMapper sysTableTempMapper;
     private TzcPolicyApplicationService tzcPolicyApplicationService;
+    private TzcPolicyItemService policyItemService;
 
 
-    //@GetMapping("/testSyncPolicy")
+    @GetMapping("/testSyncPolicy")
     public R<?>  syncPolicy(Long policyId){
-        tzcPolicyApplicationService.syncPolicyItem(policyId);
+        AuthContextUtils.setTenant("001");
+        LambdaQueryWrapper<TzcPolicyItem> itemLqw = new LambdaQueryWrapper<>();
+        itemLqw.select(TzcPolicyItem::getId);
+        itemLqw.eq(TzcPolicyItem::getPolicyItemStatus,TzPolicyItemStatus.Status_1_PassSuccess);
+        List<TzcPolicyItem> policyItemList = policyItemService.list(itemLqw);
+        for (TzcPolicyItem policyItem : policyItemList) {
+            policyApplicationService.syncPolicyItem(policyItem.getId());
+        }
         return R.ok();
     }
 

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<VtbVerificationMappe
             return;
         }
 
+        LambdaQueryWrapper<SysSyncLog> 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());

src/main/java/com/qs/serve/task/TbsTask.java

@@ -58,13 +58,6 @@ public class TbsTask {
     }
 
 
-    //启用和停用模板规则
-    //@Scheduled(cron="0 0 1 * * ?")
-    public void task2(){
-
-
-    }
-
     /**
      * 每半小时执行一次
      */

src/main/java/com/qs/serve/task/TestTasj.java

@@ -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------------------------");
-    }
-
-}