mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/app/impl/OrderServiceImpl.java

@@ -127,7 +127,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
                         () -> this.getOrderItems(skuId, memberId), threadPoolExecutor)
                 .exceptionally(ex -> {
                     log.error("Failed to get order items: {}", ex.toString());
-                    return null;
+                    return Collections.emptyList();
                 });
 
         // 用户收货地址
@@ -139,7 +139,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
             return null;
         }, threadPoolExecutor).exceptionally(ex -> {
             log.error("Failed to get addresses for memberId {} : {}", memberId, ex.toString());
-            return null;
+            return Collections.emptyList();
         });
 
         // 生成唯一令牌,防止重复提交(原理：提交会消耗令牌，令牌被消耗无法再次提交)
@@ -188,8 +188,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
         List<Long> skuIds = orderItems.stream()
                 .map(OrderSubmitForm.OrderItem::getSkuId)
                 .collect(Collectors.toList());
-
-        List<SkuInfoDTO> skuList = skuFeignClient.getSkuInfoList(skuIds);
+        List<SkuInfoDTO> skuList;
+        try {
+            skuList = skuFeignClient.getSkuInfoList(skuIds);
+        } catch (Exception e) {
+            log.error("Failed to get sku info list: {}", e.toString());
+            skuList = Collections.emptyList();
+        }
         for (OrderSubmitForm.OrderItem item : orderItems) {
             SkuInfoDTO skuInfo = skuList.stream().filter(sku -> sku.getId().equals(item.getSkuId()))
                     .findFirst()
@@ -450,6 +455,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
             orderItems = new ArrayList<>();
             SkuInfoDTO skuInfoDTO = skuFeignClient.getSkuInfo(skuId);
             OrderItemDTO orderItemDTO = new OrderItemDTO();
+            orderItemDTO.setSkuId(skuId);
             BeanUtil.copyProperties(skuInfoDTO, orderItemDTO);
             orderItemDTO.setSkuId(skuInfoDTO.getId());
             orderItemDTO.setQuantity(1); // 直接购买商品的数量为1

mall-pms/pms-boot/src/main/resources/mapper/PmsSkuMapper.xml

@@ -23,7 +23,7 @@
     <!-- 获取商品库存单元信息 -->
     <select id="getSkuInfo" resultType="com.youlai.mall.pms.model.dto.SkuInfoDTO">
         SELECT
-           t1.id skuId,
+           t1.id ,
            t1.sku_sn,
            concat(t2.name,' ',t1.name) skuName,
            t1.pic_url,

youlai-auth/src/main/java/com/youlai/auth/model/SysUserDetails.java

@@ -80,6 +80,8 @@ public class SysUserDetails implements UserDetails, CredentialsContainer {
             Long userId,
             String username,
             String password,
+            Integer dataScope,
+            Long deptId,
             boolean enabled,
             boolean accountNonExpired,
             boolean credentialsNonExpired,
@@ -91,6 +93,8 @@ public class SysUserDetails implements UserDetails, CredentialsContainer {
         this.userId = userId;
         this.username = username;
         this.password = password;
+        this.dataScope = dataScope;
+        this.deptId = deptId;
         this.enabled = enabled;
         this.accountNonExpired = accountNonExpired;
         this.credentialsNonExpired = credentialsNonExpired;

youlai-auth/src/main/java/com/youlai/auth/oauth2/jackson/SysUserDeserializer.java

@@ -49,11 +49,13 @@ class SysUserDeserializer extends JsonDeserializer<SysUserDetails> {
         Long userId = readJsonNode(jsonNode, "userId").asLong();
         String username = readJsonNode(jsonNode, "username").asText();
         String password = passwordNode.asText("");
+        Integer dataScope = readJsonNode(jsonNode, "dataScope").asInt();
+        Long deptId = readJsonNode(jsonNode, "deptId").asLong();
         boolean enabled = readJsonNode(jsonNode, "enabled").asBoolean();
         boolean accountNonExpired = readJsonNode(jsonNode, "accountNonExpired").asBoolean();
         boolean credentialsNonExpired = readJsonNode(jsonNode, "credentialsNonExpired").asBoolean();
         boolean accountNonLocked = readJsonNode(jsonNode, "accountNonLocked").asBoolean();
-        SysUserDetails result = new SysUserDetails(userId, username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked,
+        SysUserDetails result = new SysUserDetails(userId, username, password, dataScope, deptId, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked,
                 authorities);
         if (passwordNode.asText(null) == null) {
             result.eraseCredentials();

youlai-system/system-boot/src/main/resources/mapper/SysDeptMapper.xml

@@ -4,21 +4,4 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.youlai.system.mapper.SysDeptMapper">
 
-    <resultMap id="BaseResultMap" type="com.youlai.system.model.entity.SysDept">
-            <id property="id" column="id" jdbcType="BIGINT"/>
-            <result property="name" column="name" jdbcType="VARCHAR"/>
-            <result property="parentId" column="parent_id" jdbcType="BIGINT"/>
-            <result property="treePath" column="tree_path" jdbcType="VARCHAR"/>
-            <result property="sort" column="sort" jdbcType="INTEGER"/>
-            <result property="status" column="status" jdbcType="TINYINT"/>
-            <result property="deleted" column="deleted" jdbcType="TINYINT"/>
-            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
-            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,name,parent_id,
-        tree_path,sort,status,
-        deleted,create_time,update_time
-    </sql>
 </mapper>