用户更多服务产品显示（添加产品状态标识）

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

@@ -38,6 +38,11 @@ public class ProductLineDTO {
      */
     private String accessType;
 
+    /**
+     * 产品状态
+     */
+    private Integer productAudit;
+
     /**
      * list格式返回给前台
      * @return

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

@@ -0,0 +1,51 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 11:06 2018/9/27
+ */
+public enum ProductAuditEnum implements KeyedNamed {
+    Opended(1,"已开通"),
+    Audit(2, "开通中"),
+    NotOpend(0, "未开通");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    ProductAuditEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static ProductAuditEnum getEnum(Integer key) {
+        for (ProductAuditEnum item : ProductAuditEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        ProductAuditEnum 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

@@ -13,6 +13,7 @@ import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import com.diagbot.entity.wrapper.OpendProductWrapper;
 import com.diagbot.enums.AccessTypeEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.ProductAuditEnum;
 import com.diagbot.enums.StatusEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -153,10 +154,24 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      * @return 根据用户id查询是否有开通产品
      */
     public RespDTO<List<ProductLineDTO>> productLine() {
+        List<ProductLineDTO> productLineDTOList = this.productLines();//所有产品
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
-        List<Long> list = openedProductsFacade.getOpendCountByUserId(userId);
-
-        return RespDTO.onSuc(this.productLine(list));
+        List<Long> opendId = openedProductsFacade.getOpendCountByUserId(userId);
+        List<Long> orderDetailsId = openedProductsFacade.getOpendCountByUserId(userId);
+        for (ProductLineDTO productLineDTO:productLineDTOList) {
+            productLineDTO.setProductAudit(ProductAuditEnum.NotOpend.getKey());
+            for (int i =0; i<opendId.size();i++){
+                if(productLineDTO.getId()==opendId.get(i)){
+                    productLineDTO.setProductAudit(ProductAuditEnum.Opended.getKey());
+                }
+            }
+            for (int i =0; i<orderDetailsId.size();i++){
+                if(productLineDTO.getId()==orderDetailsId.get(i)){
+                    productLineDTO.setProductAudit(ProductAuditEnum.Audit.getKey());
+                }
+            }
+        }
+        return RespDTO.onSuc(productLineDTOList);
     }
 
     /**

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

@@ -25,7 +25,7 @@ public interface LantoneProductMapper extends BaseMapper<LantoneProduct> {
      * @Author: wangyu
      * @Date: 9:49 2018/9/18
      */
-    List<ProductLineDTO> productLine(@Param("productId") List<Long> productId);
+    List<ProductLineDTO> productLines();
 
     /**
      * @Description: 根据产品名称分页查询

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

@@ -38,4 +38,12 @@ public interface OrderDetailsMapper extends BaseMapper<OrderDetails> {
      * @return 添加的条数
      */
     public int saveOrderDetails(@Param("list") List<OrderDetails> list);
+
+
+    /**
+     * 根据用户id查询是否有在认证中的产品
+     * @param userId
+     * @return
+     */
+    public List<Long> getOrderDetailsByUser(Long userId);
 }

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

@@ -24,7 +24,7 @@ public interface LantoneProductService extends IService<LantoneProduct> {
      * @Author: wangyu
      * @Date: 9:49 2018/9/18
      */
-    List<ProductLineDTO> productLine(List<Long> productId);
+    List<ProductLineDTO> productLines();
 
     /**
      * @Description: 朗通查询所有产品线

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

@@ -38,4 +38,11 @@ public interface OrderDetailsService extends IService<OrderDetails> {
      * @return Boolean
      */
     public Boolean saveOrderDetails(List<OrderDetails> list);
+
+    /**
+     * 根据用户id查询是否有在认证中的产品
+     * @param userId
+     * @return
+     */
+    public List<Long> getOrderDetailsByUser(Long userId);
 }

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

@@ -34,8 +34,8 @@ public class LantoneProductServiceImpl extends ServiceImpl<LantoneProductMapper,
      * @Date: 13:29 2018/9/18
      */
     @Override
-    public List<ProductLineDTO> productLine(List<Long> productId) {
-        return baseMapper.productLine(productId);
+    public List<ProductLineDTO> productLines() {
+        return baseMapper.productLines();
     }
 
     /**

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

@@ -51,5 +51,15 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
         return baseMapper.saveOrderDetails(list) ==0 ? true:false;
     }
 
+    /**
+     * 根据用户id查询正在审核中的产品id
+     * @param userId
+     * @return
+     */
+    @Override
+    public List<Long> getOrderDetailsByUser(Long userId) {
+        return baseMapper.getOrderDetailsByUser(userId);
+    }
+
 
 }

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

@@ -44,17 +44,8 @@
     </resultMap>
 
     <!--根据用户id查询用户是否有开通产品-->
-    <select id="productLine" resultType="com.diagbot.dto.ProductLineDTO">
-        <!--SELECT * from diag_lantone_product p WHERE p.is_deleted ='N'
-        <if test="userId != null">
-            and id NOT IN (SELECT product_id FROM diag_opened_products WHERE user_id =#{userId})
-        </if>-->
+    <select id="productLines" resultType="com.diagbot.dto.ProductLineDTO">
         SELECT * FROM `diag_lantone_product` WHERE is_deleted = 'N'
-        <if test="productId != null and productId.size() !=0 ">
-            <foreach item="productId" collection="productId" open="" separator="" close="">
-                and id != #{productId}
-            </foreach>
-        </if>
     </select>
 
     <!--根据产品名称分页查询-->

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

@@ -73,4 +73,8 @@
             </foreach>
         </if>
     </insert>
+
+    <select id="getOrderDetailsByUser" resultType="java.lang.Long">
+        SELECT a.product_id FROM diag_order_details a WHERE a.is_deleted ='N' and a.user_id = #{userId}
+    </select>
 </mapper>