修复产品已开通数量和详情不一致问题

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/OpendProductWrapper.java

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

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

@@ -210,10 +210,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      */
     public IPage<OpendProductWrapper> opendedProduct(OppendedProductVO oppendedProductVO) {
         Page page =new Page();
-        if(oppendedProductVO.getCurrent() !=0 && oppendedProductVO.getSize() != 0){
-            page.setCurrent(oppendedProductVO.getCurrent());
-            page.setSize(oppendedProductVO.getSize());
-        }
+        BeanUtil.copyProperties(oppendedProductVO,page);
         OpenedProductsIndex openedProductsIndex = new OpenedProductsIndex();
         BeanUtil.copyProperties(oppendedProductVO, openedProductsIndex);
         List<OpendProductWrapper> list = openedProductsFacade.getByProductId(page,openedProductsIndex).getRecords();
@@ -245,16 +242,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      */
     public RespDTO<IPage<LantoneProductDTO>> index(LantoneProductSelectVO lantoneProductSelectVO) {
         Page page =new Page();
-        if(lantoneProductSelectVO.getSize()==0){
-            page.setSize(10l);
-        }else {
-            page.setSize(lantoneProductSelectVO.getSize());
-        }
-        if(lantoneProductSelectVO.getCurrent()==0){
-            page.setCurrent(1l);
-        }else {
-            page.setCurrent(lantoneProductSelectVO.getCurrent());
-        }
+        BeanUtil.copyProperties(lantoneProductSelectVO,page);
         IPage<LantoneProductDTO> res = this.selectProduct(page, lantoneProductSelectVO.getName());
         return RespDTO.onSuc(res);
     }

diagbotman-service/src/main/java/com/diagbot/vo/LantoneProductSelectVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,19 +11,10 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class LantoneProductSelectVO{
+public class LantoneProductSelectVO extends Page{
     /**
      * 产品名称
      */
     private String name;
 
-    /**
-     * 每页显示的条数
-     */
-    private long size;
-
-    /**
-     * 页数
-     */
-    private long current;
 }

diagbotman-service/src/main/java/com/diagbot/vo/OppendedProductVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,12 +13,7 @@ import javax.validation.constraints.NotBlank;
  */
 @Getter
 @Setter
-public class OppendedProductVO {
+public class OppendedProductVO extends Page{
     @NotBlank(message = "请输入产品Id!")
     private Long productId;
-    @NotBlank(message = "请输入页数!")
-    private Long current;
-    @NotBlank(message = "请输入每页显示条数!")
-    private Long size;
-
 }

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

@@ -69,6 +69,8 @@
         diag_opened_products o
         WHERE
         p.id = o.product_id
+        AND
+        o.is_deleted ='N'
         ) oppended_num
         FROM
         `diag_lantone_product` p WHERE p.is_deleted ='N'