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

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

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

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

@@ -92,12 +92,12 @@ public class ProductOrderController {
         return RespDTO.onSuc(productOrderFacade.waitExamOrderCou());
     }
 
-    @ApiOperation(value = "客户中心-传入用户id查询已开通的功能[by:wangfeng]", notes = "已开通信息")
+    @ApiOperation(value = "客户中心-传入用户id查询已开通的功能(传userId)[by:wangfeng]", notes = "已开通信息")
     @PostMapping("/getInformationAvailableByUserId")
     @SysLogger("getInformationAvailableByUserId")
-    public RespDTO getInformationAvailableByUserId(Long userId) {
+    public RespDTO getInformationAvailableByUserId(@RequestBody OpenedProducts openedProduct) {
         OpenedProducts openedProducts = new OpenedProducts();
-        openedProducts.setUserId(userId);
+        openedProducts.setUserId(openedProduct.getUserId());
         List<UserAndProdutDTO> UserAndProdutData = openedProductsFacade.getInformationAvailableByUserId(openedProducts);
         return RespDTO.onSuc(UserAndProdutData);
     }
@@ -112,12 +112,13 @@ public class ProductOrderController {
 
     }
 
-    @ApiOperation(value = "客户中心-传入用户id和产品id，删除开通信息[by:wangfeng]", notes = "删除开通信息")
+    @ApiOperation(value = "客户中心-传入用户userId和产品productId，删除开通信息[by:wangfeng]", notes = "删除开通信息")
     @PostMapping("/delInformationAvailable")
     @SysLogger("delInformationAvailable")
     @Transactional
-    public RespDTO delInformationAvailable(@RequestParam Long userId, Long productId) {
-
+    public RespDTO delInformationAvailable(@RequestBody OpenedProducts openedProduct) {
+    	long userId = openedProduct.getUserId(); 
+    	long productId = openedProduct.getProductId();
         return openedProductsFacade.delInformationAvailables(userId, productId);
     }
 

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -36,6 +36,7 @@ import com.diagbot.util.ListUtil;
 import com.diagbot.util.RegexValidateUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
+import com.diagbot.vo.BaseIdVO;
 import com.diagbot.vo.ImgVerVerVO;
 import com.diagbot.vo.OrganizationVO;
 import com.diagbot.vo.UserAndOrganizationVO;
@@ -685,9 +686,9 @@ public class UserFacade extends UserServiceImpl {
      * @param userId
      * @return 删除用户信息和机构信息
      */
-    public RespDTO<Boolean> updateDeleteds(String userId) {
+    public RespDTO<Boolean> updateDeleteds(BaseIdVO baseIdVO) {
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("userId", userId);
+        map.put("userId", baseIdVO.getId());
         map.put("modifier", UserUtils.getCurrentPrincipleID());
         map.put("gmtModified", DateUtil.now());
         boolean res = updateDeleted(map);

user-service/src/main/java/com/diagbot/vo/OrganizationNameVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @Description: 模糊查询机构
+ * @author wangfeng
+ * @date 2018年9月28日 下午2:44:31
+ */
+@Setter
+@Getter
+public class OrganizationNameVO {
+	
+	private String organizationName;
+
+}

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

@@ -24,6 +24,8 @@ import com.diagbot.facade.OrganizationFacade;
 import com.diagbot.facade.UserAuthenticationFacade;
 import com.diagbot.facade.UserFacade;
 import com.diagbot.facade.UserOrganizationFacade;
+import com.diagbot.vo.BaseIdVO;
+import com.diagbot.vo.OrganizationNameVO;
 import com.diagbot.vo.OrganizationVO;
 import com.diagbot.vo.UserAndOrganizationVO;
 import com.diagbot.vo.UserInfoAuditVO;
@@ -85,15 +87,16 @@ public class UserInfoController {
     @PostMapping("/updateDeleted")
     @SysLogger("updateDeleted")
     @Transactional
-    public RespDTO<Boolean> updateDeleted(@RequestParam String userId) {
-        return userFacade.updateDeleteds(userId);
+    public RespDTO<Boolean> updateDeleted(@RequestBody BaseIdVO baseIdVO) {
+        return userFacade.updateDeleteds(baseIdVO);
     }
 
     @ApiOperation(value = "模糊查询机构信息[by:wangfeng]", notes = "机构信息")
     @PostMapping("/findOrganization")
     @SysLogger("findOrganization")
-    public RespDTO<Organization> findOrganization(@RequestParam String organizationName) {
+    public RespDTO<Organization> findOrganization(@RequestBody OrganizationNameVO organizationNameVO) {
         // TODO 返回机构Id和机构
+    	String organizationName = organizationNameVO.getOrganizationName();
         List<Organization> organization = organizationFacade.findOrganization(organizationName);
 
         return RespDTO.onSuc(organization);