Merge remote-tracking branch 'origin/dev/one' into dev/one

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

@@ -11,6 +11,7 @@ import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.ProductService;
 import com.diagbot.entity.ServiceInfo;
+import com.diagbot.entity.User;
 import com.diagbot.entity.UserRenewals;
 import com.diagbot.enums.AccessTypeEnum;
 import com.diagbot.enums.IsDeleteEnum;
@@ -201,6 +202,11 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
         openedProducts.setCreator(UserUtils.getCurrentPrincipleID());
         openedProducts.setGmtCreate(DateUtil.now());
         openedProducts.setServiceStatus(startAndendByUserIdVO.getServiceStatus());
+         RespDTO<User> userData = userServiceClient.getUserAuthStatus(startAndendByUserIdVO.getUserId());
+         User user = userData.data;
+         if(user==null){
+           	 return RespDTO.onError("该用户已不存在"); 
+            }
         boolean res = startAndendByuserId(openedProducts);
         if (!res) {
             throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);

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

@@ -816,6 +816,10 @@ public class UserFacade extends UserServiceImpl {
         auditMap.put("modifier", UserUtils.getCurrentPrincipleID());
         auditMap.put("gmtModified", DateUtil.now());
         auditMap.put("certificationDate", DateUtil.now());
+        User userDate = getById(userInfoAuditVO.getUserId());
+        if(!userDate.getAuthStatus().equals(2)){
+       	 return RespDTO.onError("该用户已被操作"); 
+        }
         if (ByType == 1) {
             auditMap.put("isReject", RejectEnum.PASS.getKey());
         }
@@ -952,6 +956,10 @@ public class UserFacade extends UserServiceImpl {
         map.put("userId", baseIdVO.getId());
         map.put("modifier", UserUtils.getCurrentPrincipleID());
         map.put("gmtModified", DateUtil.now());
+         User userDate = getById(baseIdVO.getId());
+         if(userDate==null){
+        	 return RespDTO.onError("该用户已不存在"); 
+         }
         //客户中心-查询用户续费数量
         RespDTO<Integer> renewalSums = diagbotmanClient.getUserWaitingRenewal(baseIdVO.getId());
         if (renewalSums == null || !"0".equals(renewalSums.code)) {
@@ -969,7 +977,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("该用户产品申请单，请先审核");
@@ -1390,6 +1398,10 @@ public class UserFacade extends UserServiceImpl {
         amendUserInfo.put("userId", amendUserInfoVO.getUserId());
         amendUserInfo.put("position", amendUserInfoVO.getPosition());
         amendUserInfo.put("linkman", amendUserInfoVO.getLinkman());
+        User userDate = getById(amendUserInfoVO.getUserId());
+        if(userDate==null){
+       	 return RespDTO.onError("该用户已不存在"); 
+        }
         boolean res = updateUserInfo(amendUserInfo);
         if (!res) {
             throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);