删除用户修改

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

@@ -167,16 +167,16 @@ public class ProductOrderController {
     @ApiOperation(value = "客户中心-查询用户是否有待审核的产品数量[by:wangfeng]", notes = "用户已开通信息")
     @PostMapping("/getOrderByUserToAudit")
     @SysLogger("getOrderByUserToAudit")
-    @ApiIgnore
-    public RespDTO<Integer> getOrderByUserToAudit(Long userId){
+   
+    public RespDTO<Integer> getOrderByUserToAudit(@RequestBody Long userId){
     	int sums = orderDetailsFacade.getOrderByUserToAudit(userId);
     	return RespDTO.onSuc(sums);	
     }
     @ApiOperation(value = "客户中心-查询用户续费数量[by:wangfeng]", notes = "用户已开通信息")
     @PostMapping("/getUserWaitingRenewal")
     @SysLogger("getUserWaitingRenewal")
-    @ApiIgnore
-    public RespDTO<Integer> getUserWaitingRenewal(Long userId){
+    
+    public RespDTO<Integer> getUserWaitingRenewal(@RequestBody Long userId){
     	UserRenewals userRenewals = new UserRenewals();
     	userRenewals.setUserId(userId);
     	int userIdSum = userRenewalsFacade.getUserWaitingRenewal(userRenewals);

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

@@ -80,7 +80,7 @@
     <select id="getOrderDetailsByUser" resultType="java.lang.Long">
         SELECT a.product_id FROM diag_order_details a WHERE a.is_deleted ='N' and a.audit_status != 0 and a.user_id = #{userId}
     </select>
-    <select id="getOrderByUserToAudit" resultType="int">
+    <select id="getOrderByUserToAudit" resultType="java.lang.Integer">
         SELECT COUNT(*) FROM diag_order_details a WHERE a.is_deleted ='N' and a.audit_status = 2 and a.user_id = #{userId}
     </select>
 </mapper>

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

@@ -58,7 +58,7 @@
 	  </trim>
 	  WHERE a.renewals_no = #{renewalsNo}
 </update>
-    <select id="getUserWaitingRenewal"  resultType="int">
+    <select id="getUserWaitingRenewal"   resultType="java.lang.Integer">
 	SELECT COUNT(*) FROM diag_user_renewals 
 	WHERE 
 	is_deleted = 'N' 

user-service/src/main/java/com/diagbot/client/DiagbotmanClient.java

@@ -23,9 +23,9 @@ public interface DiagbotmanClient {
 	RespDTO<List<UserAndProdutDTO>> getInformationAvailableAll(@RequestBody List<Long> userIds);
 	
 	@PostMapping(value = "/productOrder/getUserWaitingRenewal")
-	public RespDTO<Integer> getUserWaitingRenewal(Long userId);
+	public RespDTO<Integer> getUserWaitingRenewal(@RequestBody Long userId);
 	
 	@PostMapping(value = "/productOrder/getOrderByUserToAudit")
-	public RespDTO<Integer> getOrderByUserToAudit(Long userId);
+	public RespDTO<Integer> getOrderByUserToAudit(@RequestBody Long userId);
 
 }

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

@@ -954,13 +954,23 @@ public class UserFacade extends UserServiceImpl {
         map.put("gmtModified", DateUtil.now());
         //客户中心-查询用户续费数量
         RespDTO<Integer> renewalSums = diagbotmanClient.getUserWaitingRenewal(baseIdVO.getId());
+        if (renewalSums == null || !"0".equals(renewalSums.code)) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "获取用户续费数量信息失败");
+        }
         int renewalSum = renewalSums.data;
+        System.out.println("========renewalSu====="+renewalSum);
         if(renewalSum>0){
    		 return RespDTO.onError("该用户续费申请单，请先审核");
       	}
         //查询用户是否有待审核的产品数量
         RespDTO<Integer> auditSums = diagbotmanClient.getOrderByUserToAudit(baseIdVO.getId());
+        if (auditSums == null || !"0".equals(auditSums.code)) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "审核的产品数量失败");
+        }
         int auditSum = renewalSums.data;
+        System.out.println("=========auditSumauditSum===="+auditSum);
         if(auditSum>0){
    		 return RespDTO.onError("该用户产品申请单，请先审核");
     	}