订单明细

sd-business/src/main/java/com/sd/business/controller/order/OrderSkuController.java

@@ -1,6 +1,9 @@
 package com.sd.business.controller.order;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sd.business.entity.order.dto.OrderSkuDto;
+import com.sd.business.entity.order.dto.OrderSkuSelectDto;
+import com.sd.business.entity.order.vo.OrderSkuVo;
 import com.sd.business.service.order.OrderSkuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,14 +27,14 @@ public class OrderSkuController {
     @Autowired
     private OrderSkuService orderSkuService;
 
-    // /**
-    //  * 订单sku分页
-    //  */
-    // @PostMapping("/page")
-    // public Page<OrderSkuVo> page(@RequestBody OrderSkuSelectDto dto) {
-    //     return orderSkuService.getPage(dto);
-    // }
-    //
+    /**
+     * 订单sku分页
+     */
+    @PostMapping("/page")
+    public Page<OrderSkuVo> page(@RequestBody OrderSkuSelectDto dto) {
+        return orderSkuService.getPage(dto);
+    }
+
     // /**
     //  * 订单sku明细
     //  */

sd-business/src/main/java/com/sd/business/entity/order/dto/OrderSkuSelectDto.java

@@ -14,4 +14,39 @@ import lombok.Setter;
 @Setter
 public class OrderSkuSelectDto extends BaseSelectDto {
 
+    /**
+     * sku规格编码
+     */
+    private String skuSpecCode;
+
+    /**
+     * sku规格名称
+     */
+    private String skuSpecName;
+
+    /**
+     * bom规格名称
+     */
+    private String bomSpecName;
+
+    /**
+     * bom规格编码
+     */
+    private String bomSpecCode;
+
+    /**
+     * 订单号
+     */
+    private String orderCode;
+
+    /**
+     * 万里牛订单号
+     */
+    private String orderWlnCode;
+
+    /**
+     * 订单状态 {@link com.sd.business.entity.order.enums.OrderStatusEnum}
+     */
+    private Integer orderStatus;
+
 }

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

@@ -4,6 +4,7 @@ import com.sd.business.entity.order.po.OrderSku;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -36,4 +37,45 @@ public class OrderSkuVo extends OrderSku {
      */
     private List<OrderSkuBomVo> orderSkuBomList;
 
+    /**
+     * 订单号
+     */
+    private String orderCode;
+
+    /**
+     * 万里牛订单号
+     */
+    private String orderWlnCode;
+
+    /**
+     * 订单状态 {@link com.sd.business.entity.order.enums.OrderStatusEnum}
+     */
+    private Integer orderStatus;
+
+    /**
+     * 下单时间
+     */
+    private Date wlnCreateTime;
+
+    /**
+     * sku规格编码
+     */
+    private String skuSpecCode;
+
+    /**
+     * sku规格名称
+     */
+    private String skuSpecName;
+
+    /**
+     * bom规格名称
+     */
+    private String bomSpecName;
+
+    /**
+     * bom规格编码
+     */
+    private String bomSpecCode;
+
+
 }

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

@@ -4,11 +4,14 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.bom.po.BomSpec;
 import com.sd.business.entity.order.dto.OrderSkuDto;
 import com.sd.business.entity.order.dto.OrderSkuSelectDto;
+import com.sd.business.entity.order.po.OrderInfo;
 import com.sd.business.entity.order.po.OrderOperatingLog;
 import com.sd.business.entity.order.po.OrderSku;
 import com.sd.business.entity.order.vo.OrderSkuVo;
+import com.sd.business.entity.sku.po.SkuSpec;
 import com.sd.business.mapper.order.OrderSkuMapper;
 import com.sd.business.service.order.OrderOperatingLogService;
 import com.sd.business.service.order.OrderSkuService;
@@ -35,7 +38,20 @@ public class OrderSkuServiceImpl extends ServiceImpl<OrderSkuMapper, OrderSku> i
     public Page<OrderSkuVo> getPage(OrderSkuSelectDto dto) {
         IWrapper<OrderSku> wrapper = getWrapper();
         wrapper.orderByDesc("os", OrderSku::getId);
+        wrapper.like("ss", SkuSpec::getCode, dto.getSkuSpecCode());
+        wrapper.like("ss", SkuSpec::getName, dto.getSkuSpecName());
+        wrapper.like("bs", BomSpec::getCode, dto.getBomSpecCode());
+        wrapper.like("bs", BomSpec::getName, dto.getBomSpecName());
+
+        wrapper.like("oi", OrderInfo::getCode, dto.getOrderCode());
+        wrapper.like("oi", OrderInfo::getWlnCode, dto.getOrderWlnCode());
+        wrapper.like("oi", OrderInfo::getStatus, dto.getOrderStatus());
+
+        wrapper.ge("oi", OrderInfo::getWlnCreateTime, dto.getBeginTime());
+        wrapper.le("oi", OrderInfo::getWlnCreateTime, dto.getEndTime());
+
         Page<OrderSkuVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+
         return page;
     }
 

sd-business/src/main/resources/mapper/order/OrderSkuMapper.xml

@@ -17,8 +17,23 @@
                os.create_user,
                os.create_time,
                os.update_user,
-               os.update_time
+               os.update_time,
+
+               oi.code     orderCode,
+               oi.wln_code orderWlnCode,
+               oi.status   orderStatus,
+               oi.wln_create_time,
+
+               ss.code     skuSpecCode,
+               ss.name     skuSpecName,
+
+               bs.name     bomSpecName,
+               bs.code     bomSpecCode
+
         from order_sku os
+                 left join order_info oi on oi.id = os.order_id
+                 left join sku_spec ss on os.sku_spec_id = ss.id
+                 left join bom_spec bs on ss.bom_spec_id = bs.id
             ${ew.customSqlSegment}
     </select>