no message

jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/controller/order/OrderController.java

@@ -3,11 +3,15 @@ package com.jz.dm.mall.moduls.controller.order;
 import com.jz.common.bean.PageInfoResponse;
 import com.jz.common.constant.Constants;
 import com.jz.dm.mall.moduls.controller.order.bean.OrderDto;
+import com.jz.dm.mall.moduls.controller.order.bean.OrderRequest;
 import com.jz.dm.mall.moduls.service.OrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -20,7 +24,7 @@ import javax.servlet.http.HttpServletRequest;
 @RestController
 @RequestMapping("/order")
 @Api(tags = "订单管理")
-public class OrderController{
+public class OrderController {
     /**
      * 服务对象
      */
@@ -29,19 +33,15 @@ public class OrderController{
 
     @PostMapping(value = "/list")
     @ApiOperation(value = "订单管理列表（分页查询）", notes = "订单列表（分页查询）")
-    public PageInfoResponse<OrderDto> queryPageList(@RequestBody OrderDto OrderDto, HttpServletRequest req) throws Exception {
+    public PageInfoResponse<OrderDto> queryPageList(@RequestBody OrderRequest orderRequest, HttpServletRequest req) throws Exception {
         PageInfoResponse<OrderDto> pageInfo = new PageInfoResponse<OrderDto>();
         try {
-            pageInfo = tOrderService.findList(OrderDto, req);
+            pageInfo = tOrderService.findList(orderRequest, req);
         } catch (Exception e) {
             pageInfo.setMessage("查询失败");
             pageInfo.setCode(Constants.FAILURE_CODE);
             e.printStackTrace();
         }
-/*        Result<IPage<OrderDto>> result = new Result<IPage<OrderDto>>();
-        IPage<OrderDto> pageList = tOrderService.queryPage(new Page<OrderDto>(1, 2), order);
-        result.setSuccess(true);
-        result.setResult(pageList);*/
         return pageInfo;
     }
 }
\ No newline at end of file

jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/controller/order/bean/OrderDto.java

 package com.jz.dm.mall.moduls.controller.order.bean;
 
-import com.jz.common.bean.BasePageBean;
 import io.swagger.annotations.ApiModel;
 
 import java.util.Date;
@@ -13,7 +12,7 @@ import java.util.Date;
  */
 
 @ApiModel
-public class OrderDto extends BasePageBean {
+public class OrderDto {
     private static final long serialVersionUID = 651546246975691600L;
     /**
      * 订单id
@@ -107,6 +106,14 @@ public class OrderDto extends BasePageBean {
      * 删除标识
      */
     private String delFlag;
+    /**
+     * 数据名称
+     */
+    private String dataName;
+    /**
+     * 数据分类
+     */
+    private String dataType;
 
 
     public Long getOrderId() {
@@ -293,4 +300,19 @@ public class OrderDto extends BasePageBean {
         this.delFlag = delFlag;
     }
 
+    public String getDataName() {
+        return dataName;
+    }
+
+    public void setDataName(String dataName) {
+        this.dataName = dataName;
+    }
+
+    public String getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(String dataType) {
+        this.dataType = dataType;
+    }
 }
\ No newline at end of file

jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/controller/order/bean/OrderRequest.java

+package com.jz.dm.mall.moduls.controller.order.bean;
+
+import com.jz.common.bean.BasePageBean;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 订单表(TOrder)实体类
+ *
+ * @author makejava
+ * @since 2020-12-01 10:41:40
+ */
+
+@ApiModel
+public class OrderRequest extends BasePageBean {
+    private static final long serialVersionUID = 651546246975691600L;
+    /**
+     * 订单编号
+     */
+    private String orderNumber;
+    /**
+     * 数据行业
+     */
+    private String categoryId;
+    /**
+     * 购买方式：01年，02季，03月，04次(服务类型)
+     */
+    private String purchaseMethod;
+    /**
+     * 数据名称
+     */
+    private String dataName;
+    /**
+     * 数据分类
+     */
+    private String dataType;
+
+
+    public String getDataName() {
+        return dataName;
+    }
+
+    public void setDataName(String dataName) {
+        this.dataName = dataName;
+    }
+
+    public String getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(String dataType) {
+        this.dataType = dataType;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public String getCategoryId() {
+        return categoryId;
+    }
+
+    public void setCategoryId(String categoryId) {
+        this.categoryId = categoryId;
+    }
+
+    public String getPurchaseMethod() {
+        return purchaseMethod;
+    }
+
+    public void setPurchaseMethod(String purchaseMethod) {
+        this.purchaseMethod = purchaseMethod;
+    }
+}
\ No newline at end of file

jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/service/OrderService.java

@@ -2,6 +2,7 @@ package com.jz.dm.mall.moduls.service;
 
 import com.jz.common.bean.PageInfoResponse;
 import com.jz.dm.mall.moduls.controller.order.bean.OrderDto;
+import com.jz.dm.mall.moduls.controller.order.bean.OrderRequest;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -14,5 +15,5 @@ import javax.servlet.http.HttpServletRequest;
 public interface OrderService {
 
 
-    PageInfoResponse<OrderDto> findList(OrderDto order, HttpServletRequest req)throws Exception;
+    PageInfoResponse<OrderDto> findList(OrderRequest order, HttpServletRequest req)throws Exception;
 }
\ No newline at end of file

jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/service/impl/OrderServiceImpl.java

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.jz.common.bean.PageInfoResponse;
 import com.jz.common.constant.Constants;
 import com.jz.dm.mall.moduls.controller.order.bean.OrderDto;
+import com.jz.dm.mall.moduls.controller.order.bean.OrderRequest;
 import com.jz.dm.mall.moduls.mapper.OrderDao;
 import com.jz.dm.mall.moduls.service.OrderService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +31,7 @@ public class OrderServiceImpl implements OrderService {
     private OrderDao tOrderDao;
 
     @Override
-    public PageInfoResponse<OrderDto> findList(OrderDto order, HttpServletRequest req) throws Exception{
+    public PageInfoResponse<OrderDto> findList(OrderRequest order, HttpServletRequest req) throws Exception{
         PageInfoResponse<OrderDto> pageInfoResponse = new PageInfoResponse<>();
 
         Map<String, Object> param = new HashMap<>();