入住审核

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

@@ -29,6 +29,7 @@ public class SettledCompanyInfoController {
 
     /**
      * 添加入驻公司信息
+     *
      * @param settledCompanyInfo
      * @return
      */
@@ -39,6 +40,7 @@ public class SettledCompanyInfoController {
 
     /**
      * 编辑入住公司信息
+     *
      * @param settledCompanyInfo
      * @return
      */
@@ -49,6 +51,7 @@ public class SettledCompanyInfoController {
 
     /**
      * 列表
+     *
      * @param settledCompanyInfo
      * @return
      */
@@ -59,18 +62,20 @@ public class SettledCompanyInfoController {
 
     /**
      * 查看详情
+     *
      * @param id
      * @return
      */
     @GetMapping("/getSettledCompanyInfo")
-    public SettledCompanyInfo getSettledCompanyInfo(String id){
+    public SettledCompanyInfo getSettledCompanyInfo(String id) {
         return settledCompanyInfoService.getSettledCompanyInfo(id);
     }
 
 
     /**
      * 删除销售计划
-     *  @param settledCompanyInfo
+     *
+     * @param settledCompanyInfo
      * @return
      */
     @PostMapping("/api/deleteSettledCompanyInfo")
@@ -79,5 +84,17 @@ public class SettledCompanyInfoController {
     }
 
 
+    /**
+     * 审核
+     *
+     * @param settledCompanyInfo
+     * @return
+     */
+    @PostMapping("/api/examine")
+    public String examine(@RequestBody SettledCompanyInfo settledCompanyInfo) {
+        return settledCompanyInfoService.examine(settledCompanyInfo);
+
+    }
+
 }
 

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

@@ -141,6 +141,12 @@ public class SettledCompanyInfo extends BaseModel<SettledCompanyInfo> {
     @TableField(exist = false)
     private String searchType;
 
+    /**
+     * 通过1驳回2
+     */
+    @TableField(exist = false)
+    private Integer flag;
+
     /**
      * 模糊查询
      */

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

@@ -17,6 +17,7 @@ public interface ISettledCompanyInfoService extends IService<SettledCompanyInfo>
 
     /**
      * 添加入住公司信息
+     *
      * @param settledCompanyInfo
      * @return
      */
@@ -24,6 +25,7 @@ public interface ISettledCompanyInfoService extends IService<SettledCompanyInfo>
 
     /**
      * 编辑入住公司信息
+     *
      * @param settledCompanyInfo
      * @return
      */
@@ -32,6 +34,7 @@ public interface ISettledCompanyInfoService extends IService<SettledCompanyInfo>
 
     /**
      * 入驻公司列表
+     *
      * @param settledCompanyInfo
      * @return
      */
@@ -39,6 +42,7 @@ public interface ISettledCompanyInfoService extends IService<SettledCompanyInfo>
 
     /**
      * 查看详情
+     *
      * @param id
      * @return
      */
@@ -46,9 +50,19 @@ public interface ISettledCompanyInfoService extends IService<SettledCompanyInfo>
 
     /**
      * 删除
-     *  @param id
+     *
+     * @param id
      * @return
      */
     void deleteSettledCompanyInfo(String id);
 
+
+    /**
+     * 审核
+     *
+     * @param settledCompanyInfo
+     * @return
+     */
+    String examine(SettledCompanyInfo settledCompanyInfo);
+
 }

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

@@ -9,10 +9,12 @@ import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
 import com.yh.saas.plugin.yiliangyiyun.mapper.SettledCompanyInfoMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.ICommonUserService;
 import com.yh.saas.plugin.yiliangyiyun.service.ISettledCompanyContactsService;
 import com.yh.saas.plugin.yiliangyiyun.service.ISettledCompanyErrorService;
 import com.yh.saas.plugin.yiliangyiyun.service.ISettledCompanyInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.yh.saas.plugin.yiliangyiyun.util.GeTuiUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,8 +45,14 @@ public class SettledCompanyInfoServiceImpl extends ServiceImpl<SettledCompanyInf
     @Autowired
     private ISettledCompanyErrorService settledCompanyErrorService;
 
+    @Autowired
+    private GeTuiUtils geTuiUtils;
+    @Autowired
+    private ICommonUserService commonUserService;
+
     /**
      * 添加入住公司信息
+     *
      * @param settledCompanyInfo
      * @return
      */
@@ -56,7 +64,7 @@ public class SettledCompanyInfoServiceImpl extends ServiceImpl<SettledCompanyInf
         settledCompanyInfo.setStatus(StatusEnum.TO_BE_REVIEWED.getName());
         // 联系人处理
         List<SettledCompanyContacts> settledCompanyContactsList = settledCompanyInfo.getSettledCompanyContacts();
-        if(!CollectionUtils.isEmpty(settledCompanyContactsList)){
+        if (!CollectionUtils.isEmpty(settledCompanyContactsList)) {
             settledCompanyContactsList.forEach(settledCompanyContacts -> {
                 settledCompanyContacts.setId(IdGenerator.generateUUID());
                 settledCompanyContacts.setInfoId(settledCompanyInfo.getId());
@@ -69,6 +77,7 @@ public class SettledCompanyInfoServiceImpl extends ServiceImpl<SettledCompanyInf
 
     /**
      * 编辑入住公司信息
+     *
      * @param settledCompanyInfo
      * @return
      */
@@ -79,38 +88,36 @@ public class SettledCompanyInfoServiceImpl extends ServiceImpl<SettledCompanyInf
         this.updateById(settledCompanyInfo);
         // 联系人处理
         List<SettledCompanyContacts> settledCompanyContactsList = settledCompanyContactsService.selectList(new EntityWrapper<SettledCompanyContacts>()
-        .eq("info_id",settledCompanyInfo.getId()));
+                .eq("info_id", settledCompanyInfo.getId()));
         List<String> idList = new ArrayList<>();
-        if(!CollectionUtils.isEmpty(settledCompanyContactsList)){
-             idList = settledCompanyContactsList.stream().map(SettledCompanyContacts::getId).collect(Collectors.toList());
+        if (!CollectionUtils.isEmpty(settledCompanyContactsList)) {
+            idList = settledCompanyContactsList.stream().map(SettledCompanyContacts::getId).collect(Collectors.toList());
         }
         List<SettledCompanyContacts> settledCompanyContactsListNew = settledCompanyInfo.getSettledCompanyContacts();
-        if(!CollectionUtils.isEmpty(settledCompanyContactsListNew)){
-           for(SettledCompanyContacts settledCompanyContacts:settledCompanyContactsListNew){
-               if(StringUtils.isEmpty(settledCompanyContacts.getId())){
-                   settledCompanyContacts.setId(IdGenerator.generateUUID());
-                   settledCompanyContacts.setInfoId(settledCompanyInfo.getId());
-                   settledCompanyContactsService.insert(settledCompanyContacts);
-               }
-               else{
-                   settledCompanyContactsService.updateById(settledCompanyContacts);
-               }
-           }
+        if (!CollectionUtils.isEmpty(settledCompanyContactsListNew)) {
+            for (SettledCompanyContacts settledCompanyContacts : settledCompanyContactsListNew) {
+                if (StringUtils.isEmpty(settledCompanyContacts.getId())) {
+                    settledCompanyContacts.setId(IdGenerator.generateUUID());
+                    settledCompanyContacts.setInfoId(settledCompanyInfo.getId());
+                    settledCompanyContactsService.insert(settledCompanyContacts);
+                } else {
+                    settledCompanyContactsService.updateById(settledCompanyContacts);
+                }
+            }
             List<String> idListNew = settledCompanyContactsListNew.stream().map(SettledCompanyContacts::getId).collect(Collectors.toList());
-            if(!CollectionUtils.isEmpty(idList)){
-                idList.forEach(s ->{
-                    if(!idListNew.contains(s)) {
+            if (!CollectionUtils.isEmpty(idList)) {
+                idList.forEach(s -> {
+                    if (!idListNew.contains(s)) {
                         settledCompanyContactsService.deleteById(s);
                     }
-                } );
+                });
 
             }
-        }
-        else{
-            if(!CollectionUtils.isEmpty(idList)){
-                idList.forEach(s ->{
+        } else {
+            if (!CollectionUtils.isEmpty(idList)) {
+                idList.forEach(s -> {
                     settledCompanyContactsService.deleteById(s);
-                } );
+                });
 
             }
         }
@@ -118,9 +125,9 @@ public class SettledCompanyInfoServiceImpl extends ServiceImpl<SettledCompanyInf
     }
 
 
-
     /**
      * 入驻公司列表
+     *
      * @param settledCompanyInfo
      * @return
      */
@@ -130,16 +137,16 @@ public class SettledCompanyInfoServiceImpl extends ServiceImpl<SettledCompanyInf
         pageView.put("startRecord", (settledCompanyInfo.getCurrentPage() - 1)
                 * settledCompanyInfo.getPageSize());
         //公司id
-        pageView.put("createPhone",settledCompanyInfo.getCreatePhone());
-        pageView.put("mainBusinessType",settledCompanyInfo.getMainBusinessType());
-        pageView.put("searchKeyWord",settledCompanyInfo.getSearchKeyWord());
-        pageView.put("province",settledCompanyInfo.getProvince());
-        pageView.put("city",settledCompanyInfo.getCity());
-        pageView.put("area",settledCompanyInfo.getArea());
-        pageView.put("detailedAddress",settledCompanyInfo.getDetailedAddress());
+        pageView.put("createPhone", settledCompanyInfo.getCreatePhone());
+        pageView.put("mainBusinessType", settledCompanyInfo.getMainBusinessType());
+        pageView.put("searchKeyWord", settledCompanyInfo.getSearchKeyWord());
+        pageView.put("province", settledCompanyInfo.getProvince());
+        pageView.put("city", settledCompanyInfo.getCity());
+        pageView.put("area", settledCompanyInfo.getArea());
+        pageView.put("detailedAddress", settledCompanyInfo.getDetailedAddress());
         pageView.put("searchType", settledCompanyInfo.getSearchType());
-        pageView.put("pageSize",settledCompanyInfo.getPageSize());
-        pageView.put("currentPage",settledCompanyInfo.getCurrentPage());
+        pageView.put("pageSize", settledCompanyInfo.getPageSize());
+        pageView.put("currentPage", settledCompanyInfo.getCurrentPage());
         // 查询总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
         List<SettledCompanyInfo> dataList = baseMapper.getListByCondition(pageView);
@@ -153,6 +160,7 @@ public class SettledCompanyInfoServiceImpl extends ServiceImpl<SettledCompanyInf
 
     /**
      * 查看详情
+     *
      * @param id
      * @return
      */
@@ -162,36 +170,68 @@ public class SettledCompanyInfoServiceImpl extends ServiceImpl<SettledCompanyInf
         SettledCompanyInfo settledCompanyInfo = this.selectById(id);
         // 联系人
         List<SettledCompanyContacts> settledCompanyContactsList = settledCompanyContactsService.selectList(new EntityWrapper<SettledCompanyContacts>()
-                .eq("info_id",settledCompanyInfo.getId()));
+                .eq("info_id", settledCompanyInfo.getId()));
         // 举报
         List<SettledCompanyError> settledCompanyErrors = settledCompanyErrorService.selectList(new EntityWrapper<SettledCompanyError>()
-                .eq("info_id",settledCompanyInfo.getId()));
+                .eq("info_id", settledCompanyInfo.getId()));
         settledCompanyInfo.setSettledCompanyContacts(settledCompanyContactsList);
         settledCompanyInfo.setSettledCompanyErrorList(settledCompanyErrors);
         return settledCompanyInfo;
     }
 
 
-
     /**
      * 删除
-     *  @param id
+     *
+     * @param id
      * @return
      */
     @Override
     public void deleteSettledCompanyInfo(String id) {
         //查询销售计划信息
         SettledCompanyInfo settledCompanyInfo = this.selectById(id);
-        if(settledCompanyInfo != null){
+        if (settledCompanyInfo != null) {
             //删除销售计划信息
             this.deleteById(settledCompanyInfo.getId());
             // 联系人
             boolean result = settledCompanyContactsService.delete(new EntityWrapper<SettledCompanyContacts>()
-                    .eq("info_id",settledCompanyInfo.getId()));
+                    .eq("info_id", settledCompanyInfo.getId()));
             // 举报
             boolean res = settledCompanyErrorService.delete(new EntityWrapper<SettledCompanyError>()
-                    .eq("info_id",settledCompanyInfo.getId()));
+                    .eq("info_id", settledCompanyInfo.getId()));
+        }
+    }
+
+
+    /**
+     * 审核
+     *
+     * @param settledCompanyInfo
+     * @return
+     */
+    @Override
+    public String examine(SettledCompanyInfo settledCompanyInfo) {
+        //查询
+        SettledCompanyInfo settledCompanyInfo1 = this.selectById(settledCompanyInfo.getId());
+        CommonUser commonUser = commonUserService.selectOne(new EntityWrapper<CommonUser>().eq("phone", settledCompanyInfo1.getCreatePhone()));
+        if (settledCompanyInfo1 != null) {
+            //通过
+            if (settledCompanyInfo.getFlag() == 1) {
+                settledCompanyInfo1.setStatusFlag(StatusEnum.ORDER_PASSED.getFlag());
+                settledCompanyInfo1.setStatus(StatusEnum.ORDER_PASSED.getName());
+                geTuiUtils.pushByCid("审核通知", "您的公司入住申请已审核通过", commonUser.getId());
+            }
+            //驳回
+            else {
+                settledCompanyInfo1.setStatusFlag(StatusEnum.ORDER_REJECTED.getFlag());
+                settledCompanyInfo1.setStatus(StatusEnum.ORDER_REJECTED.getName());
+                geTuiUtils.pushByCid("审核通知", "您的公司入住申请已被驳回", commonUser.getId());
+            }
+            //更改销售计划信息
+            this.updateById(settledCompanyInfo1);
+            return "OK";
         }
+        return "NG";
     }