用户更多服务——返回结果添加用户认证状态

diagbotman-service/src/main/java/com/diagbot/enums/AuthStatusEnum.java

@@ -0,0 +1,51 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description:认证状态枚举类
+ * @author: zhaops
+ * @time: 2018/9/17 20:25
+ */
+public enum AuthStatusEnum implements KeyedNamed {
+
+    Unauthorized(0, "未认证"),
+    Authorized(1, "已认证"),
+    Authorizing(2, "认证中");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    AuthStatusEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static AuthStatusEnum getEnum(Integer key) {
+        for (AuthStatusEnum item : AuthStatusEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        AuthStatusEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

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

@@ -36,6 +36,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -234,6 +235,8 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
     public RespDTO<List<ProductLineDTO>> productLine() {
         List<ProductLineDTO> productLineDTOList = this.productLines();//所有产品
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+        List<Long> userIdList =new ArrayList<>();
+        userIdList.add(userId);
         List<Long> opendId = openedProductsFacade.getOpendCountByUserId(userId);
         List<Long> orderDetailsId = orderDetailsFacade.getOrderDetailsByUser(userId);
         for (ProductLineDTO productLineDTO:productLineDTOList) {
@@ -249,7 +252,14 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
                 }
             }
         }
-        return RespDTO.onSuc(productLineDTOList);
+        Map<Long, UserOrgDTO> dataMap = userServiceClient.getUserAndOrg(userIdList).data;
+        UserOrgDTO uo =dataMap.get(userId);
+        Map map =new HashMap();
+        map.put("userAuStatus",uo.getAuStatus());
+        List list =new ArrayList();
+        list.add(productLineDTOList);
+        list.add(map);
+        return RespDTO.onSuc(list);
     }
 
     /**

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

@@ -1,24 +1,11 @@
 package com.diagbot.facade;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
 import com.diagbot.dto.EnShowOptionDTO;
 import com.diagbot.dto.GetConsoleOnTrialDTO;
 import com.diagbot.dto.GetConsoleOpenedDTO;
 import com.diagbot.dto.OpenUpOnTrialDTO;
 import com.diagbot.dto.ProductServiceDTO;
 import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.ProductService;
 import com.diagbot.entity.ServiceInfo;
@@ -35,6 +22,12 @@ import com.diagbot.vo.ModifyOpeningTimeVO;
 import com.diagbot.vo.OpenUpOnTrialVO;
 import com.diagbot.vo.ProductServiceSaveVO;
 import com.diagbot.vo.StartAndendByUserIdVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:已开通产品业务层
@@ -219,9 +212,10 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
         openedProducts.setCreator(UserUtils.getCurrentPrincipleID());
         openedProducts.setGmtCreate(DateUtil.now());
         UserRenewals userRenewals = new UserRenewals();
-        userRenewals.setUserId(modifyOpeningTimeVO.getUserId());
-        userRenewals.setProductId(modifyOpeningTimeVO.getProductId());
         userRenewals.setRenewalsStutas(1);
+        userRenewals.setGmtModified(DateUtil.now());
+        userRenewals.setModifier(UserUtils.getCurrentPrincipleID());
+        userRenewals.setRenewalsNo(modifyOpeningTimeVO.getRenewalsNo());
        //修改续费时间
         boolean res = modifyOpeningTime(openedProducts);
         if (!res) {