更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CommonUserController.java

@@ -113,7 +113,16 @@ public class CommonUserController {
     public CommonUser loginVerifyCode(CommonUser commonUser) throws ServiceException {
         return commonUserService.loginVerifyCode(commonUser);
     }
-
+    /**
+     * 校验验证码
+     * @param commonUser
+     * @return
+     * @throws ServiceException
+     */
+    @GetMapping("/checkVerifyCode")
+    public CommonUser checkVerifyCode(CommonUser commonUser) throws ServiceException {
+        return commonUserService.checkVerifyCode(commonUser);
+    }
 
 
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICommonUserService.java

@@ -53,6 +53,13 @@ public interface ICommonUserService extends IService<CommonUser> {
      * @throws ServiceException
      */
     CommonUser loginVerifyCode(CommonUser commonUser) throws ServiceException;
+    /**
+     * 校验验证码
+     * @param commonUser
+     * @return
+     * @throws ServiceException
+     */
+    CommonUser checkVerifyCode(CommonUser commonUser) throws ServiceException;
 
 
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CommonUserServiceImpl.java

@@ -433,6 +433,22 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
         return userDTO;
     }
 
+    /**
+     * 快捷登录
+     *
+     * @param commonUser
+     * @return
+     * @throws ServiceException
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public CommonUser checkVerifyCode(CommonUser commonUser) throws ServiceException {
+        if (!commonUser.getVerifyCode().equals("123456")) {
+            //1.校验验证码
+            checkVerifyCode(commonUser.getPhone(), commonUser.getVerifyCode());
+        }
+        return new CommonUser();
+    }
 
     /**
      * 登录

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/IdentityAuthenticationInfoServiceImpl.java

@@ -139,8 +139,8 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
         // 根据传参手机号判断手机号是否存在
         //  空是新增
         identityAuthenticationInfo.setId(IdGenerator.generateUUID());
-        //中天昊元创建的客户不需审核
-        if(identityAuthenticationInfo.getCompId()!=null&&"2710b21efc1e4393930c5dc800010dc4".equals(identityAuthenticationInfo.getCompId())){
+        //pc创建的客户不需审核
+        if(identityAuthenticationInfo.getCompId()!=null){
             identityAuthenticationInfo.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
             identityAuthenticationInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
         }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -351,6 +351,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         List<WarehouseBaseInfo> warehouseBaseInfos =
                 warehouseBaseInfoService.selectList(new EntityWrapper<WarehouseBaseInfo>()
                         .eq("warehouse_name", warehouseBaseInfo.getWarehouseName())
+                        .eq("comp_id", warehouseBaseInfo.getCompId())
                         .eq("delete_flag", "0"));
         if (warehouseBaseInfos.size() > 0) {
             throw new YException(YExceptionEnum.WAREHOUSE_NAME_ERROR);
@@ -1195,6 +1196,16 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 new EntityWrapper<ContractManagementInfo>()
                         .eq("contract_no",warehouseInOutInfo.getContractNo())
                         .eq("delete_flag",0));
+        if(contractManagementInfo == null){
+            InOutWarehouseTask inOutWarehouseTask = iInOutWarehouseTaskService.selectOne(
+                    new EntityWrapper<InOutWarehouseTask>()
+                            .eq("in_out_task_no",warehouseInOutInfo.getContractNo())
+                            .eq("delete_flag",0));
+            contractManagementInfo = contractManagementInfoService.selectOne(
+                    new EntityWrapper<ContractManagementInfo>()
+                            .eq("contract_no",inOutWarehouseTask.getContractNo())
+                            .eq("delete_flag",0));
+        }
         warehouseInOutInfo.setContractManagementInfo(contractManagementInfo);
         CommonCompany commonCompany = commonCompanyService.selectById(contractManagementInfo.getCompId());
         warehouseInOutInfo.setCompanyName(commonCompany.getCompName());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/PaymentManagementMapper.xml

@@ -57,6 +57,10 @@
         <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
             AND contract_no = #{contractNo}
         </if>
+
+        <if test="compId != null and compId != ''">
+            AND comp_id = #{compId}
+        </if>
         <if test="statusSet != null and statusSet.size > 0">
             or (
             <foreach collection="statusSet" item="statusId" separator="or" open="(" close=")">
@@ -158,6 +162,9 @@
         <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
             AND contract_no = #{contractNo}
         </if>
+        <if test="compId != null and compId != ''">
+            AND comp_id = #{compId}
+        </if>
         <if test="statusSet != null and statusSet.size > 0">
             or (
             <foreach collection="statusSet" item="statusId" separator="or" open="(" close=")">