删除用户修改1.2

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

@@ -11,6 +11,7 @@ import com.diagbot.entity.OrderDetails;
 import com.diagbot.entity.OrderDetailsIndex;
 import com.diagbot.entity.ProductOrder;
 import com.diagbot.entity.ServiceInfo;
+import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import com.diagbot.enums.AuditStatusEnum;
 import com.diagbot.enums.NotPassEnum;
 import com.diagbot.enums.PaymentMethodEnum;
@@ -191,8 +192,8 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
     /**
      * 根据用户id查询是否有在审核的数据数量
      */
-	public int getOrderByUserToAudit(Long userId) {
+	public int getOrderByUserToAudit(OrderDetailsWapper rderDetails) {
     	
-		return baseMapper.getOrderByUserToAudit(userId);
+		return baseMapper.getOrderByUserToAudit(rderDetails);
     }
 }

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

@@ -5,6 +5,8 @@ import com.diagbot.dto.OrderDetialsDTO;
 import com.diagbot.entity.OrderDetailStatus;
 import com.diagbot.entity.OrderDetails;
 import com.diagbot.entity.OrderDetailsIndex;
+import com.diagbot.entity.wrapper.OrderDetailsWapper;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -51,5 +53,5 @@ public interface OrderDetailsMapper extends BaseMapper<OrderDetails> {
      * @param userId
      * @return
      */
-    public int  getOrderByUserToAudit(Long userId);
+    public int  getOrderByUserToAudit(OrderDetailsWapper orderDetails);
 }

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

@@ -5,6 +5,7 @@ import com.diagbot.dto.OrderDetialsDTO;
 import com.diagbot.entity.OrderDetailStatus;
 import com.diagbot.entity.OrderDetails;
 import com.diagbot.entity.OrderDetailsIndex;
+import com.diagbot.entity.wrapper.OrderDetailsWapper;
 
 import java.util.List;
 
@@ -46,5 +47,5 @@ public interface OrderDetailsService extends IService<OrderDetails> {
      */
     public List<Long> getOrderDetailsByUser(Long userId);
     
-    public int  getOrderByUserToAudit(Long userId);
+    public int  getOrderByUserToAudit(OrderDetailsWapper orderDetails);
 }

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

@@ -62,9 +62,9 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
         return baseMapper.getOrderDetailsByUser(userId);
     }
     @Override
-	public int getOrderByUserToAudit(Long userId) {
+	public int getOrderByUserToAudit(OrderDetailsWapper orderDetails) {
 		
-		return baseMapper.getOrderByUserToAudit(userId);
+		return baseMapper.getOrderByUserToAudit(orderDetails);
 	}
 
 }

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

@@ -13,6 +13,7 @@ import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.dto.WaitExamOrderCouDTO;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.UserRenewals;
+import com.diagbot.entity.wrapper.OrderDetailsWapper;
 import com.diagbot.facade.LantoneProductFacade;
 import com.diagbot.facade.OpenedProductsFacade;
 import com.diagbot.facade.OrderDetailsFacade;
@@ -169,7 +170,9 @@ public class ProductOrderController {
     @SysLogger("getOrderByUserToAudit")
    
     public RespDTO<Integer> getOrderByUserToAudit(@RequestBody Long userId){
-    	int sums = orderDetailsFacade.getOrderByUserToAudit(userId);
+    	OrderDetailsWapper rderDetails =new OrderDetailsWapper();
+    	rderDetails.setUserId(userId);
+    	int sums = orderDetailsFacade.getOrderByUserToAudit(rderDetails);
     	return RespDTO.onSuc(sums);	
     }
     @ApiOperation(value = "客户中心-查询用户续费数量[by:wangfeng]", notes = "用户已开通信息")

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

@@ -969,7 +969,7 @@ public class UserFacade extends UserServiceImpl {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                     "审核的产品数量失败");
         }
-        int auditSum = renewalSums.data;
+        int auditSum = auditSums.data;
         System.out.println("=========auditSumauditSum===="+auditSum);
         if(auditSum>0){
    		 return RespDTO.onError("该用户产品申请单，请先审核");