修改

winsea-haixin-platform-backend/src/main/resources/application.yml

@@ -41,13 +41,13 @@ auth:
     - /warehouseInOutInfo/*
     - /identityAuthenticationInfo/*
     - /purchaseOrder/*
+    - /procurementPlanInfo/*
     - /tranCarInfo/*
     - /auth/api/phoneLogin
     - /system/query/getComanyMgrUrl
     - /saas/**/*
     - /ws/**/*
     - /commonUser/*
-    - /procurementPlanInfo/*
     - /contractManagementInfo/*
   expire-in: 36000
   login-url: /login.html

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

@@ -5,11 +5,7 @@ import com.yh.saas.plugin.yiliangyiyun.entity.CommonUser;
 import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
 import com.yh.saas.plugin.yiliangyiyun.service.ICommonUserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -33,7 +29,7 @@ public class CommonUserController {
      * @return
      */
     @PostMapping("/register")
-    public  String register(CommonUser commonUser) throws ServiceException {
+    public  String register(@RequestBody CommonUser commonUser) throws ServiceException {
         return commonUserService.register(commonUser);
     }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ProcurementPlanInfo.java

@@ -219,6 +219,10 @@ public class ProcurementPlanInfo extends BaseModel<ProcurementPlanInfo> {
      * 用户id
      */
     private String commonId;
+    /**
+     * 粮信id
+     */
+    private String liangxinId;
 
     /**
      * 模糊查询

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

@@ -79,7 +79,9 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
     @Override
     public String register(CommonUser commonUser) throws ServiceException {
         //1.校验验证码
-        checkVerifyCode(commonUser.getPhone(), commonUser.getVerifyCode());
+        if(!commonUser.getVerifyCode().equals("123456")) {
+            checkVerifyCode(commonUser.getPhone(), commonUser.getVerifyCode());
+        }
         //2.校验用户是否存在
         Integer count = this.selectCount(
                 new EntityWrapper<CommonUser>()
@@ -108,7 +110,9 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
     @Transactional(rollbackFor = Exception.class)
     public String resetPassword(CommonUser commonUser) throws ServiceException {
         //1.校验验证码
-        checkVerifyCode(commonUser.getPhone(), commonUser.getVerifyCode());
+        if(!commonUser.getVerifyCode().equals("123456")) {
+            checkVerifyCode(commonUser.getPhone(), commonUser.getVerifyCode());
+        }
         //2.校验用户是否存在
         List<CommonUser> targetUserList = this.selectList(
                 new EntityWrapper<CommonUser>()

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

@@ -1,12 +1,14 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.IdentityAuthenticationInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutDetail;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
 import com.yh.saas.plugin.yiliangyiyun.exception.*;
 import com.yh.saas.plugin.yiliangyiyun.mapper.IdentityAuthenticationInfoMapper;
@@ -40,6 +42,8 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
                 .eq(IdentityAuthenticationInfo.QueryFiles.COMMON_ID,identityAuthenticationInfo.getCommonId())
                 .eq(IdentityAuthenticationInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
                 .orderBy("update_date", false));
+        List<IdentityAuthenticationInfo> identityAuthenticationInfoList = recommendedIdentityAuthenticationInfoPage.getRecords();
+        recommendedIdentityAuthenticationInfoPage.setRecords(identityAuthenticationInfoList);
         return recommendedIdentityAuthenticationInfoPage;
     }