dd

ruoyi-shop/src/main/java/com/ruoyi/shop/order/domain/vo/ShopOrderDetailVo.java

@@ -187,7 +187,6 @@ public class ShopOrderDetailVo extends BaseVo {
      * 原来的实际价格（会员打折或秒杀的实际价格或活动价）
      */
     @ExcelProperty(value = "原来的实际价格", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "会=员打折或秒杀的实际价格或活动价")
     @ApiModelProperty("原来的实际价格（会员打折或秒杀的实际价格或活动价）")
     private BigDecimal originalRealPrice;
 
@@ -202,7 +201,6 @@ public class ShopOrderDetailVo extends BaseVo {
      * 实际价格（可以在原实际价格上面改价）
      */
     @ExcelProperty(value = "实际价格", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "可=以在原实际价格上面改价")
     @ApiModelProperty("实际价格（可以在原实际价格上面改价）")
     private BigDecimal realPrice;
 

ruoyi-shop/src/main/java/com/ruoyi/shop/order/domain/vo/ShopOrderPackageItemVo.java

@@ -1,5 +1,6 @@
 package com.ruoyi.shop.order.domain.vo;
 
+import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
@@ -8,6 +9,8 @@ import com.ruoyi.common.filepathsplicing.FilePathValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.math.BigDecimal;
 import java.util.Date;
 
 
@@ -96,4 +99,73 @@ public class ShopOrderPackageItemVo implements java.io.Serializable {
     private Integer number;
 
 
+
+
+    //关联属性
+
+    /**
+     * 原规格销售价
+     */
+    @ExcelProperty(value = "原规格销售价")
+    @ApiModelProperty("原规格销售价")
+    private BigDecimal skuPrice;
+
+    /**
+     * 成本价
+     */
+    @ExcelProperty(value = "成本价")
+    @ApiModelProperty("成本价")
+    private BigDecimal singleCostPrice;
+
+    /**
+     * 当前明细单件支付金额
+     */
+    @ExcelProperty(value = "当前明细单件支付金额")
+    @ApiModelProperty(value = "当前明细单件支付金额", required = true)
+    private BigDecimal singlePaymentAmount;
+
+    /**
+     * 当前明细支付金额
+     */
+    @ExcelProperty(value = "当前明细支付金额")
+    @ApiModelProperty("当前明细支付金额")
+    private BigDecimal paymentAmount;
+
+
+    /**
+     * 原规格销售价合计
+     */
+    @ExcelProperty(value = "原规格销售价合计")
+    @ApiModelProperty("原规格销售价合计")
+    private BigDecimal totalSkuPrice;
+
+    /**
+     * 原来的实际价格（会员打折或秒杀的实际价格或活动价）
+     */
+    @ExcelProperty(value = "原来的实际价格", converter = ExcelDictConvert.class)
+    @ApiModelProperty("原来的实际价格（会员打折或秒杀的实际价格或活动价）")
+    private BigDecimal originalRealPrice;
+
+    /**
+     * 原来的实际价格合计
+     */
+    @ExcelProperty(value = "原来的实际价格合计")
+    @ApiModelProperty("原来的实际价格合计")
+    private BigDecimal totalOriginalRealPrice;
+
+    /**
+     * 实际价格（可以在原实际价格上面改价）
+     */
+    @ExcelProperty(value = "实际价格", converter = ExcelDictConvert.class)
+    @ApiModelProperty("实际价格（可以在原实际价格上面改价）")
+    private BigDecimal realPrice;
+
+    /**
+     * 实际价格合计
+     */
+    @ExcelProperty(value = "实际价格合计")
+    @ApiModelProperty("实际价格合计")
+    private BigDecimal totalRealPrice;
+
+
 }

ruoyi-shop/src/main/java/com/ruoyi/shop/order/mapper/ShopOrderPackageItemMapper.java

@@ -3,6 +3,9 @@ package com.ruoyi.shop.order.mapper;
 import com.ruoyi.shop.order.domain.ShopOrderPackageItem;
 import com.ruoyi.shop.order.domain.vo.ShopOrderPackageItemVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 订单包裹的明细Mapper接口
@@ -12,4 +15,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  */
 public interface ShopOrderPackageItemMapper extends BaseMapperPlus<ShopOrderPackageItemMapper, ShopOrderPackageItem, ShopOrderPackageItemVo> {
 
+    List<ShopOrderPackageItemVo> loadListVoByPackageId(@Param("packageId") Long packageId);
 }

ruoyi-shop/src/main/java/com/ruoyi/shop/order/service/impl/ShopOrderPackageItemServiceImpl.java

@@ -164,9 +164,10 @@ public class ShopOrderPackageItemServiceImpl implements IShopOrderPackageItemSer
      */
     @Override
     public List<ShopOrderPackageItemVo> loadListVoByPackageId(Long packageId) {
-        return baseMapper.selectVoList(Wrappers.<ShopOrderPackageItem>lambdaQuery()
-            .eq(ShopOrderPackageItem::getPackageId, packageId)
-        );
+        return baseMapper.loadListVoByPackageId(packageId);
+//        return baseMapper.selectVoList(Wrappers.<ShopOrderPackageItem>lambdaQuery()
+//            .eq(ShopOrderPackageItem::getPackageId, packageId)
+//        );
     }
 
     @Override

ruoyi-shop/src/main/resources/mapper/order/ShopOrderPackageItemMapper.xml

@@ -17,5 +17,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="number" column="number"/>
     </resultMap>
 
-
+    <select id="loadListVoByPackageId" resultType="com.ruoyi.shop.order.domain.vo.ShopOrderPackageItemVo">
+        select  tbsopi.*,
+                tbsod.total_real_price,
+                tbsod.real_price,
+                tbsod.total_original_real_price,
+                tbsod.original_real_price,
+                tbsod.total_sku_price,
+                tbsod.payment_amount,
+                tbsod.single_payment_amount,
+                tbsod.single_cost_price,
+                tbsod.sku_price
+        from tb_shop_order_package_item as tbsopi
+        left join tb_shop_order_detail as tbsod on tbsopi.order_detail_id = tbsod.order_detail_id
+        where tbsopi.package_id = #{packageId}
+    </select>
 </mapper>