Merge branch 'feature-order-fix' into orderChange

api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java

@@ -78,6 +78,25 @@ public class SupCompanyController {
     @PostMapping("/api/pur/addCompany")
     public BaseResponse insertCompany(@RequestBody SupCompanyEntity companyEntity) {
 
+
+        //查询该用户对应的资质证书
+        if(companyEntity.getAuditStatus()==6){
+            FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
+            filterSupCertRequest.setCustomerId(companyEntity.getCustomerId());
+            filterSupCertRequest.setType(ConstantStatus.CERT_COMPANY);
+            List<SupCertEntity> supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest);
+            if(supCertEntityList.size()>0){
+                for (SupCertEntity obj:supCertEntityList){
+                    if (StrUtil.isBlank(obj.getFilePath())){
+                        return ResultVOUtils.error(999,obj.getName()+"未上传资质证书！");
+                    }
+                }
+            }
+        }
+
+
+
+
         String customerId = CustomUtil.getId();     //重新生成customerId
         CustomerContactEntity customerContactEntity = new CustomerContactEntity();
         customerContactEntity.setTel(companyEntity.getTel());
@@ -87,7 +106,7 @@ public class SupCompanyController {
         customerContactEntity.setCustomerId(customerId);
         customerContactService.insertCustomerContact(customerContactEntity);
         //更新相关证书对应的customerId
-        supCertService.updateCustomerId(companyEntity.getCustomerId(), customerId);
+        supCertService.updateCustomerId(companyEntity.getCustomerId(), customerId,ConstantStatus.AUDIT_UN);
         companyEntity.setCustomerId(customerId);
 
         companyEntity.setCreateTime(new Date());

api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCertDao.java

@@ -23,7 +23,7 @@ public interface SupCertDao {
 
     boolean deleteById(String id);
 
-    boolean updateCustomerId(@Param("oldId") String oldId, @Param("newId") String newId);
+    boolean updateCustomerId(@Param("oldId") String oldId, @Param("newId") String newId,@Param("auditStatus") Integer auditStatus);
 
     boolean updateManufacturerId(@Param("oldCustomerId") String oldCustomerId, @Param("newCustomerId") String newCustomerId,
                                  @Param("oldManufacturerIdFk") String oldManufacturerIdFk, @Param("newManufacturerIdFk") String newManufacturerIdFk);

api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCertService.java

@@ -23,7 +23,7 @@ public interface SupCertService {
 
     boolean updateCompanyCert(SupCertEntity supCertEntity);
 
-    boolean updateCustomerId(String oldId, String newId);
+    boolean updateCustomerId(String oldId, String newId,Integer auditStatus);
 
     boolean updateManufacturerId(String oldCustomerId, String newCustomerId, String oldManufacturerIdFk, String newManufacturerIdFk);
 

api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCertServiceImpl.java

@@ -94,8 +94,8 @@ public class SupCertServiceImpl implements SupCertService {
     }
 
     @Override
-    public boolean updateCustomerId(String oldId, String newId) {
+    public boolean updateCustomerId(String oldId, String newId,Integer auditStatus) {
-        return supCertDao.updateCustomerId(oldId, newId);
+        return supCertDao.updateCustomerId(oldId, newId,auditStatus);
     }
 
     @Override

api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml

@@ -88,7 +88,11 @@
     <update id="updateCustomerId" parameterType="Map">
         UPDATE sup_cert
         set customerId = #{newId}
+        <if test="auditStatus != '' and auditStatus!=null">
+            ,auditStatus = #{auditStatus}
+        </if>
         WHERE customerId = #{oldId}
+
     </update>