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

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

@@ -24,6 +24,7 @@ public class UserOrgDTO implements Serializable{
 	    private Long orgId;//机构ID
 	    private String orgName;//机构名称
 		private Integer isReject; //是否通过认证
+		private Integer subNum;//机构数量
 		private Integer auStatus;  //认证状态（0：未认证，1：已认证，2：认证中）
 
 }

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

@@ -7,29 +7,16 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.OpenedProductsIndex;
-import com.diagbot.entity.OrderDetails;
-import com.diagbot.entity.OrderDetailsIndex;
-import com.diagbot.entity.ProductOrderIndex;
-import com.diagbot.entity.ServiceInfo;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import com.diagbot.entity.wrapper.OpendProductWrapper;
-import com.diagbot.entity.wrapper.OrderDetailsWapper;
-import com.diagbot.entity.wrapper.ProductOrderWrapper;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.LantoneProductServiceImpl;
 import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
-import com.diagbot.vo.AuditStatusVO;
 import com.diagbot.vo.OppendedProductVO;
-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;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -45,15 +32,8 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
     @Autowired
     private OpenedProductsFacade openedProductsFacade;
     @Autowired
-    private ProductOrderFacade productOrderFacade;
-    @Autowired
     private UserServiceClient userServiceClient;
-    @Autowired
-    private OrderDetailsFacade orderDetailsFacade;
-    @Autowired
-    private ServiceInfoFacade serviceInfoFacade;
-    @Autowired
-    private ProductServiceFacade productServiceFacade;
+
     /**
      * @Description: 添加产品业务逻辑
      * @Author: wangyu
@@ -178,122 +158,4 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         }
         return list;
     }
-
-    /**
-     * @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());
-       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
-     * @Date: 20:23 2018/9/24
-     */
-    public List<ProductOrderWrapper> selectAllProductOrder(ProductOrderVO productOrderVO){
-        ProductOrderIndex productOrderIndex =new ProductOrderIndex();
-        Long curren = productOrderVO.getCurrent();
-        Long size =productOrderVO.getSize();
-        if(curren==null){
-            productOrderVO.setCurrent(1L);
-        }
-        if (size==null){
-            productOrderVO.setSize(10L);
-        }
-        BeanUtil.copyProperties(productOrderVO, productOrderIndex);
-        productOrderIndex.setIndex((productOrderVO.getCurrent().longValue()-1)*productOrderVO.getSize().longValue());
-        List<ProductOrderWrapper> list =productOrderFacade.selectAllProductOrder(productOrderIndex);
-        List<Long> list1 =new ArrayList<>();
-        for (ProductOrderWrapper productOrderWrapper:list) {
-            Long longs = productOrderWrapper.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(ProductOrderWrapper 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
-     * @Date: 21:39 2018/9/24
-     */
-    @Transactional
-    public CommonErrorCode updateAuditStatus(AuditStatusVO auditStatusVO){
-        OrderDetails orderDetails =new OrderDetails();
-        orderDetails.setId(auditStatusVO.getId());
-        orderDetails.setGmtModified(DateUtil.now());
-        orderDetails.setModifier(UserUtils.getCurrentPrincipleID());
-        orderDetails.setAuditStatus(1);
-        if(!orderDetailsFacade.updateById(orderDetails)){
-            return CommonErrorCode.FAIL;
-        }
-        LantoneProduct lantoneProduct =new LantoneProduct();
-        lantoneProduct.setId(auditStatusVO.getId());
-        ServiceSaveVO serviceSaveVO =new ServiceSaveVO();
-        ProductServiceSaveVO productServiceSaveVO =new ProductServiceSaveVO();
-        serviceSaveVO.setDescription(lantoneProduct.getDecription());
-        serviceSaveVO.setName(lantoneProduct.getName());
-        serviceSaveVO.setType(1);
-        ServiceInfo serviceInfo = serviceInfoFacade.createService(serviceSaveVO);
-        productServiceSaveVO.setProductId(auditStatusVO.getId());
-        productServiceSaveVO.setServiceId(serviceInfo.getId());
-        productServiceSaveVO.setType(1);
-        productServiceFacade.genProductService(productServiceSaveVO);
-        return CommonErrorCode.OK;
-    }
 }

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

@@ -1,24 +1,39 @@
 package com.diagbot.facade;
 
+import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.ProductAuthProgressDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.dto.WaitExamOrderCouDTO;
 import com.diagbot.entity.LantoneProduct;
 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.VisibleIdTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.idc.VisibleIdCreater;
 import com.diagbot.service.impl.ProductOrderServiceImpl;
+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;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 订单业务
@@ -37,6 +52,10 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 	private LantoneProductFacade lantoneProductFacade;
 	@Autowired
 	private ProductServiceFacade productServiceFacade;
+	@Autowired
+	private UserServiceClient userServiceClient;
+	@Autowired
+	private ProductOrderFacade productOrderFacade;
 
 	public List<ProductAuthProgressDTO> productAuthProgress(){
 		List<ProductAuthProgressDTO> retList = new ArrayList<ProductAuthProgressDTO>();
@@ -101,7 +120,124 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
     	waitExamOrderCouDTO.setCount(baseMapper.waitExamOrderCou());
     	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());
+		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
+	 * @Date: 20:23 2018/9/24
+	 */
+	public List<ProductOrderWrapper> selectAllProductOrder(ProductOrderVO productOrderVO){
+		ProductOrderIndex productOrderIndex =new ProductOrderIndex();
+		Long curren = productOrderVO.getCurrent();
+		Long size =productOrderVO.getSize();
+		if(curren==null){
+			productOrderVO.setCurrent(1L);
+		}
+		if (size==null){
+			productOrderVO.setSize(10L);
+		}
+		BeanUtil.copyProperties(productOrderVO, productOrderIndex);
+		productOrderIndex.setIndex((productOrderVO.getCurrent().longValue()-1)*productOrderVO.getSize().longValue());
+		List<ProductOrderWrapper> list =productOrderFacade.selectAllProductOrder(productOrderIndex);
+		List<Long> list1 =new ArrayList<>();
+		for (ProductOrderWrapper productOrderWrapper:list) {
+			Long longs = productOrderWrapper.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(ProductOrderWrapper 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
+	 * @Date: 21:39 2018/9/24
+	 */
+	@Transactional
+	public CommonErrorCode updateAuditStatus(AuditStatusVO auditStatusVO){
+		OrderDetails orderDetails =new OrderDetails();
+		orderDetails.setId(auditStatusVO.getId());
+		orderDetails.setGmtModified(DateUtil.now());
+		orderDetails.setModifier(UserUtils.getCurrentPrincipleID());
+		orderDetails.setAuditStatus(1);
+		if(!orderDetailsFacade.updateById(orderDetails)){
+			return CommonErrorCode.FAIL;
+		}
+		LantoneProduct lantoneProduct =new LantoneProduct();
+		lantoneProduct.setId(auditStatusVO.getId());
+		ServiceSaveVO serviceSaveVO =new ServiceSaveVO();
+		ProductServiceSaveVO productServiceSaveVO =new ProductServiceSaveVO();
+		serviceSaveVO.setDescription(lantoneProduct.getDecription());
+		serviceSaveVO.setName(lantoneProduct.getName());
+		serviceSaveVO.setType(1);
+		ServiceInfo serviceInfo = serviceInfoFacade.createService(serviceSaveVO);
+		productServiceSaveVO.setProductId(auditStatusVO.getId());
+		productServiceSaveVO.setServiceId(serviceInfo.getId());
+		productServiceSaveVO.setType(1);
+		productServiceFacade.genProductService(productServiceSaveVO);
+		return CommonErrorCode.OK;
+	}
 }
 
 

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

@@ -7,14 +7,8 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
-import com.diagbot.entity.wrapper.OrderDetailsWapper;
-import com.diagbot.entity.wrapper.ProductOrderWrapper;
 import com.diagbot.facade.LantoneProductFacade;
-import com.diagbot.facade.OpenedProductsFacade;
-import com.diagbot.vo.AuditStatusVO;
 import com.diagbot.vo.OppendedProductVO;
-import com.diagbot.vo.OrderDetialsVO;
-import com.diagbot.vo.ProductOrderVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,10 +31,8 @@ import java.util.List;
 public class DiagLantoneProductController {
     @Autowired
     private LantoneProductFacade lantoneProductFacade;
-    @Autowired
-    private OpenedProductsFacade openedProductsFacade;
 
-    @ApiOperation(value = "添加产品线",
+    @ApiOperation(value = "添加产品线[by:wangyu]",
             notes = "name：产品名，必填<br>" +
                     "decription：产品描述，必填<br> " +
                     "url：产品访问路径，必填<br>" +
@@ -52,7 +44,7 @@ public class DiagLantoneProductController {
         return RespDTO.onSuc(lantoneProductFacade.addProducts(lantoneProduct));
     }
 
-    @ApiOperation(value = "分页查询查询产品线",
+    @ApiOperation(value = "分页查询查询产品线[by:wangyu]",
             notes = "name：添加后则根据产品名称查询，选填<br>"+
                     "根据每页显示条数，默认 10，和当前页<br>")
     @PostMapping("/selectProduct")
@@ -62,7 +54,7 @@ public class DiagLantoneProductController {
         return RespDTO.onSuc(pages);
     }
 
-    @ApiOperation(value = "修改产品(产品启用同接口)",
+    @ApiOperation(value = "修改产品(产品启用同接口)[by:wangyu]",
             notes = "id：根据产品id修改产品内容，必填<br>")
     @PostMapping("/updateProduct")
     @SysLogger("updateProduct")
@@ -80,7 +72,7 @@ public class DiagLantoneProductController {
         return RespDTO.onSuc(lantoneProductFacade.deleteProduct(lantoneProduct));
     }
 
-    @ApiOperation(value = "更改产品状态（启用/停用）",
+    @ApiOperation(value = "更改产品状态（启用/停用）[by:wangyu]",
             notes = "id：根据产品id更改产品状态，必填<br>")
     @PostMapping("/productStatus")
     @SysLogger("productStatus")
@@ -89,7 +81,7 @@ public class DiagLantoneProductController {
         return RespDTO.onSuc(lantoneProductFacade.productStatus(lantoneProduct));
     }
 
-    @ApiOperation(value = "查询当条产品线所有已开通用户",
+    @ApiOperation(value = "查询当条产品线所有已开通用户[by:wangyu]",
             notes = "id：根据产品id查询所有已开通本产品用户，必填<br>"+
                     "current:页数<br>"+
                     "size:每页显示条数"
@@ -101,46 +93,12 @@ public class DiagLantoneProductController {
         return RespDTO.onSuc(lantoneProductFacade.opendedProduct(oppendedProductVO));
     }
 
-    @ApiOperation(value = "根据用户id查询当前用户已开通产品")
+    @ApiOperation(value = "根据用户id查询当前用户已开通产品[by:wangyu]")
     @PostMapping("/opendedProductByCurrentUser")
     @SysLogger("opendedProductByCurrentUser")
     public RespDTO opendedProductByCurrentUser() {
         List<LantoneProductWrapper> list = lantoneProductFacade.opendedProductByCurrentUser();
         return RespDTO.onSuc(list);
     }
-
-    @ApiOperation(value = "查询所有订单明细",
-            notes =
-                    "current:页数<br>"+
-                    "size:每页显示条数<br>"+
-                    "status:订单状态（0.未付款1.已付款）")
-    @PostMapping("/getAllOrderDetials")
-    @SysLogger("getAllOrderDetials")
-    public RespDTO getAllOrderDetials(OrderDetialsVO orderDetialsVO) {
-        List<OrderDetailsWapper> list = lantoneProductFacade.getAllOrderDetials(orderDetialsVO);
-        return RespDTO.onSuc(list);
-    }
-
-    @ApiOperation(value = "产品申请显示所有订单接口",
-            notes =
-                    "current:页数<br>"+
-                            "size:每页显示条数<br>"+
-                            "status:订单状态（0.未付款1.已付款）")
-    @PostMapping("/getAllProductOrder")
-    @SysLogger("getAllProductOrder")
-    public RespDTO getAllProductOrder(ProductOrderVO productOrderVO) {
-        List<ProductOrderWrapper> list = lantoneProductFacade.selectAllProductOrder(productOrderVO);
-        return RespDTO.onSuc(list);
-    }
-
-    @ApiOperation(value = "产品申请审核接口",
-            notes =
-                    "id:订单明细id，根据订单明细id修改审核状态，必填<br>")
-    @PostMapping("/auditStatus")
-    @SysLogger("auditStatus")
-    @Transactional
-    public RespDTO auditStatus(AuditStatusVO auditStatusVO) {
-        return RespDTO.onSuc(lantoneProductFacade.updateAuditStatus(auditStatusVO));
-    }
 }
 

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

@@ -10,7 +10,7 @@ import com.diagbot.facade.OrderDetailsFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -27,8 +27,8 @@ public class DiagOrderDetailsController {
     @Autowired
     private OrderDetailsFacade orderDetailsFacade;
 
-    @ApiOperation(value = "根据订单编号查询订单明细", notes = "orderNum订单编号  必填<br>")
-    @GetMapping("/orderDetialShow")
+    @ApiOperation(value = "根据订单编号查询订单明细[by:wangyu]", notes = "orderNum订单编号  必填<br>")
+    @PostMapping("/orderDetialShow")
     @SysLogger("orderDetialShow")
     public RespDTO<OrderDetails> orderDetialShow(Page page,OrderDetails orderDetails){
         IPage<OrderDetails> orderDetailsIPage = orderDetailsFacade.orderDetialShows(page,orderDetails);

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

@@ -34,7 +34,7 @@ public class MoreServiceController {
     private ProductOrderFacade productOrderFacade;
 
     @ApiOperation(value = "根据用户id查询已开通信息", notes = "根据用户id查询已开通信息")
-    @GetMapping("/showProductInfo")
+    @PostMapping("/showProductInfo")
     @SysLogger("showProductInfo")
     public RespDTO<LantoneProduct> showProductInfo(Page page){
         IPage<LantoneProduct> diagLantoneProducts =lantoneProductFacade.productLine(page);

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

@@ -22,16 +22,30 @@ 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.facade.LantoneProductFacade;
 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.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 javax.validation.Valid;
+import java.util.List;
 
 /**
  * 
@@ -43,6 +57,8 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping("/productOrder")
 @SuppressWarnings("unchecked")
 public class ProductOrderController {
+	@Autowired
+	private LantoneProductFacade lantoneProductFacade;
 
 	@Autowired
 	private ProductOrderFacade productOrderFacade;
@@ -73,7 +89,6 @@ public class ProductOrderController {
 	@ApiOperation(value = "控制台-产品立即试用接口",notes="控制台-产品立即试用接口")
 	@PostMapping("/openUpOnTrial")
 	@SysLogger("openUpOnTrial")
-	@Transactional
 	public RespDTO<OpenUpOnTrialDTO> openUpOnTrial(OpenUpOnTrialVO openUpOnTrialVO) {
 		return RespDTO.onSuc(openedProductsFacade.openUpOnTrial(openUpOnTrialVO));
 	}
@@ -154,5 +169,36 @@ public class ProductOrderController {
 		return RespDTO.onSuc("操作成功!");
 	}
 
+	@ApiOperation(value = "查询所有订单明细[by:wangyu]",
+			notes =
+					"current:页数<br>"+
+							"size:每页显示条数<br>"+
+							"status:订单状态（0.未付款1.已付款）")
+	@PostMapping("/getAllOrderDetials")
+	@SysLogger("getAllOrderDetials")
+	public RespDTO getAllOrderDetials(OrderDetialsVO orderDetialsVO) {
+		List<OrderDetailsWapper> list = productOrderFacade.getAllOrderDetials(orderDetialsVO);
+		return RespDTO.onSuc(list);
+	}
+
+	@ApiOperation(value = "产品申请显示所有订单接口[by:wangyu]",
+			notes =
+					"current:页数<br>"+
+							"size:每页显示条数<br>"+
+							"status:订单状态（0.未付款1.已付款）")
+	@PostMapping("/getAllProductOrder")
+	@SysLogger("getAllProductOrder")
+	public RespDTO getAllProductOrder(ProductOrderVO productOrderVO) {
+		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 auditStatus(AuditStatusVO auditStatusVO) {
+		return RespDTO.onSuc(productOrderFacade.updateAuditStatus(auditStatusVO));
+	}
 }

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

@@ -3,6 +3,7 @@ package com.diagbot.web;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ServiceFilter;
 import com.diagbot.facade.ServiceFilterFacade;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,8 +25,11 @@ public class ServiceFilterController {
     @Autowired
     ServiceFilterFacade serviceFilterFacade;
 
-    @ApiIgnore
+
     @PostMapping("/getAll")
+    @ApiOperation(value = "获取需要appkey和secret的服务信息",
+            notes = "接口未用，直接从配置项中读取服务")
+    @ApiIgnore
     public RespDTO<List<ServiceFilter>> getServiceFilter() {
         return serviceFilterFacade.getAll();
     }

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

@@ -42,6 +42,7 @@ public class ServiceTokenController {
 
 
     @PostMapping("/hasPermission")
+    @ApiOperation(value = "查询当前appkey和secret是否有权限[by:zhoutg]")
     @ApiIgnore
     public RespDTO<Boolean> hasPermission(@RequestBody ServiceTokenVo serviceTokenVo) {
         return serviceTokenFacade.hasPermission(serviceTokenVo);

user-service/src/main/java/com/diagbot/dto/UserOrgDTO.java

@@ -24,6 +24,7 @@ public class UserOrgDTO implements Serializable{
 	    private Long orgId;//机构ID
 	    private String orgName;//机构名称
 		private Integer isReject; //是否通过认证
+		private Integer subNum;//机构数量
 		private Integer auStatus;  //认证状态（0：未认证，1：已认证，2：认证中）
 
 }

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -44,7 +44,7 @@ public class UserController {
     @Autowired
     private PermissionFacade permissionFacade;
 
-    @ApiOperation(value = "注册",
+    @ApiOperation(value = "注册[by:zhoutg]",
         notes = "username：用户名，必填<br>" +
                 "password：密码，必填<br> " +
                 "organization：组织机构，必填<br>" +
@@ -61,7 +61,7 @@ public class UserController {
     }
 
 
-    @ApiOperation(value = "登录",
+    @ApiOperation(value = "登录[by:zhoutg]",
             notes = "username：用户名,必填<br>" +
                     "password：密码, 必填<br> ")
     @PostMapping("/login")
@@ -71,7 +71,7 @@ public class UserController {
     }
 
 
-    @ApiOperation(value = "重置密码",
+    @ApiOperation(value = "重置密码[by:zhoutg]",
             notes = "username：用户名,必填<br>" +
                     "password：密码, 必填<br> " +
                     "diffPassword：值为Y，表示修改前和修改后密码不相同<br>")
@@ -91,7 +91,7 @@ public class UserController {
      */
     @PostMapping(value = "/getUserAndOrg")
     @SysLogger("getUserAndOrg")
-    @ApiOperation(value = "获取用户和机构信息")
+    @ApiOperation(value = "获取用户和机构信息[by:zhoutg]")
     @ApiIgnore
     RespDTO<Map<Long,UserOrgDTO>> getUserAndOrg(@RequestBody List<Long> userIds) {
         Map<Long, UserOrgDTO> result = userFacade.getUserAndOrg(userIds);
@@ -106,12 +106,13 @@ public class UserController {
      */
     @PostMapping("/index")
     @SysLogger("index")
+    @ApiOperation(value = "用来测试分页，未用[by:zhoutg]")
     @ApiIgnore
     public RespDTO<IPage<User>> indexUser(Page page, UserSaveVO userSaveVO){
         return userFacade.index(page, userSaveVO);
     }
 
-    @ApiOperation(value = "获取资源信息",
+    @ApiOperation(value = "获取资源信息[by:zhoutg]",
             notes = "appkey：用户名,必填<br>" +
                     "secret：密码, 必填<br> ")
     @PostMapping("/getPermission")

user-service/src/main/resources/mapper/UserMapper.xml

@@ -26,6 +26,7 @@
 		<result column="org_name" property="orgName" />
 		<result column="is_reject" property="isReject" />
 		<result column="au_status" property="auStatus" />
+		<result column="sub_num" property="subNum" />
 	</resultMap>
 
 
@@ -66,7 +67,7 @@
 
 
 	<select id="getUserOrgDTOByIds" resultMap="UserOrgDTO">
-		select u.id user_id ,u.username username, u.email email, u.linkman linkman , org.id org_id, org.name  org_name, ua.is_reject is_reject, ua.status au_status
+		select u.id user_id ,u.username username, u.email email, u.linkman linkman , org.id org_id, org.name  org_name, ua.is_reject is_reject, ua.status au_status,org.sub_num
 		from sys_user u, sys_user_organization uo, sys_organization org , sys_user_authentication ua
 		where u.is_deleted = 'N' and uo.is_deleted = 'N' and org.is_deleted = 'N'
 		and u.id = uo.user_id and uo.organization_id = org.id and u.id = ua.user_id