优化接口出参格式统一

diagbotman-service/src/main/java/com/diagbot/dto/OpendProductDTO.java

@@ -0,0 +1,11 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.wrapper.OpendProductWrapper;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/10/23 16:33
+ */
+public class OpendProductDTO extends OpendProductWrapper {
+}

diagbotman-service/src/main/java/com/diagbot/dto/OrderDetialsDTO.java

@@ -0,0 +1,11 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.wrapper.OrderDetailsWapper;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/10/23 16:38
+ */
+public class OrderDetialsDTO extends OrderDetailsWapper {
+}

diagbotman-service/src/main/java/com/diagbot/dto/ProductOrderDTO.java

@@ -0,0 +1,11 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.wrapper.ProductOrderWrapper;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/10/23 16:51
+ */
+public class ProductOrderDTO extends ProductOrderWrapper {
+}

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/ProductOrderWrapper.java

@@ -1,5 +1,6 @@
 package com.diagbot.entity.wrapper;
 
+import com.diagbot.dto.OrderDetialsDTO;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -49,5 +50,5 @@ public class ProductOrderWrapper{
 
     private String orgName;//机构名称
 
-    private List<OrderDetailsWapper> orderDetial;//订单明细
+    private List<OrderDetialsDTO> orderDetial;//订单明细
 }

diagbotman-service/src/main/java/com/diagbot/facade/LantoneProductFacade.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.LantoneProductDTO;
+import com.diagbot.dto.OpendProductDTO;
 import com.diagbot.dto.ProductLineDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
@@ -269,7 +270,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      * @param oppendedProductVO 所需参数（产品id，页数，和每页条数，默认显示10条）
      * @return 当条产品线下所有订单信息
      */
-    public IPage<OpendProductWrapper> opendedProduct(OppendedProductVO oppendedProductVO) {
+    public IPage<OpendProductDTO> opendedProduct(OppendedProductVO oppendedProductVO) {
         Page page =new Page();
         BeanUtil.copyProperties(oppendedProductVO,page);
         OpenedProductsIndex openedProductsIndex = new OpenedProductsIndex();
@@ -278,9 +279,9 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
             RespDTO<List<Long>> rlist = userServiceClient.getUserByOrgName(oppendedProductVO.getOrgName());
             openedProductsIndex.setUserId(rlist.data);
         }
-        List<OpendProductWrapper> list = openedProductsFacade.getByProductId(page,openedProductsIndex).getRecords();
+        List<OpendProductDTO> list = openedProductsFacade.getByProductId(page,openedProductsIndex).getRecords();
         List<Long> list1 = new ArrayList<>();
-        for (OpendProductWrapper opendProducts : list) {
+        for (OpendProductDTO opendProducts : list) {
             Long longs = opendProducts.getUserId();
             list1.add(longs);
         }

diagbotman-service/src/main/java/com/diagbot/facade/OpenedProductsFacade.java

@@ -223,7 +223,7 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
      * @param modifyOpeningTimeVO
      * @return 根据用户id和产品id，修改开通时间
      */
-    public RespDTO<ModifyOpeningTimeVO> modifyOpeningTimes(ModifyOpeningTimeVO modifyOpeningTimeVO) {
+    public RespDTO<Boolean> modifyOpeningTimes(ModifyOpeningTimeVO modifyOpeningTimeVO) {
         OpenedProducts openedProducts = new OpenedProducts();
         openedProducts.setUserId(modifyOpeningTimeVO.getUserId());
         openedProducts.setProductId(modifyOpeningTimeVO.getProductId());

diagbotman-service/src/main/java/com/diagbot/facade/OrderDetailsFacade.java

@@ -1,6 +1,7 @@
 package com.diagbot.facade;
 
 import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.OrderDetialsDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.entity.LantoneProduct;
@@ -9,7 +10,6 @@ import com.diagbot.entity.OrderDetails;
 import com.diagbot.entity.OrderDetailsIndex;
 import com.diagbot.entity.ProductOrder;
 import com.diagbot.entity.ServiceInfo;
-import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import com.diagbot.enums.AuditStatusEnum;
 import com.diagbot.enums.PaymentMethodEnum;
 import com.diagbot.enums.ServiceTypeEnum;
@@ -136,12 +136,12 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
      * @param orderDetialsVO 需要提供参数（付款状态，页数，每页条数默认显示10条）
      * @return 所有订单明细
      */
-    public List<OrderDetailsWapper> getAllOrderDetials(OrderDetialsVO orderDetialsVO){
+    public List<OrderDetialsDTO> getAllOrderDetials(OrderDetialsVO orderDetialsVO){
         OrderDetailsIndex orderDetailsIndex =new OrderDetailsIndex();
         BeanUtil.copyProperties(orderDetialsVO, orderDetailsIndex);
-        List<OrderDetailsWapper> list =this.seleAllOrderDetials(orderDetailsIndex);
+        List<OrderDetialsDTO> list =this.seleAllOrderDetials(orderDetailsIndex);
         List<Long> list1 =new ArrayList<>();
-        for (OrderDetailsWapper orderDetails:list) {
+        for (OrderDetialsDTO orderDetails:list) {
             Long longs = orderDetails.getUserId();
             list1.add(longs);
         }
@@ -151,7 +151,7 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
                     "获取用户和机构信息失败");
         }
         Map<Long, UserOrgDTO> dataMap = mapRespDTO.data;
-        for(OrderDetailsWapper bean : list) {
+        for(OrderDetialsDTO bean : list) {
             UserOrgDTO uo = dataMap.get(bean.getUserId());
             if(uo != null) {
                 BeanUtil.copyProperties(uo,bean);

diagbotman-service/src/main/java/com/diagbot/facade/ProductOrderFacade.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.AuthDetailDTO;
+import com.diagbot.dto.OrderDetialsDTO;
 import com.diagbot.dto.ProductAuthProgressDTO;
+import com.diagbot.dto.ProductOrderDTO;
 import com.diagbot.dto.ProductOrderExportDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
@@ -13,7 +15,6 @@ import com.diagbot.entity.OrderDetailStatus;
 import com.diagbot.entity.OrderDetails;
 import com.diagbot.entity.ProductOrder;
 import com.diagbot.entity.ProductOrderIndex;
-import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import com.diagbot.entity.wrapper.ProductOrderWrapper;
 import com.diagbot.enums.AuditStatusEnum;
 import com.diagbot.enums.AuthStatusEnum;
@@ -224,7 +225,7 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 	 * @param productOrderVO （订单编号，机构名称，申请状态）
 	 * @return 所有订单信息
 	 */
-	public RespDTO<IPage<ProductOrderWrapper>> selectAllProductOrder(ProductOrderVO productOrderVO){
+	public RespDTO<IPage<ProductOrderDTO>> selectAllProductOrder(ProductOrderVO productOrderVO){
 	    Page page =new Page();
 	    BeanUtil.copyProperties(productOrderVO,page);
 		ProductOrderIndex productOrderIndex =new ProductOrderIndex();
@@ -234,10 +235,10 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
             RespDTO<List<Long>> rlist = userServiceClient.getUserByOrgName(productOrderVO.getOrgName());
             productOrderIndex.setUserId(rlist.data);
         }
-		List<ProductOrderWrapper> list =productOrderFacade.selectAllProductOrder(page,productOrderIndex).getRecords();
+		List<ProductOrderDTO> list =productOrderFacade.selectAllProductOrder(page,productOrderIndex).getRecords();
 		List<Long> list1 =new ArrayList<>();
 		List<String> orderNoList =new ArrayList<>();
-		for (ProductOrderWrapper productOrderWrapper:list) {
+		for (ProductOrderDTO productOrderWrapper:list) {
 			Long longs = productOrderWrapper.getUserId();
 			String orderNo =productOrderWrapper.getNum();
 			list1.add(longs);
@@ -245,15 +246,15 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 		}
         OrderDetialsVO orderDetialsVO =new OrderDetialsVO();
 		orderDetialsVO.setOrderNum(orderNoList);
-		List<OrderDetailsWapper> orderDetilList = orderDetailsFacade.getAllOrderDetials(orderDetialsVO);
+		List<OrderDetialsDTO> orderDetilList = orderDetailsFacade.getAllOrderDetials(orderDetialsVO);
 		RespDTO<Map<Long, UserOrgDTO>> mapRespDTO = userServiceClient.getUserAndOrg(list1);
 		if(mapRespDTO == null || !"0".equals(mapRespDTO.code) ) {
 			throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
 					"获取用户和机构信息失败");
 		}
 		Map<Long, UserOrgDTO> dataMap = mapRespDTO.data;
-		Map<String,List<OrderDetailsWapper>> odMap = EntityUtil.makeEntityListMap(orderDetilList,"orderNum");
-		for(ProductOrderWrapper bean : list) {
+		Map<String,List<OrderDetialsDTO>> odMap = EntityUtil.makeEntityListMap(orderDetilList,"orderNum");
+		for(ProductOrderDTO bean : list) {
 			UserOrgDTO uo = dataMap.get(bean.getUserId());
 			if(uo != null) {
 				bean.setUsername(uo.getUsername());
@@ -325,7 +326,7 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
         Map<String, Object> userMap = new HashMap<String, Object>();
         userMap.put("startTime", productOrderExportVO.getStartTime());
         userMap.put("endTime", productOrderExportVO.getEndTime());
-        RespDTO<IPage<ProductOrderWrapper>> datas = this.selectAllProductOrder(productOrderVO);
+        RespDTO<IPage<ProductOrderDTO>> datas = this.selectAllProductOrder(productOrderVO);
         GsonUtil.toJson(datas.data.getRecords());
         List<String> listName = new ArrayList<>();
 

diagbotman-service/src/main/java/com/diagbot/mapper/OpenedProductsMapper.java

@@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.GetConsoleOnTrialDTO;
 import com.diagbot.dto.GetConsoleOpenedDTO;
+import com.diagbot.dto.OpendProductDTO;
 import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.OpenedProductsIndex;
-import com.diagbot.entity.wrapper.OpendProductWrapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -99,7 +99,7 @@ public interface OpenedProductsMapper extends BaseMapper<OpenedProducts> {
      * @Author: wangyu
      * @Date: 20:23 2018/9/20
      */
-     IPage<OpendProductWrapper> getByProductId(Page page,@Param("opend") OpenedProductsIndex openedProductsIndex);
+     IPage<OpendProductDTO> getByProductId(Page page, @Param("opend") OpenedProductsIndex openedProductsIndex);
 
     /**
      * @Description: 根据产品id查询该产品是否有用户开通

diagbotman-service/src/main/java/com/diagbot/mapper/OrderDetailsMapper.java

@@ -1,10 +1,10 @@
 package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.dto.OrderDetialsDTO;
 import com.diagbot.entity.OrderDetailStatus;
 import com.diagbot.entity.OrderDetails;
 import com.diagbot.entity.OrderDetailsIndex;
-import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -23,7 +23,7 @@ public interface OrderDetailsMapper extends BaseMapper<OrderDetails> {
      * @Author: wangyu
      * @Date: 15:06 2018/9/21
      */
-    public List<OrderDetailsWapper> seleAllOrderDetials(OrderDetailsIndex orderDetailsIndex);
+    public List<OrderDetialsDTO> seleAllOrderDetials(OrderDetailsIndex orderDetailsIndex);
 
     /**
      * 根据订单编号查询所有产品审核状态

diagbotman-service/src/main/java/com/diagbot/mapper/ProductOrderMapper.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.dto.AuthDetailDTO;
+import com.diagbot.dto.ProductOrderDTO;
 import com.diagbot.entity.ProductOrder;
 import com.diagbot.entity.ProductOrderIndex;
-import com.diagbot.entity.wrapper.ProductOrderWrapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -76,6 +76,6 @@ public interface ProductOrderMapper extends BaseMapper<ProductOrder> {
      * @Author: wangyu
      * @Date: 19:39 2018/9/20
      */
-    IPage<ProductOrderWrapper> selectAllProductOrder(Page page, @Param("product") ProductOrderIndex productOrderIndex);
+    IPage<ProductOrderDTO> selectAllProductOrder(Page page, @Param("product") ProductOrderIndex productOrderIndex);
 
 }

diagbotman-service/src/main/java/com/diagbot/service/OpenedProductsService.java

@@ -3,10 +3,10 @@ package com.diagbot.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.OpendProductDTO;
 import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.OpenedProductsIndex;
-import com.diagbot.entity.wrapper.OpendProductWrapper;
 
 import java.util.List;
 import java.util.Map;
@@ -62,7 +62,7 @@ public interface OpenedProductsService extends IService<OpenedProducts> {
      * @param openedProductsIndex
      * @return
      */
-        IPage<OpendProductWrapper> getByProductId(Page page,OpenedProductsIndex openedProductsIndex);
+        IPage<OpendProductDTO> getByProductId(Page page, OpenedProductsIndex openedProductsIndex);
 
     /**
      * 根据产品id查询该产品是否有用户开通

diagbotman-service/src/main/java/com/diagbot/service/OrderDetailsService.java

@@ -1,10 +1,10 @@
 package com.diagbot.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.OrderDetialsDTO;
 import com.diagbot.entity.OrderDetailStatus;
 import com.diagbot.entity.OrderDetails;
 import com.diagbot.entity.OrderDetailsIndex;
-import com.diagbot.entity.wrapper.OrderDetailsWapper;
 
 import java.util.List;
 
@@ -22,7 +22,7 @@ public interface OrderDetailsService extends IService<OrderDetails> {
      * @Author: wangyu
      * @Date: 15:06 2018/9/21
      */
-    public List<OrderDetailsWapper> seleAllOrderDetials(OrderDetailsIndex orderDetailsIndex);
+    public List<OrderDetialsDTO> seleAllOrderDetials(OrderDetailsIndex orderDetailsIndex);
 
     /**
      * 根据订单编号查询所有订单明细审核状态

diagbotman-service/src/main/java/com/diagbot/service/ProductOrderService.java

@@ -3,9 +3,9 @@ package com.diagbot.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.ProductOrderDTO;
 import com.diagbot.entity.ProductOrder;
 import com.diagbot.entity.ProductOrderIndex;
-import com.diagbot.entity.wrapper.ProductOrderWrapper;
 
 /**
  * <p>
@@ -29,6 +29,6 @@ public interface ProductOrderService extends IService<ProductOrder> {
      * @Author: wangyu
      * @Date: 19:39 2018/9/20
      */
-    IPage<ProductOrderWrapper> selectAllProductOrder(Page page, ProductOrderIndex productOrderIndex);
+    IPage<ProductOrderDTO> selectAllProductOrder(Page page, ProductOrderIndex productOrderIndex);
 
 }

diagbotman-service/src/main/java/com/diagbot/service/impl/OpenedProductsServiceImpl.java

@@ -3,10 +3,10 @@ package com.diagbot.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.OpendProductDTO;
 import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.OpenedProductsIndex;
-import com.diagbot.entity.wrapper.OpendProductWrapper;
 import com.diagbot.mapper.OpenedProductsMapper;
 import com.diagbot.service.OpenedProductsService;
 import org.springframework.stereotype.Service;
@@ -71,7 +71,7 @@ public class OpenedProductsServiceImpl extends ServiceImpl<OpenedProductsMapper,
     }
 
     @Override
-    public IPage<OpendProductWrapper> getByProductId(Page page,OpenedProductsIndex openedProductsIndex) {
+    public IPage<OpendProductDTO> getByProductId(Page page, OpenedProductsIndex openedProductsIndex) {
         return baseMapper.getByProductId(page,openedProductsIndex);
     }
 

diagbotman-service/src/main/java/com/diagbot/service/impl/OrderDetailsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.OrderDetialsDTO;
 import com.diagbot.entity.OrderDetailStatus;
 import com.diagbot.entity.OrderDetails;
 import com.diagbot.entity.OrderDetailsIndex;
@@ -27,7 +28,7 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
      * @Date: 15:25 2018/9/21
      */
     @Override
-    public List<OrderDetailsWapper> seleAllOrderDetials(OrderDetailsIndex orderDetailsIndex) {
+    public List<OrderDetialsDTO> seleAllOrderDetials(OrderDetailsIndex orderDetailsIndex) {
         return baseMapper.seleAllOrderDetials(orderDetailsIndex);
     }
     /**

diagbotman-service/src/main/java/com/diagbot/service/impl/ProductOrderServiceImpl.java

@@ -3,9 +3,9 @@ package com.diagbot.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.ProductOrderDTO;
 import com.diagbot.entity.ProductOrder;
 import com.diagbot.entity.ProductOrderIndex;
-import com.diagbot.entity.wrapper.ProductOrderWrapper;
 import com.diagbot.mapper.ProductOrderMapper;
 import com.diagbot.service.ProductOrderService;
 import org.springframework.stereotype.Service;
@@ -27,7 +27,7 @@ public class ProductOrderServiceImpl extends ServiceImpl<ProductOrderMapper, Pro
     }
 
     @Override
-    public IPage<ProductOrderWrapper> selectAllProductOrder(Page page,ProductOrderIndex productOrderIndex) {
+    public IPage<ProductOrderDTO> selectAllProductOrder(Page page, ProductOrderIndex productOrderIndex) {
         return baseMapper.selectAllProductOrder(page,productOrderIndex);
     }
 

diagbotman-service/src/main/java/com/diagbot/web/DiagLantoneProductController.java

@@ -4,9 +4,9 @@ package com.diagbot.web;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.LantoneProductDTO;
+import com.diagbot.dto.OpendProductDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
-import com.diagbot.entity.wrapper.OpendProductWrapper;
 import com.diagbot.facade.LantoneProductFacade;
 import com.diagbot.vo.AddProductsVO;
 import com.diagbot.vo.LantoneProductSelectVO;
@@ -102,7 +102,7 @@ public class DiagLantoneProductController {
     )
     @PostMapping("/opendedProduct")
     @SysLogger("opendedProduct")
-    public RespDTO<IPage<OpendProductWrapper>> opendedProduct(@RequestBody OppendedProductVO oppendedProductVO) {
+    public RespDTO<IPage<OpendProductDTO>> opendedProduct(@RequestBody OppendedProductVO oppendedProductVO) {
         return RespDTO.onSuc(lantoneProductFacade.opendedProduct(oppendedProductVO));
     }
 

diagbotman-service/src/main/java/com/diagbot/web/DiagOrderDetailsController.java

@@ -2,8 +2,8 @@ package com.diagbot.web;
 
 
 import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.OrderDetialsDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import com.diagbot.facade.OrderDetailsFacade;
 import com.diagbot.vo.AuditStatusVO;
 import com.diagbot.vo.OrderDetialsVO;
@@ -34,8 +34,8 @@ public class DiagOrderDetailsController {
             notes = "orderNum:订单编号<br>")
     @PostMapping("/getAllOrderDetials")
     @SysLogger("getAllOrderDetials")
-    public RespDTO<List<OrderDetailsWapper>> getAllOrderDetials(@RequestBody OrderDetialsVO orderDetialsVO) {
-        List<OrderDetailsWapper> list = orderDetailsFacade.getAllOrderDetials(orderDetialsVO);
+    public RespDTO<List<OrderDetialsDTO>> getAllOrderDetials(@RequestBody OrderDetialsVO orderDetialsVO) {
+        List<OrderDetialsDTO> list = orderDetailsFacade.getAllOrderDetials(orderDetialsVO);
         return RespDTO.onSuc(list);
     }
 

diagbotman-service/src/main/java/com/diagbot/web/ProductOrderController.java

@@ -7,11 +7,11 @@ import com.diagbot.dto.GetConsoleOnTrialDTO;
 import com.diagbot.dto.GetConsoleOpenedDTO;
 import com.diagbot.dto.OpenUpOnTrialDTO;
 import com.diagbot.dto.ProductAuthProgressDTO;
+import com.diagbot.dto.ProductOrderDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.dto.WaitExamOrderCouDTO;
 import com.diagbot.entity.OpenedProducts;
-import com.diagbot.entity.wrapper.ProductOrderWrapper;
 import com.diagbot.facade.LantoneProductFacade;
 import com.diagbot.facade.OpenedProductsFacade;
 import com.diagbot.facade.ProductOrderFacade;
@@ -126,7 +126,7 @@ public class ProductOrderController {
     @PostMapping("/modifyOpeningTime")
     @SysLogger("modifyOpeningTime")
     @Transactional
-    public RespDTO<ModifyOpeningTimeVO> modifyOpeningTime(@RequestBody @Valid ModifyOpeningTimeVO modifyOpeningTimeVO) {
+    public RespDTO<Boolean> modifyOpeningTime(@RequestBody @Valid ModifyOpeningTimeVO modifyOpeningTimeVO) {
 
         return openedProductsFacade.modifyOpeningTimes(modifyOpeningTimeVO);
     }
@@ -145,7 +145,7 @@ public class ProductOrderController {
                     "orderDetial:订单审核信息<br>")
     @PostMapping("/getAllProductOrder")
     @SysLogger("getAllProductOrder")
-    public RespDTO<IPage<ProductOrderWrapper>> getAllProductOrder(@RequestBody ProductOrderVO productOrderVO) {
+    public RespDTO<IPage<ProductOrderDTO>> getAllProductOrder(@RequestBody ProductOrderVO productOrderVO) {
         return productOrderFacade.selectAllProductOrder(productOrderVO);
     }