接口调试修改

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

@@ -86,7 +86,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
     public Boolean deleteProduct(UpdateProductVO updateProductVO) {
         LantoneProduct lantoneProduct = getById(updateProductVO.getId());
         OpenedProducts openedProducts = new OpenedProducts();
-        openedProducts.setId(updateProductVO.getId());
+        openedProducts.setProductId(updateProductVO.getId());
         openedProducts.setServiceStatus(StatusEnum.Enable.getKey());
         if (openedProductsFacade.getOpendById(openedProducts).size() != 0) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
@@ -94,7 +94,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         }
         lantoneProduct.setModifier(UserUtils.getCurrentPrincipleID());
         lantoneProduct.setGmtModified(DateUtil.now());
-        lantoneProduct.setIsDeleted(IsDeleteEnum.Y.getName());
+        lantoneProduct.setIsDeleted(IsDeleteEnum.Y.getKey());
         if (!updateById(lantoneProduct)) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                     "产品删除失败");

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

@@ -94,13 +94,14 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
         openedProducts.setOrderId(productOrder.getId());
         openedProductsFacade.save(openedProducts);
         LantoneProduct lantoneProduct =new LantoneProduct();
+        lantoneProduct.setId(orderDetails.getProductId());
         String accessType = lantoneProductFacade.getById(lantoneProduct).getAccessType();
         List<String> list = Arrays.asList(accessType.split(","));
         for (String s:list) {
-            if(s.equals(TokenTypeEnum.Online.getKey())){
+            if(Integer.parseInt(s) ==(TokenTypeEnum.Online.getKey())){
                 ServiceSaveVO serviceSaveVO =new ServiceSaveVO();
-                serviceSaveVO.setDescription(lantoneProduct.getDecription());
-                serviceSaveVO.setName(lantoneProduct.getName());
+                serviceSaveVO.setDescription(lantoneProductFacade.getById(lantoneProduct).getDecription());
+                serviceSaveVO.setName(lantoneProductFacade.getById(lantoneProduct).getName());
                 serviceSaveVO.setType(TokenTypeEnum.Online.getKey());
                 ServiceInfo serviceInfo = serviceInfoFacade.createService(serviceSaveVO);
                 ProductServiceSaveVO productServiceSaveVO =new ProductServiceSaveVO();

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

@@ -171,8 +171,10 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 		BeanUtil.copyProperties(productOrderVO, productOrderIndex);
 		productOrderIndex.setIndex((productOrderVO.getCurrent().longValue()-1)*productOrderVO.getSize().longValue());
 		//TODO
-		RespDTO<List<Long>> rlist = userServiceClient.getUserByOrgName(productOrderVO.getOrgName());
-		productOrderIndex.setUserId(rlist.data);
+        if(productOrderVO.getOrgName()!=null&&productOrderVO.getOrgName()!=""){
+            RespDTO<List<Long>> rlist = userServiceClient.getUserByOrgName(productOrderVO.getOrgName());
+            productOrderIndex.setUserId(rlist.data);
+        }
 		List<ProductOrderWrapper> list =productOrderFacade.selectAllProductOrder(productOrderIndex);
 		List<Long> list1 =new ArrayList<>();
 		for (ProductOrderWrapper productOrderWrapper:list) {
@@ -203,6 +205,7 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 
     /**
      * 修改订单审核状态
+     *
      * @param orderNum 参数
      * @return Boolean true
      */

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

@@ -29,7 +29,7 @@ public class DiagOrderDetailsController {
     @Autowired
     private OrderDetailsFacade orderDetailsFacade;
 
-    @ApiOperation(value = "查询所有订单明细[by:wangyu]",
+    @ApiOperation(value = "产品申请——显示[by:wangyu]",
             notes =
                     "current:页数<br>" +
                             "size:每页显示条数<br>" +