feats

src/main/java/com/huiju/estateagents/controller/TaMiniappThemeController.java

@@ -1,15 +1,20 @@
 package com.huiju.estateagents.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaMiniappOrgIcon;
 import com.huiju.estateagents.entity.TaMiniappTheme;
 import com.huiju.estateagents.service.ITaMiniappThemeService;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 
 @RestController
 @RequestMapping("/api")
@@ -30,21 +35,66 @@ public class TaMiniappThemeController extends BaseController {
         return ResponseBean.success(themeList);
     }
 
+    @GetMapping("/admin/miniapp-theme/{id}")
+    public ResponseBean getThemeById(@PathVariable Integer id) {
+        if (id == null || id == 0) {
+            ResponseBean.error("未找到主题设置", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaMiniappTheme taMiniappTheme = iTaMiniappThemeService.getProfileById(id);
+        if (taMiniappTheme == null) {
+            ResponseBean.error("未找到主题设置", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        return ResponseBean.success(taMiniappTheme);
+    }
+
     @PostMapping("/admin/miniapp-theme")
     public ResponseBean saveTheme(@RequestBody TaMiniappTheme taMiniappTheme, HttpServletRequest request) {
+        return this.editTheme(taMiniappTheme, request);
+    }
+
+    @PutMapping("/admin/miniapp-theme")
+    public ResponseBean updateTheme(@RequestBody TaMiniappTheme taMiniappTheme, HttpServletRequest request) {
+        return this.editTheme(taMiniappTheme, request);
+    }
+
+    private ResponseBean editTheme(TaMiniappTheme taMiniappTheme, HttpServletRequest request) {
         if (taMiniappTheme == null) {
             return ResponseBean.error("非法参数", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
         Integer orgId = getOrgId(request);
+        Integer userId = getUserId(request);
         taMiniappTheme.setOrgId(orgId);
+        taMiniappTheme.setModifyUser(userId);
+        taMiniappTheme.setModifyDate(LocalDateTime.now());
+
+        return iTaMiniappThemeService.editTheme(taMiniappTheme);
+    }
+
+    @DeleteMapping("/admin/miniapp-theme/{themeId}")
+    public ResponseBean deleteTheme(@PathVariable Integer themeId, HttpServletRequest request) {
+        if (themeId == null || themeId <= 0) {
+            return ResponseBean.error("未找到删除内容", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
 
-        Boolean success = iTaMiniappThemeService.save(taMiniappTheme);
-        if (success) {
-            return ResponseBean.success(taMiniappTheme);
-        } else {
-            return ResponseBean.error("保存主题失败", ResponseBean.ERROR_UNAVAILABLE);
+        Integer orgId = getOrgId(request);
+        QueryWrapper<TaMiniappTheme> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("theme_id", themeId);
+        TaMiniappTheme taMiniappTheme = iTaMiniappThemeService.getById(themeId);
+        if (taMiniappTheme == null || taMiniappTheme.getStatus().equals(CommConstant.STATUS_DELETE)) {
+            return ResponseBean.success("");
+        }
+
+        if (!orgId.equals(taMiniappTheme.getOrgId())) {
+            return ResponseBean.error("无权删除该主题", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
+
+        Integer userId = getUserId(request);
+        taMiniappTheme.setModifyUser(userId);
+
+        return iTaMiniappThemeService.deleteTheme(taMiniappTheme);
     }
 
 }

src/main/java/com/huiju/estateagents/controller/TaRaiseController.java

@@ -11,6 +11,7 @@ import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRaise;
 import com.huiju.estateagents.service.ITaRaiseService;
 import com.huiju.estateagents.service.ITdCityService;
+import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -234,4 +235,15 @@ public class TaRaiseController extends BaseController {
         }
         return responseBean;
     }
+
+
+    @GetMapping("/wx/taRaise")
+    public ResponseBean getRaiseProfile(@RequestParam(required = false) Integer salesBatchId,
+                                        @RequestParam(required = false) Integer raiseId,
+                                        @RequestParam(required = false) String personId,
+                                        HttpServletRequest request) {
+        TaRaise taRaise = iTaRaiseService.getRaiseProfile(raiseId, salesBatchId, personId);
+        return ResponseBean.success(taRaise);
+    }
+
 }

src/main/java/com/huiju/estateagents/entity/TaRaise.java

@@ -150,4 +150,10 @@ public class TaRaise implements Serializable {
      */
     @TableField(exist = false)
     private Integer salesNumber;
+
+    /**
+     * 个人认筹单
+     */
+    @TableField(exist = false)
+    private TaRaiseRecord record;
 }

src/main/java/com/huiju/estateagents/service/ITaMiniappThemeService.java

@@ -2,9 +2,16 @@ package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaMiniappTheme;
 
 public interface ITaMiniappThemeService extends IService<TaMiniappTheme> {
 
     IPage<TaMiniappTheme> getThemeList(Integer orgId, Boolean includeNotUsed, Integer pageNum, Integer pageSize);
+
+    ResponseBean editTheme(TaMiniappTheme taMiniappTheme);
+
+    ResponseBean deleteTheme(TaMiniappTheme taMiniappTheme);
+
+    TaMiniappTheme getProfileById(Integer id);
 }

src/main/java/com/huiju/estateagents/service/ITaRaiseService.java

@@ -47,4 +47,13 @@ public interface ITaRaiseService extends IService<TaRaise> {
      * @return
      */
     ResponseBean getRaiseById(Integer id, Integer orgId);
+
+    /**
+     *
+     * @param raiseId
+     * @param salesBatchId
+     * @param personId
+     * @return
+     */
+    TaRaise getRaiseProfile(Integer raiseId, Integer salesBatchId, String personId);
 }

src/main/java/com/huiju/estateagents/service/impl/TaMiniappThemeServiceImpl.java

@@ -1,17 +1,26 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaMiniappOrgIcon;
 import com.huiju.estateagents.entity.TaMiniappTheme;
 import com.huiju.estateagents.mapper.TaMiniappIconMapper;
+import com.huiju.estateagents.mapper.TaMiniappOrgIconMapper;
 import com.huiju.estateagents.mapper.TaMiniappThemeMapper;
 import com.huiju.estateagents.service.ITaMiniappThemeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 
 @Service
 public class TaMiniappThemeServiceImpl extends ServiceImpl<TaMiniappThemeMapper, TaMiniappTheme> implements ITaMiniappThemeService {
@@ -21,6 +30,9 @@ public class TaMiniappThemeServiceImpl extends ServiceImpl<TaMiniappThemeMapper,
     @Autowired
     TaMiniappIconMapper taMiniappIconMapper;
 
+    @Autowired
+    TaMiniappOrgIconMapper taMiniappOrgIconMapper;
+
     @Override
     public IPage<TaMiniappTheme> getThemeList(Integer orgId, Boolean includeNotUsed, Integer pageNum, Integer pageSize) {
         QueryWrapper<TaMiniappTheme> queryTheme = new QueryWrapper<>();
@@ -41,4 +53,129 @@ public class TaMiniappThemeServiceImpl extends ServiceImpl<TaMiniappThemeMapper,
 
         return result;
     }
+
+    @Override
+    public ResponseBean editTheme(TaMiniappTheme taMiniappTheme) {
+        if (taMiniappTheme == null) {
+            return ResponseBean.error("没有需要保存的内容", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (StringUtils.isEmpty(taMiniappTheme.getThemeTitle())) {
+            return ResponseBean.error("主题名称不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (StringUtils.isEmpty(taMiniappTheme.getNaviFrontColor()) || StringUtils.isEmpty(taMiniappTheme.getNaviBackColor())) {
+            return ResponseBean.error("导航栏前景或者背景色不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (StringUtils.isEmpty(taMiniappTheme.getTabbarFrontColor()) || StringUtils.isEmpty(taMiniappTheme.getTabbarBackColor())) {
+            return ResponseBean.error("TabBar前景或者背景色不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (StringUtils.isEmpty(taMiniappTheme.getTabbarSelectColor())) {
+            return ResponseBean.error("TabBar选择色不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (taMiniappTheme.getStatus() == null) {
+            taMiniappTheme.setStatus(CommConstant.STATUS_NORMAL);
+        }
+
+        Integer themeId = taMiniappTheme.getThemeId();
+        if (themeId != null && themeId > 0) {
+            // 先删除所有图标
+            QueryWrapper<TaMiniappOrgIcon> wrapper = new QueryWrapper<>();
+            wrapper.eq("org_id", taMiniappTheme.getOrgId());
+            wrapper.eq("theme_id", themeId);
+
+            taMiniappOrgIconMapper.delete(wrapper);
+        }
+
+        // 先主表
+        if (themeId != null && themeId > 0) {
+            if (!this.updateById(taMiniappTheme)) {
+                return ResponseBean.error("更新主题内容失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+        } else {
+            if (!this.save(taMiniappTheme)) {
+                return ResponseBean.error("保存主题内容失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+        }
+
+        // 再子表
+        List<TaMiniappOrgIcon> iconList = taMiniappTheme.getIconList();
+        Integer orgId = taMiniappTheme.getOrgId();
+        if (iconList != null) {
+            Integer size = iconList.size();
+            LocalDateTime now = LocalDateTime.now();
+            Integer successd = 0;
+
+            for (int i = size - 1; i >= 0; i --) {
+                TaMiniappOrgIcon icon = iconList.get(i);
+                icon.setOrgId(orgId);
+                icon.setThemeId(themeId);
+                icon.setStatus(CommConstant.STATUS_NORMAL);
+                icon.setSort(i + 1);
+                icon.setCreateDate(now);
+                icon.setUpdateDate(now);
+                successd += taMiniappOrgIconMapper.insert(icon);
+            }
+
+            if (!size.equals(successd)) {
+                return ResponseBean.error("保存主题图标内容失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+        }
+
+        return ResponseBean.success(taMiniappTheme);
+    }
+
+    @Override
+    public ResponseBean deleteTheme(TaMiniappTheme taMiniappTheme) {
+        LocalDateTime now = LocalDateTime.now();
+
+        // 先处理子表
+        TaMiniappOrgIcon icon = new TaMiniappOrgIcon();
+        icon.setStatus(CommConstant.STATUS_DELETE);
+        icon.setUpdateDate(now);
+        icon.setOrgId(taMiniappTheme.getOrgId());
+        icon.setThemeId(taMiniappTheme.getThemeId());
+
+        UpdateWrapper<TaMiniappOrgIcon> wrapper = new UpdateWrapper<>();
+        wrapper.set("status", CommConstant.STATUS_DELETE);
+        wrapper.set("update_date", LocalDateTime.now());
+        wrapper.eq("org_id", taMiniappTheme.getOrgId());
+        wrapper.eq("theme_id", taMiniappTheme.getThemeId());
+
+        taMiniappOrgIconMapper.update(icon, wrapper);
+
+        // 再处理主表
+        taMiniappTheme.setStatus(CommConstant.STATUS_DELETE);
+        taMiniappTheme.setModifyDate(now);
+//        taMiniappTheme.setModifyUser();
+
+        if (this.updateById(taMiniappTheme)) {
+            return ResponseBean.success("");
+        } else {
+            return ResponseBean.error("删除主题内容失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    @Override
+    public TaMiniappTheme getProfileById(Integer id) {
+        if (id == null || id < 1) return null;
+
+        TaMiniappTheme taMiniappTheme = this.getById(id);
+        if (taMiniappTheme.getStatus().equals(CommConstant.STATUS_DELETE)) {
+            return null;
+        }
+
+        QueryWrapper<TaMiniappOrgIcon> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", taMiniappTheme.getOrgId());
+        queryWrapper.eq("theme_id", taMiniappTheme.getThemeId());
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        queryWrapper.orderByDesc("sort");
+
+        taMiniappTheme.setIconList(taMiniappOrgIconMapper.selectList(queryWrapper));
+
+        return taMiniappTheme;
+    }
 }

src/main/java/com/huiju/estateagents/service/impl/TaRaiseServiceImpl.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRaise;
 import com.huiju.estateagents.entity.TaRaiseRecord;
@@ -14,6 +16,7 @@ import com.huiju.estateagents.mapper.TaRaiseMapper;
 import com.huiju.estateagents.mapper.TaRaiseRecordMapper;
 import com.huiju.estateagents.service.ITaRaiseService;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.QueueUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -96,4 +99,34 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
         responseBean.addSuccess(taRaiseMapper.getRaiseById(id, orgId));
         return responseBean;
     }
+
+    @Override
+    public TaRaise getRaiseProfile(Integer raiseId, Integer salesBatchId, String personId) {
+        if (raiseId == null && salesBatchId == null) return null;
+
+        TaRaise taRaise;
+        if (raiseId != null) {
+            taRaise = this.getById(raiseId);
+        } else {
+            QueryWrapper<TaRaise> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("sales_batch_id", salesBatchId);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.last(" limit 1");
+            taRaise = this.getOne(queryWrapper);
+        }
+
+        if (taRaise == null) return null;
+
+        if (!StringUtils.isEmpty(personId)) {
+            QueryWrapper<TaRaiseRecord> wrapper = new QueryWrapper<>();
+            wrapper.eq("raise_id", taRaise.getRaiseId());
+            wrapper.eq("person_id", personId);
+            wrapper.eq("status", CommConstant.STATUS_NORMAL);
+            wrapper.last("limit 1");
+            TaRaiseRecord  taRaiseRecord = taRaiseRecordMapper.selectOne(wrapper);
+            taRaise.setRecord(taRaiseRecord);
+        }
+
+        return taRaise;
+    }
 }