订单分页查询新增字段

sd-business/src/main/java/com/sd/business/entity/order/vo/OrderInfoVo.java

@@ -4,6 +4,9 @@ import com.sd.business.entity.order.po.OrderInfo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.DecimalMin;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -30,4 +33,49 @@ public class OrderInfoVo extends OrderInfo {
      * 订单商品
      */
     private List<OrderSkuVo> orderSkuList;
+
+    /**
+     * 长 cm
+     */
+    private BigDecimal length;
+
+    /**
+     * 宽 cm
+     */
+    private BigDecimal width;
+
+    /**
+     * 高 cm
+     */
+    private BigDecimal height;
+
+    /**
+     * 色层 字典:bom_chromatophore
+     */
+    private String chromatophore;
+
+    /**
+     * 颜色
+     */
+    private String colour;
+
+    /**
+     * 正面纹路 字典:bom_frontGrain
+     */
+    private String frontGrain;
+
+    /**
+     * 背面纹路 字典:bom_reverseGrain
+     */
+    private String reverseGrain;
+
+    /**
+     * 数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 单价
+     */
+    private BigDecimal unitPrice;
 }

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -77,6 +77,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
 
         Page<OrderInfoVo> page = Sql.create(OrderInfoVo.class)
                 .selectAll(OrderInfo.class)
+                .select(OrderSku::getLength)
+                .select(OrderSku::getWidth)
+                .select(OrderSku::getHeight)
+                .select(OrderSku::getColour)
+                .select(OrderSku::getChromatophore)
+                .select(OrderSku::getFrontGrain)
+                .select(OrderSku::getReverseGrain)
+                .select(OrderSku::getQuantity)
+                .selectAs("t2.unit_price + t2.custom_processing_fee + t2.packaging_material_cost", OrderInfoVo::getUnitPrice)
                 .selectAs(BomSpec::getCode, OrderInfoVo::getBomSpecCode)
                 .selectAs(SkuUser::getCode, OrderInfoVo::getSkuCode)
                 .from(OrderInfo.class)

sd-framework/src/main/java/com/sd/framework/util/sql/Select.java

@@ -59,6 +59,12 @@ public class Select<T> {
         return this;
     }
 
+    public <S, V> Select<T> selectAs(String selectSql, SFunction<T, ?> asFunction) {
+        String as = PropertyNamer.methodToProperty(LambdaUtils.extract(asFunction).getImplMethodName());
+        sql.selectList.add(selectSql + StringPool.SPACE + as);
+        return this;
+    }
+
     @SafeVarargs
     public final <S> Select<T> selectAll(Class<S> cls, SFunction<S, ?>... excludeFunction) {
         return selectAll(sql.getTableAlias(cls), cls, excludeFunction);