调整invw获取openid

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/dto/enter/InvwEnterApplyCodeValidRequestDTO.java

@@ -2,10 +2,8 @@ package cn.com.taiji.invw.dto.enter;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.core.entity.dict.basic.CardType;
-import cn.com.taiji.core.entity.dict.basic.DeviceVersion;
 import cn.com.taiji.core.entity.dict.basic.ObuType;
 import cn.com.taiji.core.entity.dict.invw.InventoryType;
-import cn.com.taiji.core.entity.dict.invw.OwnType;
 import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.com.taiji.invw.model.enter.EnterApplyDetailModel;
 import io.swagger.annotations.ApiModel;
@@ -16,7 +14,6 @@ import org.apache.commons.lang3.StringUtils;
 
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.math.BigInteger;
 import java.util.List;

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/dto/enter/InvwEnterApplyConfirmRequestDTO.java

@@ -1,22 +1,12 @@
 package cn.com.taiji.invw.dto.enter;
 
-import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.core.entity.dict.basic.CardType;
-import cn.com.taiji.core.entity.dict.basic.DeviceVersion;
-import cn.com.taiji.core.entity.dict.basic.ObuType;
-import cn.com.taiji.core.entity.dict.invw.InventoryType;
-import cn.com.taiji.core.entity.dict.invw.OwnType;
 import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
-import cn.com.taiji.invw.model.enter.EnterApplyDetailModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.commons.lang3.StringUtils;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.util.List;
 
 /**
  * @Auther: humh

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/dto/enter/InvwEnterApplyPageRequestDTO.java

@@ -4,7 +4,6 @@ import cn.com.taiji.core.entity.dict.basic.DeviceVersion;
 import cn.com.taiji.core.entity.dict.invw.InvApplyStatus;
 import cn.com.taiji.core.entity.dict.invw.InventoryType;
 import cn.com.taiji.core.dto.AbstractStaffBizPageRequestDTO;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/dto/enter/InvwEnterApplyViewRequestDTO.java

@@ -1,22 +1,10 @@
 package cn.com.taiji.invw.dto.enter;
 
-import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.core.entity.dict.basic.CardType;
-import cn.com.taiji.core.entity.dict.basic.DeviceVersion;
-import cn.com.taiji.core.entity.dict.basic.ObuType;
-import cn.com.taiji.core.entity.dict.invw.InventoryType;
-import cn.com.taiji.core.entity.dict.invw.OwnType;
 import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
-import cn.com.taiji.invw.model.enter.EnterApplyDetailModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.commons.lang3.StringUtils;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.util.List;
 
 /**
  * @Auther: humh

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/AbstractCommManager.java

@@ -3,6 +3,7 @@ package cn.com.taiji.invw.manager;
 import java.io.IOException;
 import java.util.concurrent.Callable;
 
+import cn.com.taiji.core.manager.cache.RedisCacheManager;
 import cn.com.taiji.invw.manager.FieldMsgConvertor;
 import feign.RetryableException;
 import org.apache.http.NoHttpResponseException;
@@ -23,7 +24,7 @@ import cn.com.taiji.core.model.comm.protocol.SignJsonResponse;
 import cn.com.taiji.core.model.comm.protocol.valid.FieldMsgBuilder;
 import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 
-public abstract class AbstractCommManager extends AbstractManager {
+public abstract class AbstractCommManager extends RedisCacheManager {
 
     @Autowired
     protected FeignClientManager feignClientManager;

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/enter/InvwEnterApplyManager.java

@@ -1,6 +1,7 @@
 package cn.com.taiji.invw.manager.enter;
 
 import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.invw.dto.enter.*;
 
@@ -23,7 +24,7 @@ public interface InvwEnterApplyManager {
 
     InvwEnterApplyViewResponseDTO view(InvwEnterApplyViewRequestDTO dto);
 
-    InvwEnterApplyCancelResponseDTO cancel(InvwEnterApplyCancelRequestDTO dto);
+    InvwEnterApplyCancelResponseDTO cancel(InvwEnterApplyCancelRequestDTO dto) throws ServiceHandleException;
 
     InvwEnterApplyCodeValidResponseDTO codeValid(InvwEnterApplyCodeValidRequestDTO dto) throws ManagerException;
 

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/enter/InvwEnterApplyManagerImpl.java

@@ -1,6 +1,7 @@
 package cn.com.taiji.invw.manager.enter;
 
 import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.pub.BeanTools;
 import cn.com.taiji.common.pub.CollectionTools;
@@ -84,7 +85,7 @@ public class InvwEnterApplyManagerImpl extends AbstractInvwManager implements In
         repo.save(enterApply);
         //插入明细表，通过代理对象调用子方法，确保事务拦截器生效（避免同类内部调用绕过代理的问题）
         addInventoryApplyDetail(dto.getEnterApplyDetailModels(), enterApply);
-        persistOperateLog(OperateType.ENTER_APPLY, enterApply.getId(), dto.getOrderSource(), dto.getOpenId(), "入库申请");
+        persistOperateLog(OperateType.ENTER_APPLY, enterApply.getId(), dto.getOrderSource(), findOpenIdByToken(dto.getAccessToken()), "入库申请");
         return new InvwEnterApplyAddResponseDTO(enterApply.getId());
     }
 
@@ -108,7 +109,7 @@ public class InvwEnterApplyManagerImpl extends AbstractInvwManager implements In
         repo.merge(enterApply);
         //插入明细表及检查结果表，通过代理对象调用子方法，确保事务拦截器生效（避免同类内部调用绕过代理的问题）
         updateInventoryApplyDetail(dto.getEnterApplyDetailModels(), enterApply);
-        persistOperateLog(OperateType.UPDATE_ENTER_APPLY, enterApply.getId(), dto.getOrderSource(), dto.getOpenId(), "入库申请修改");
+        persistOperateLog(OperateType.UPDATE_ENTER_APPLY, enterApply.getId(), dto.getOrderSource(), findOpenIdByToken(dto.getAccessToken()), "入库申请修改");
         return new InvwEnterApplyUpdateResponseDTO(enterApply.getId());
     }
 
@@ -126,7 +127,7 @@ public class InvwEnterApplyManagerImpl extends AbstractInvwManager implements In
         enterApply.setSureTime(now);
         enterApply.setApplyStatus(InvApplyStatus.COMFIRE);
         repo.merge(enterApply);
-        persistOperateLog(OperateType.CONFIRM_ENTER_APPLY, enterApply.getId(), dto.getOrderSource(), dto.getOpenId(), "确认入库");
+        persistOperateLog(OperateType.CONFIRM_ENTER_APPLY, enterApply.getId(), dto.getOrderSource(), findOpenIdByToken(dto.getAccessToken()), "确认入库");
         return new InvwEnterApplyConfirmResponseDTO(dto.getId());
     }
 
@@ -139,12 +140,12 @@ public class InvwEnterApplyManagerImpl extends AbstractInvwManager implements In
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public InvwEnterApplyCancelResponseDTO cancel(InvwEnterApplyCancelRequestDTO dto) {
+    public InvwEnterApplyCancelResponseDTO cancel(InvwEnterApplyCancelRequestDTO dto) throws ServiceHandleException {
         InvwEnterApply enterApply = repo.findById(dto.getId()).orElse(null);
         enterApply.setApplyStatus(InvApplyStatus.REJECT);
         enterApply.setReason(dto.getReason());
         repo.merge(enterApply);
-        persistOperateLog(OperateType.CANCEL_ENTER_APPLY, enterApply.getId(), dto.getOrderSource(), dto.getOpenId(), "取消入库");
+        persistOperateLog(OperateType.CANCEL_ENTER_APPLY, enterApply.getId(), dto.getOrderSource(), findOpenIdByToken(dto.getAccessToken()), "取消入库");
         return new InvwEnterApplyCancelResponseDTO(dto.getId());
     }
 

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/reback/InvwRebackManagerImpl.java

@@ -160,7 +160,7 @@ public class InvwRebackManagerImpl extends AbstractCommManager implements InvwRe
         }
         apply.setApplyStatus(InvApplyStatus.COMFIRE);
         apply.setReceiveTime(LocalDateTime.now());
-        apply.setReceiverId(req.getOpenId());
+        apply.setReceiverId(findOpenIdByToken(req.getAccessToken()));
     }
 
 

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/transfer/InvwTransferApplyManagerImpl.java

@@ -163,7 +163,7 @@ public class InvwTransferApplyManagerImpl extends AbstractCommManager implements
             throw new ManagerException("库存更新失败");
         }
 
-        transferApply.setReceiverId(req.getOpenId());
+        transferApply.setReceiverId(findOpenIdByToken(req.getAccessToken()));
         transferApply.setReceiveTime(LocalDateTime.now());
         transferApply.setApplyStatus(InvApplyStatus.COMFIRE);
         transferApplyRepo.saveAndFlush(transferApply);
@@ -208,7 +208,7 @@ public class InvwTransferApplyManagerImpl extends AbstractCommManager implements
         String applyNo = GenerateNoUtil.generateApplyNo();
         transferApply.setApplyNo(applyNo);
         transferApply.setApplyTime(now);
-        transferApply.setOpenId(addReq.getOpenId());
+        transferApply.setOpenId(findOpenIdByToken(addReq.getAccessToken()));
         transferApply.setApplyStatus(InvApplyStatus.NEW);
         transferApply.setInsertTime(now);
 
@@ -246,7 +246,7 @@ public class InvwTransferApplyManagerImpl extends AbstractCommManager implements
             throw new ManagerException("调拨id不能为空");
         }
 
-        transferApply.setOpenId(editReq.getOpenId());
+        transferApply.setOpenId(findOpenIdByToken(editReq.getAccessToken()));
         //设置申请单信息
         setupTransfer(transferApply, transferApplyModel);
         //处理仓库信息