Merge remote-tracking branch 'origin/sit' into sit

alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserOrderVo.java

@@ -193,4 +193,10 @@ public class LifeUserOrderVo {
     
     @ApiModelProperty(value = "订单状态值")
     private String orderStatusValue;
+
+    @ApiModelProperty(value = "图片id")
+    private String imgIds;
+
+    @ApiModelProperty(value = "图片地址列表")
+    private List<String> imgUrls;
 }

alien-entity/src/main/resources/mapper/LifeUserOrderMapper.xml

@@ -58,6 +58,7 @@
         <result column="expert_order_id" property="expertOrderId"/>
         <result column="order_appraise" property="orderAppraise"/>
         <result column="user_id" property="userId"/>
+        <result column="imgIds" property="imgIds"/>
 
         <collection property="orderCouponMiddleList" ofType="shop.alien.entity.store.vo.OrderCouponMiddleVo">
             <id column="ocmId" property="id" />
@@ -74,11 +75,11 @@
     <!-- 查询用户订单详情 -->
     <select id="queryUserOrderDetail" resultMap="BaseResultMap">
         with total_coupon as(
-        select id coupon_id,2 coupon_type,lgbm.group_name coupon_name,preferential_price offprice,original_price, SUBSTRING_INDEX(image_id, ',', 1) AS image_id,
+        select id coupon_id,2 coupon_type,lgbm.group_name coupon_name,preferential_price offprice,original_price, SUBSTRING_INDEX(image_id, ',', 1) AS image_id, image_id AS imgIds,
                effective_date_type,effective_date_value,use_rules,reservation_rules,applicable_num,quota_type,quota_value,inventory_num single_qty
         from life_group_buy_main lgbm where lgbm.delete_flag = 0
         union all
-        select id coupon_id,1 coupon_type,lc.name coupon_name,lc.offprice offprice,price original_price,SUBSTRING_INDEX(image_path, ',', 1) AS image_id,
+        select id coupon_id,1 coupon_type,lc.name coupon_name,lc.offprice offprice,price original_price,SUBSTRING_INDEX(image_path, ',', 1) AS image_id, image_path AS imgIds,
         case when expiration_type = 1 then 0 else 1 end effective_date_type, case when expiration_type = 1 then expiration_date else validity_period end  effective_date_value,use_rule use_rules,reservation_rules,applicable_num,1 quota_type,buy_limit quota_value,single_qty
         from life_coupon lc where lc.delete_flag = 0
         )

alien-store/src/main/java/shop/alien/store/service/LifeUserOrderService.java

@@ -1155,6 +1155,22 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
         // 退款记录
         calcExpectIncome(lifeUserOrderVo);
         lifeUserOrderVo.setCouponCount(lifeUserOrderVo.getOrderCouponMiddleList().size());
+        // 查询订单图片列表
+        String imgIds = lifeUserOrderVo.getImgIds();
+        if(StringUtils.isNotEmpty(imgIds)){
+            LambdaQueryWrapper<StoreImg> storeImgLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            List<String> imgIdList = Arrays.stream(imgIds.split(","))
+                    .map(String::trim)
+                    .collect(Collectors.toList());
+            storeImgLambdaQueryWrapper.in(StoreImg::getId, imgIdList);
+            List<StoreImg> storeImgList = storeImgMapper.selectList(storeImgLambdaQueryWrapper);
+            if(CollectionUtils.isNotEmpty(storeImgList)){
+                List<String> imgUrlList = storeImgList.stream()    // 转换为 Stream
+                        .map(StoreImg::getImgUrl)                  // 映射，提取 name 字段
+                        .collect(Collectors.toList());
+                lifeUserOrderVo.setImgUrls(imgUrlList);
+            }
+        }
         return R.data(lifeUserOrderVo);
     }