从V2.3.2024.07.02到 dev.18-0712

app/cloud-syb-app/pagesOrder/order/order_details.vue

@@ -1180,7 +1180,7 @@ export default {
         this.orders.status === 'finish' &&
         (this.orders.createBy === this.user.orgId ||
           this.orders.userPartnerId === this.user.orgId) &&
-        this.orders.waitPayNum > 0
+        (this.orders.waitPayNum > 0 || this.orders.debtNowNum > 0)
     },
     /**
      * 协议文件权限

server/cloud-auth/src/main/java/com/shusi/modules/sys/service/impl/RoleServiceImpl.java

@@ -27,6 +27,7 @@ import com.shusi.util.SecurityUtil;
 import com.shusi.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
@@ -77,6 +78,8 @@ public class RoleServiceImpl extends ServiceImpl<RoleDao, Role> implements RoleS
     @Autowired
     private RolePoolRelationService rolePoolRelationService;
 
+    @Value("${shusi.adminId}")
+    private String adminId;
 
 
     @Override
@@ -374,7 +377,11 @@ public class RoleServiceImpl extends ServiceImpl<RoleDao, Role> implements RoleS
         if (CollectionUtil.isEmpty(userPermissionQryDTO.getOrgType())) {
             userPermissionQryDTO.setOrgType(StrUtil.split(SecurityUtil.getOrgType(), ','));
         }
-        return this.baseMapper.getPermissionSet(userPermissionQryDTO);
+        List<String> permissionSet = this.baseMapper.getPermissionSet(userPermissionQryDTO);
+        if (adminId.equals(userPermissionQryDTO.getUserId())) {
+            permissionSet.add("ADMIN");
+        }
+        return permissionSet;
     }
 
     @Override

server/cloud-common/pom.xml

@@ -65,5 +65,11 @@
             <version>5.3.1</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.huaweicloud</groupId>
+            <artifactId>esdk-obs-java</artifactId>
+            <version>3.19.7</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

server/cloud-core/src/main/java/com/shusi/filter/AuthFilter.java

@@ -73,8 +73,6 @@ public class AuthFilter extends OncePerRequestFilter {
 
     @Value("${feign.auth-name}")
     private String authName;
-    @Value("${shusi.adminId}")
-    private String adminId;
 
     /**
      * 接口频率限制秒数
@@ -147,10 +145,6 @@ public class AuthFilter extends OncePerRequestFilter {
                                 }
                             }
                             DateUtil.costTime(time, "拉取权限", 100);
-                            // 超级管理员
-                            if (adminId.equals(userPrincipal.getUserId())) {
-                                authorities.add(new SimpleGrantedAuthority("ADMIN"));
-                            }
                             // 设置用户凭证权限
                             UserDetailDTO userDetailDTO = new UserDetailDTO(userPrincipal, null);
                             userDetailDTO.setAuthorities(authorities);

server/cloud-syb/src/main/java/com/shusi/api/modules/order/service/impl/OrderPickApiServiceImpl.java

@@ -2,24 +2,12 @@ package com.shusi.api.modules.order.service.impl;
 
 import cn.com.suoyoubao.api.ErpApi;
 import cn.com.suoyoubao.api.ErpClient;
-import cn.com.suoyoubao.api.SybApi;
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.csp.sentinel.util.StringUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.shusi.api.modules.goods.service.GoodsApiService;
-import com.shusi.api.modules.order.domain.OrderApiAddOrderDTO;
-import com.shusi.api.modules.order.service.OrderApiService;
 import com.shusi.api.modules.order.service.OrderPickApiService;
-import com.shusi.convertor.DataConverter;
-import com.shusi.convertor.DataType;
 import com.shusi.domain.dto.SimpleResult;
-import com.shusi.enums.*;
-import com.shusi.exception.BadRequestException;
-import com.shusi.exception.BusinessException;
+import com.shusi.enums.ApiSource;
+import com.shusi.enums.YesNo;
 import com.shusi.modules.order.domain.OrderPick;
 import com.shusi.modules.order.domain.OrderPickCar;
 import com.shusi.modules.order.domain.Orders;
@@ -28,39 +16,18 @@ import com.shusi.modules.order.service.FileHandleService;
 import com.shusi.modules.order.service.OrderPickCarService;
 import com.shusi.modules.order.service.OrderPickService;
 import com.shusi.modules.order.service.OrdersService;
-import com.shusi.modules.pay.domain.dto.PayPreDTO;
-import com.shusi.modules.pay.service.CalcService;
-import com.shusi.modules.pay.service.PayService;
-import com.shusi.modules.product.domain.Goods;
-import com.shusi.modules.product.domain.GoodsProduct;
 import com.shusi.modules.product.domain.OilHouse;
-import com.shusi.modules.product.domain.OilHouseSupper;
-import com.shusi.modules.product.domain.dto.GoodsAddDTO;
-import com.shusi.modules.product.service.GoodsProductService;
-import com.shusi.modules.product.service.GoodsService;
 import com.shusi.modules.product.service.OilHouseService;
-import com.shusi.modules.product.service.OilHouseSupperService;
 import com.shusi.modules.sys.domain.UserErpAuth;
 import com.shusi.modules.sys.service.UserErpAuthFeignService;
-import com.shusi.modules.user.domain.UserOrg;
-import com.shusi.modules.user.domain.UserOrgPartner;
-import com.shusi.modules.user.service.UserOrgPartnerService;
 import com.shusi.modules.user.service.UserOrgService;
-import com.shusi.util.CalcUtil;
-import com.shusi.util.MoneyUtil;
-import com.shusi.util.SecurityUtil;
 import com.shusi.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
 
 @Service
 @Slf4j
@@ -87,6 +54,8 @@ public class OrderPickApiServiceImpl implements OrderPickApiService {
     public boolean requestOrderPick(OrderPickAddDTO orderPickAddDTO) {
         //来源
         String source = orderPickAddDTO.getSource();
+
+        log.info("erpapi提货---source{}", source);
         if (StringUtils.isNotBlank(source)) {
             return false;
         }
@@ -94,11 +63,12 @@ public class OrderPickApiServiceImpl implements OrderPickApiService {
         String orderId = orderPickAddDTO.getOrderId();
         Orders order = ordersService.getById(orderId);
         // 获取原始订单
+        log.info("erpapi提货---order{}", order);
         if (order == null || order.getOriginalOrderId() == null) {
             return false;
         }
         Orders originalOrder = ordersService.getById(order.getOriginalOrderId());
-
+        log.info("erpapi提货---originalOrder{}", originalOrder);
         if (StringUtils.isNotBlank(originalOrder.getErpOrder()) && originalOrder.getErpOrder().equals(YesNo._1.getValue())) {
             //特殊订单取原始订单id
             orderPickAddDTO.setOrderId(originalOrder.getOriginalOrderId());
@@ -106,6 +76,7 @@ public class OrderPickApiServiceImpl implements OrderPickApiService {
             return false;
         }
         UserErpAuth userErpAuth = isApiConnector(originalOrder.getUserSupplierId());
+        log.info("erpapi提货---userErpAuth{}", userErpAuth);
         if (userErpAuth == null) {
             return false;
         }