Merge remote-tracking branch 'origin/dev/one' into dev/one

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

@@ -1,10 +1,33 @@
 package com.diagbot.facade;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.UserOrgDTO;
+import com.diagbot.entity.LantoneProduct;
+import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.OrderDetails;
+import com.diagbot.entity.OrderDetailsIndex;
+import com.diagbot.entity.ServiceInfo;
+import com.diagbot.entity.wrapper.OrderDetailsWapper;
+import com.diagbot.enums.AuditStatusEnum;
+import com.diagbot.enums.TokenTypeEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.OrderDetailsServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.AuditStatusVO;
+import com.diagbot.vo.OrderDetialsVO;
+import com.diagbot.vo.ProductServiceSaveVO;
+import com.diagbot.vo.ServiceSaveVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:
@@ -13,13 +36,115 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class OrderDetailsFacade extends OrderDetailsServiceImpl{
+    @Autowired
+    private OpenedProductsFacade openedProductsFacade;
+    @Autowired
+    private LantoneProductFacade lantoneProductFacade;
+    @Autowired
+    private ServiceInfoFacade serviceInfoFacade;
+    @Autowired
+    private ProductServiceFacade productServiceFacade;
+    @Autowired
+    private UserServiceClient userServiceClient;
     /**
-     * @Description: 分页查询订单明细
+     * @Description: 产品申请审核接口
      * @Author: wangyu
-     * @Date: 21:50 2018/9/24
+     * @Date: 21:39 2018/9/24
      */
-    public IPage<OrderDetails> orderDetialShows(Page page,OrderDetails orderDetails){
-        IPage<OrderDetails> orderDetailsIPage =this.orderDetialShow(page,orderDetails);
-        return orderDetailsIPage;
+    @Transactional
+    public Boolean updateAuditStatus(AuditStatusVO auditStatusVO){
+        OrderDetails orderDetails =this.getById(auditStatusVO.getId());
+        if(orderDetails==null){
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "订单明细不存在");
+        }
+        orderDetails.setGmtModified(DateUtil.now());
+        orderDetails.setModifier(UserUtils.getCurrentPrincipleID());
+        orderDetails.setAuditStatus(auditStatusVO.getAuditStatus());
+        //TODO 审核不通过
+        if(auditStatusVO.getAuditStatus()== AuditStatusEnum.Veto.getKey()){
+            if(!this.updateById(orderDetails)){
+                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                        "审核状态修改失败");
+            }
+            return true;
+        }
+        //TODO 审核通过 添加已开通产品  判断产品类型是否有online（添加服务  服务产品表  token表）
+        if(!this.updateById(orderDetails)){
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "审核状态修改失败");
+        }
+        Long userId =Long.parseLong(UserUtils.getCurrentPrincipleID());
+        OpenedProducts openedProducts =new OpenedProducts();
+        openedProducts.setGmtCreate(DateUtil.now());
+        openedProducts.setCreator(UserUtils.getCurrentPrincipleID());
+        openedProducts.setProductId(1L);
+        openedProducts.setUserId(userId);
+        openedProducts.setStartTime(auditStatusVO.getStartTime());
+        openedProducts.setEndTime(auditStatusVO.getEndTime());
+        openedProducts.setOrderId(1L);
+        openedProductsFacade.save(openedProducts);
+        LantoneProduct lantoneProduct =new LantoneProduct();
+        if(lantoneProductFacade.getById(lantoneProduct).getAccessType().indexOf(TokenTypeEnum.Online.getKey())==-1){
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "该产品没有线上模式");
+        }
+        ServiceSaveVO serviceSaveVO =new ServiceSaveVO();
+        serviceSaveVO.setDescription(lantoneProduct.getDecription());
+        serviceSaveVO.setName(lantoneProduct.getName());
+        serviceSaveVO.setType(TokenTypeEnum.Online.getKey());
+        ServiceInfo serviceInfo = serviceInfoFacade.createService(serviceSaveVO);
+        ProductServiceSaveVO productServiceSaveVO =new ProductServiceSaveVO();
+        productServiceSaveVO.setProductId(auditStatusVO.getId());
+        productServiceSaveVO.setServiceId(serviceInfo.getId());
+        productServiceSaveVO.setType(TokenTypeEnum.Online.getKey());
+        productServiceFacade.genProductService(productServiceSaveVO);
+        return true;
+    }
+
+    /**
+     * @Description: 产品申请查询所有订单明细
+     * @Author: wangyu
+     * @Date: 16:19 2018/9/21
+     */
+    public List<OrderDetailsWapper> getAllOrderDetials(OrderDetialsVO orderDetialsVO){
+        OrderDetailsIndex orderDetailsIndex =new OrderDetailsIndex();
+        Long curren = orderDetialsVO.getCurrent();
+        Long size =orderDetialsVO.getSize();
+        if(curren==null){
+            orderDetialsVO.setCurrent(1L);
+        }
+        if (size==null){
+            orderDetialsVO.setSize(10L);
+        }
+        BeanUtil.copyProperties(orderDetialsVO, orderDetailsIndex);
+        orderDetailsIndex.setIndex((orderDetialsVO.getCurrent().longValue()-1)*orderDetialsVO.getSize().longValue());
+
+        orderDetailsIndex.setUserId(1L);
+        List<OrderDetailsWapper> list =this.seleAllOrderDetials(orderDetailsIndex);
+        List<Long> list1 =new ArrayList<>();
+        for (OrderDetails orderDetails:list) {
+            Long longs = orderDetails.getUserId();
+            list1.add(longs);
+        }
+        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;
+        for(OrderDetailsWapper bean : list) {
+            UserOrgDTO uo = dataMap.get(bean.getUserId());
+            if(uo != null) {
+                bean.setUsername(uo.getUsername());
+                bean.setLinkman(uo.getLinkman());
+                bean.setEmail(uo.getEmail());
+                bean.setOrgId(uo.getOrgId());
+                bean.setOrgName(uo.getOrgName());
+                bean.setIsReject(uo.getIsReject());
+                bean.setAuStatus(uo.getAuStatus());
+            }
+        }
+        return list;
     }
 }

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

@@ -6,16 +6,10 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.dto.WaitExamOrderCouDTO;
 import com.diagbot.entity.LantoneProduct;
-import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.OrderDetails;
-import com.diagbot.entity.OrderDetailsIndex;
 import com.diagbot.entity.ProductOrder;
 import com.diagbot.entity.ProductOrderIndex;
-import com.diagbot.entity.ServiceInfo;
-import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import com.diagbot.entity.wrapper.ProductOrderWrapper;
-import com.diagbot.enums.AuditStatusEnum;
-import com.diagbot.enums.TokenTypeEnum;
 import com.diagbot.enums.VisibleIdTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -25,11 +19,7 @@ import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddOrderVO;
-import com.diagbot.vo.AuditStatusVO;
-import com.diagbot.vo.OrderDetialsVO;
 import com.diagbot.vo.ProductOrderVO;
-import com.diagbot.vo.ProductServiceSaveVO;
-import com.diagbot.vo.ServiceSaveVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -135,52 +125,6 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
     	return waitExamOrderCouDTO;
     }
 
-	/**
-	 * @Description: 产品申请查询所有订单明细
-	 * @Author: wangyu
-	 * @Date: 16:19 2018/9/21
-	 */
-	public List<OrderDetailsWapper> getAllOrderDetials(OrderDetialsVO orderDetialsVO){
-		OrderDetailsIndex orderDetailsIndex =new OrderDetailsIndex();
-		Long curren = orderDetialsVO.getCurrent();
-		Long size =orderDetialsVO.getSize();
-		if(curren==null){
-			orderDetialsVO.setCurrent(1L);
-		}
-		if (size==null){
-			orderDetialsVO.setSize(10L);
-		}
-		BeanUtil.copyProperties(orderDetialsVO, orderDetailsIndex);
-		orderDetailsIndex.setIndex((orderDetialsVO.getCurrent().longValue()-1)*orderDetialsVO.getSize().longValue());
-
-		orderDetailsIndex.setUserId(1L);
-		List<OrderDetailsWapper> list =orderDetailsFacade.seleAllOrderDetials(orderDetailsIndex);
-		List<Long> list1 =new ArrayList<>();
-		for (OrderDetails orderDetails:list) {
-			Long longs = orderDetails.getUserId();
-			list1.add(longs);
-		}
-		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;
-		for(OrderDetailsWapper bean : list) {
-			UserOrgDTO uo = dataMap.get(bean.getUserId());
-			if(uo != null) {
-				bean.setUsername(uo.getUsername());
-				bean.setLinkman(uo.getLinkman());
-				bean.setEmail(uo.getEmail());
-				bean.setOrgId(uo.getOrgId());
-				bean.setOrgName(uo.getOrgName());
-				bean.setIsReject(uo.getIsReject());
-				bean.setAuStatus(uo.getAuStatus());
-			}
-		}
-		return list;
-	}
-
 	/**
 	 * @Description: 产品申请查询所有订单信息
 	 * @Author: wangyu
@@ -225,62 +169,6 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 		}
 		return list;
 	}
-
-	/**
-	 * @Description: 产品申请审核接口
-	 * @Author: wangyu
-	 * @Date: 21:39 2018/9/24
-	 */
-	@Transactional
-	public Boolean updateAuditStatus(AuditStatusVO auditStatusVO){
-		OrderDetails orderDetails =orderDetailsFacade.getById(auditStatusVO.getId());
-		if(orderDetails==null){
-			throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-					"订单明细不存在");
-		}
-		orderDetails.setGmtModified(DateUtil.now());
-		orderDetails.setModifier(UserUtils.getCurrentPrincipleID());
-		orderDetails.setAuditStatus(auditStatusVO.getAuditStatus());
-		//TODO 审核不通过
-		if(auditStatusVO.getAuditStatus()== AuditStatusEnum.Veto.getKey()){
-			if(!orderDetailsFacade.updateById(orderDetails)){
-				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-						"审核状态修改失败");
-			}
-			return true;
-		}
-		//TODO 审核通过 添加已开通产品  判断产品类型是否有online（添加服务  服务产品表  token表）
-		if(!orderDetailsFacade.updateById(orderDetails)){
-			throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-					"审核状态修改失败");
-		}
-		Long userId =Long.parseLong(UserUtils.getCurrentPrincipleID());
-		OpenedProducts openedProducts =new OpenedProducts();
-		openedProducts.setGmtCreate(DateUtil.now());
-		openedProducts.setCreator(UserUtils.getCurrentPrincipleID());
-		openedProducts.setProductId(1L);
-		openedProducts.setUserId(userId);
-		openedProducts.setStartTime(auditStatusVO.getStartTime());
-		openedProducts.setEndTime(auditStatusVO.getEndTime());
-		openedProducts.setOrderId(1L);
-		openedProductsFacade.save(openedProducts);
-		LantoneProduct lantoneProduct =new LantoneProduct();
-		if(lantoneProductFacade.getById(lantoneProduct).getAccessType().indexOf(TokenTypeEnum.Online.getKey())==-1){
-			throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-					"该产品没有线上模式");
-		}
-		ServiceSaveVO serviceSaveVO =new ServiceSaveVO();
-		serviceSaveVO.setDescription(lantoneProduct.getDecription());
-		serviceSaveVO.setName(lantoneProduct.getName());
-		serviceSaveVO.setType(TokenTypeEnum.Online.getKey());
-		ServiceInfo serviceInfo = serviceInfoFacade.createService(serviceSaveVO);
-		ProductServiceSaveVO productServiceSaveVO =new ProductServiceSaveVO();
-		productServiceSaveVO.setProductId(auditStatusVO.getId());
-		productServiceSaveVO.setServiceId(serviceInfo.getId());
-		productServiceSaveVO.setType(TokenTypeEnum.Online.getKey());
-		productServiceFacade.genProductService(productServiceSaveVO);
-		return true;
-	}
 }
 
 

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

@@ -1,12 +1,9 @@
 package com.diagbot.mapper;
 
 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.entity.OrderDetails;
 import com.diagbot.entity.OrderDetailsIndex;
 import com.diagbot.entity.wrapper.OrderDetailsWapper;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -19,14 +16,6 @@ import java.util.List;
  * @since 2018-09-18
  */
 public interface OrderDetailsMapper extends BaseMapper<OrderDetails> {
-
-    /**
-     * @Description: 订单编号查询订单明细
-     * @Author: wangyu
-     * @Date: 20:17 2018/9/19
-     */
-    IPage<OrderDetails>  orderDetialShow(Page page, @Param("orderDetails") OrderDetails orderDetails);
-
     /**
      * @Description: 查询所有待审核产品
      * @Author: wangyu

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

@@ -1,7 +1,5 @@
 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.entity.OrderDetails;
 import com.diagbot.entity.OrderDetailsIndex;
@@ -18,14 +16,6 @@ import java.util.List;
  * @since 2018-09-18
  */
 public interface OrderDetailsService extends IService<OrderDetails> {
-
-    /**
-     * @Description: 订单编号查询订单明细
-     * @Author: wangyu
-     * @Date: 20:17 2018/9/19
-     */
-    IPage<OrderDetails> orderDetialShow(Page page, OrderDetails orderDetails);
-
     /**
      * @Description: 查询所有待审核产品
      * @Author: wangyu

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

@@ -1,13 +1,11 @@
 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.entity.OrderDetails;
 import com.diagbot.entity.OrderDetailsIndex;
 import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import com.diagbot.mapper.OrderDetailsMapper;
 import com.diagbot.service.OrderDetailsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -22,17 +20,6 @@ import java.util.List;
  */
 @Service
 public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, OrderDetails> implements OrderDetailsService {
-
-    /**
-     * @Description: 订单编号查询订单明细
-     * @Author: wangyu
-     * @Date: 20:17 2018/9/19
-     */
-    @Override
-    public IPage<OrderDetails> orderDetialShow(Page page, OrderDetails orderDetails){
-        return baseMapper.orderDetialShow(page,orderDetails);
-    }
-
     /**
      * @Description: （审核）查询订单明细相关信息
      * @Author: wangyu

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

@@ -1,12 +1,12 @@
 package com.diagbot.web;
 
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.OrderDetails;
+import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import com.diagbot.facade.OrderDetailsFacade;
+import com.diagbot.vo.AuditStatusVO;
+import com.diagbot.vo.OrderDetialsVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Description: 订单明细 前端控制器
  * @Author: wangyu
@@ -27,12 +29,25 @@ public class DiagOrderDetailsController {
     @Autowired
     private OrderDetailsFacade orderDetailsFacade;
 
-    @ApiOperation(value = "根据订单编号查询订单明细[by:wangyu]", notes = "orderNum订单编号  必填<br>")
-    @PostMapping("/orderDetialShow")
-    @SysLogger("orderDetialShow")
-    public RespDTO<IPage<OrderDetails>> orderDetialShow(Page page,OrderDetails orderDetails){
-        IPage<OrderDetails> orderDetailsIPage = orderDetailsFacade.orderDetialShows(page,orderDetails);
-        return RespDTO.onSuc(orderDetailsIPage);
+    @ApiOperation(value = "查询所有订单明细[by:wangyu]",
+            notes =
+                    "current:页数<br>"+
+                            "size:每页显示条数<br>"+
+                            "status:订单状态（0.未付款1.已付款）")
+    @PostMapping("/getAllOrderDetials")
+    @SysLogger("getAllOrderDetials")
+    public RespDTO<List<OrderDetailsWapper>> getAllOrderDetials(OrderDetialsVO orderDetialsVO) {
+        List<OrderDetailsWapper> list = orderDetailsFacade.getAllOrderDetials(orderDetialsVO);
+        return RespDTO.onSuc(list);
+    }
+
+    @ApiOperation(value = "产品申请审核接口[by:wangyu]",
+            notes =
+                    "id:订单明细id，根据订单明细id修改审核状态，必填<br>")
+    @PostMapping("/auditStatus")
+    @SysLogger("auditStatus")
+    public RespDTO<Boolean> auditStatus(AuditStatusVO auditStatusVO) {
+        return RespDTO.onSuc(orderDetailsFacade.updateAuditStatus(auditStatusVO));
     }
 }
 

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

@@ -1,17 +1,5 @@
 package com.diagbot.web;
 
-import java.util.List;
-
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-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.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.EnShowOptionDTO;
 import com.diagbot.dto.GetConsoleOnTrialDTO;
@@ -22,7 +10,6 @@ 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.OrderDetailsWapper;
 import com.diagbot.entity.wrapper.ProductOrderWrapper;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -31,15 +18,14 @@ import com.diagbot.facade.OpenedProductsFacade;
 import com.diagbot.facade.ProductOrderFacade;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
-import com.diagbot.vo.AuditStatusVO;
 import com.diagbot.vo.ModifyOpeningTimeVO;
 import com.diagbot.vo.OpenUpOnTrialVO;
-import com.diagbot.vo.OrderDetialsVO;
 import com.diagbot.vo.ProductOrderVO;
 import com.diagbot.vo.StartAndendByUserIdVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -171,19 +157,6 @@ public class ProductOrderController {
 		}
 		return RespDTO.onSuc(res);
 	}
-
-	@ApiOperation(value = "查询所有订单明细[by:wangyu]",
-			notes =
-					"current:页数<br>"+
-							"size:每页显示条数<br>"+
-							"status:订单状态（0.未付款1.已付款）")
-	@PostMapping("/getAllOrderDetials")
-	@SysLogger("getAllOrderDetials")
-	public RespDTO<List<OrderDetailsWapper>> getAllOrderDetials(OrderDetialsVO orderDetialsVO) {
-		List<OrderDetailsWapper> list = productOrderFacade.getAllOrderDetials(orderDetialsVO);
-		return RespDTO.onSuc(list);
-	}
-
 	@ApiOperation(value = "产品申请显示所有订单接口[by:wangyu]",
 			notes =
 					"current:页数<br>"+
@@ -195,13 +168,4 @@ public class ProductOrderController {
 		List<ProductOrderWrapper> list = productOrderFacade.selectAllProductOrder(productOrderVO);
 		return RespDTO.onSuc(list);
 	}
-
-	@ApiOperation(value = "产品申请审核接口[by:wangyu]",
-			notes =
-					"id:订单明细id，根据订单明细id修改审核状态，必填<br>")
-	@PostMapping("/auditStatus")
-	@SysLogger("auditStatus")
-	public RespDTO<Boolean> auditStatus(AuditStatusVO auditStatusVO) {
-		return RespDTO.onSuc(productOrderFacade.updateAuditStatus(auditStatusVO));
-	}
 }

diagbotman-service/src/main/resources/mapper/OrderDetailsMapper.xml

@@ -37,10 +37,6 @@
         <result column="reject_reason" property="rejectReason" />
         <result column="order_time" property="orderTime" />
     </resultMap>
-    <select id="orderDetialShow" resultMap="BaseResultMap">
-        SELECT * FROM diag_order_details WHERE order_num =#{orderDetails.orderNum}
-    </select>
-
     <select id="seleAllOrderDetials" resultMap="BaseResultWrapper" parameterType="com.diagbot.entity.wrapper.OrderDetailsWapper">
         SELECT
         a.*, b.time order_time,c.`name` product_name