Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserAuthMenuController.java

@@ -49,7 +49,7 @@ public class TaUserAuthMenuController extends BaseController {
     @RequestMapping(value="/admin/menuList",method= RequestMethod.GET)
     public ResponseBean getMenuByRole(@RequestParam("pageNum")Integer pageNum,
                                       @RequestParam("pageSize")Integer pageSize, HttpServletRequest request){
-        return iTaUserAuthMenuService.getAllMenu(pageNum, pageSize, getOrgId(request));
+        return iTaUserAuthMenuService.getAllMenu(pageNum, pageSize, getOrgId(request), null);
     }
 
     /**

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -299,7 +299,7 @@ public class TaUserController extends BaseController {
             taUser.setLoginPassword("");
 
             //获取所有菜单
-            List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null,taUser.getOrgId()).getData();
+            List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null,taUser.getOrgId(), roles).getData();
             List<SysButtonInMenu> allButtons = (List<SysButtonInMenu>) iTaUserAuthButtonService.getAllButton(null, null).getData();
 
             userMap.put("taUser", taUser);

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -220,4 +220,10 @@ public class TaUser implements Serializable {
      */
     @TableField(exist = false)
     private String confirmPassword;
+
+    /**
+     * 置业顾问的personid
+     */
+    @TableField(exist = false)
+    private String consultantPersonId;
 }

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserAuthMenuService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.SysButtonInMenu;
 import com.huiju.estateagents.entity.SysMenu;
+import com.huiju.estateagents.entity.TaRole;
 
 import java.util.List;
 
@@ -17,7 +18,7 @@ public interface ITaUserAuthMenuService extends IService<SysMenu> {
 
     ResponseBean getMenuByUserId(Integer pageNum, Integer pageSize, String userId, Integer orgId);
 
-    ResponseBean getAllMenu(Integer pageNum, Integer pageSize, Integer orgId);
+    ResponseBean getAllMenu(Integer pageNum, Integer pageSize, Integer orgId, List<TaRole> roles);
 
     ResponseBean updateUserAuthMenu(Integer userId, List<SysMenu> sysMenuList,String name,Integer orgid,List<SysButtonInMenu> sysButtonInMenuList);
 }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserAuthMenuServiceImpl.java

@@ -9,11 +9,14 @@ import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -78,7 +81,7 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
     }
 
     @Override
-    public ResponseBean getAllMenu(Integer pageNum, Integer pageSize, Integer orgId) {
+    public ResponseBean getAllMenu(Integer pageNum, Integer pageSize, Integer orgId, List<TaRole> userRoles) {
         List<SysMenu> records = new ArrayList<>();
         List<SysMenu> menuList = taUserAuthMenuMapper.sysMenuListByRoleId();
         records.addAll(menuList);
@@ -90,13 +93,14 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
         sysAdvancedConfigRelationQueryWrapper.eq("target_type",CommConstant.ADVANCED_TYPE_MENU);
         sysAdvancedConfigRelationQueryWrapper.notIn(taAdvancedControllerList.size() > 0,"advanced_config_id",taAdvancedControllerList.stream().map(TaAdvancedController::getAdvancedConfigId).collect(Collectors.toList()));
         List<SysAdvancedConfigRelation> sysAdvancedConfigRelations = sysAdvancedConfigRelationMapper.selectList(sysAdvancedConfigRelationQueryWrapper);
-        menuList.forEach(e -> {
-            sysAdvancedConfigRelations.forEach(s -> {
-                if (e.getMenuId() == Integer.valueOf(s.getTargetId())){
-                    records.remove(e);
-                }
-            });
-        });
+
+        List<TaRoleMenu> configRelationRoleMenuList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(userRoles) && CollectionUtils.isNotEmpty(sysAdvancedConfigRelations)){
+            QueryWrapper<TaRoleMenu> taRoleMenuQueryWrapper = new QueryWrapper<>();
+            taRoleMenuQueryWrapper.in("role_id", userRoles.stream().map(TaRole::getRoleId).collect(Collectors.toList()));
+            taRoleMenuQueryWrapper.in("menu_id", sysAdvancedConfigRelations.stream().map(SysAdvancedConfigRelation::getTargetId).collect(Collectors.toList()));
+            configRelationRoleMenuList = taRoleMenuMapper.selectList(taRoleMenuQueryWrapper);
+        }
 
         QueryWrapper<TaRoleMenu> queryWrapper = new QueryWrapper();
         List<TaRoleMenu> taRoleMenus = taRoleMenuMapper.selectList(queryWrapper);
@@ -108,6 +112,11 @@ public class TaUserAuthMenuServiceImpl extends ServiceImpl<TaUserAuthMenuMapper,
                     roles.add(taRoleMenu.getRoleId());
                 }
             }
+            for (TaRoleMenu taRoleMenu : configRelationRoleMenuList){
+                if (sysMenu.getMenuId().equals(taRoleMenu.getMenuId())){
+                    roles.remove(taRoleMenu.getRoleId());
+                }
+            }
             sysMenu.setRoles(roles);
         }
 

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

@@ -8,9 +8,11 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.SysAdvancedConfig;
 import com.huiju.estateagents.entity.TaAdvancedController;
+import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaWxPayConfig;
 import com.huiju.estateagents.service.ISysAdvancedConfigService;
 import com.huiju.estateagents.service.ITaAdvancedControllerService;
+import com.huiju.estateagents.service.ITaMiniappService;
 import com.huiju.estateagents.service.ITaWxPayConfigService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,6 +47,8 @@ public class SysAdvancedConfigController extends BaseController {
     @Autowired
     public ITaAdvancedControllerService taAdvancedControllerService;
 
+    @Autowired
+    public ITaMiniappService taMiniappService;
     /**
      * 分页查询列表
      * @param pageNum
@@ -203,6 +207,10 @@ public class SysAdvancedConfigController extends BaseController {
                 });
             }
             if (null != wxPayData){
+                TaMiniapp taMiniapp = taMiniappService.getOne(new QueryWrapper<TaMiniapp>().eq("org_id", orgId));
+                if (!taMiniapp.getMiniappId().equals(wxPayData.get("appid"))){
+                    return ResponseBean.error("appid不一致", ResponseBean.ERROR_UNAVAILABLE);
+                }
                 //维护支付信息先删除后添加
                 taWxPayConfigService.remove(new QueryWrapper<TaWxPayConfig>().eq("org_id",orgId));
                 TaWxPayConfig taWxPayConfig = new TaWxPayConfig();

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

@@ -236,13 +236,13 @@ 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) Integer raiseRecordId,
                                         @RequestParam(required = false) String personId,
                                         HttpServletRequest request) {
-        TaRaise taRaise = iTaRaiseService.getRaiseProfile(raiseId, salesBatchId, personId);
+        TaRaise taRaise = iTaRaiseService.getRaiseProfile(raiseId, raiseRecordId, salesBatchId, personId);
         return ResponseBean.success(taRaise);
     }
 

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

@@ -9,6 +9,8 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.bo.request.HousingRaiseRequestBO;
 import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
 import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
 import com.huiju.estateagents.entity.*;
@@ -60,6 +62,15 @@ public class TaRaiseRecordController extends BaseController {
     @Autowired
     public ITaRaiseService taRaiseService;
 
+    @Autowired
+    public ITaBuildingApartmentService taBuildingApartmentService;
+
+    @Autowired
+    public ITaUserService taUserService;
+
+    @Autowired
+    public ITaPersonService taPersonService;
+
     /**
      * 条件查询房源认筹记录
      *
@@ -485,7 +496,18 @@ public class TaRaiseRecordController extends BaseController {
 
             //认筹表数据
             TaRaise taRaise = taRaiseService.getById(taRaiseRecord.getRaiseId());
-            taRaise.setRaisePrice(taRaise.getRaisePrice()/100);
+            taRaise.setRaisePrice(taRaise.getRaisePrice());
+            //置业顾问信息
+            TaUser consultantInfo = taUserService.getById(taRaiseRecord.getUserId());
+            if (null != consultantInfo){
+                //职业顾问信息
+                TaPerson consultantPerson = taPersonService.getOne(new QueryWrapper<TaPerson>().eq("user_id", taRaiseRecord.getUserId()));
+                if (null != consultantPerson){
+                    consultantInfo.setConsultantPersonId(consultantPerson.getPersonId());
+                }
+            }
+
+            taRaiseRecord.setConsultantInfo(consultantInfo);
             //房源与认筹单关系图
             List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", taRaiseRecord.getRaiseRecordId()));
 
@@ -500,16 +522,27 @@ public class TaRaiseRecordController extends BaseController {
                         e.setMineLocked("mine");
                     }
                 });
+
+                //塞入户型信息
+                if (!StringUtils.isEmpty(e.getApartmentId())){
+                    TaBuildingApartment buildingApartment = taBuildingApartmentService.getById(e.getApartmentId());
+                    e.setApartmentName(buildingApartment.getApartmentName());
+                    e.setInsideArea(buildingApartment.getInsideArea());
+                    e.setBuildingArea(buildingApartment.getBuildingArea());
+                }
             });
 
             //订单信息
             TaOrder taOrder = taOrderService.getById(taRaiseRecord.getOrderId());
+            //退费信息
+            TaOrder refundOrder = taOrderService.getOne(new QueryWrapper<TaOrder>().eq("parent_order_id",taOrder.getOrderId()));
 
             Map<String, Object> map = new HashMap<>();
             map.put("taRaiseRecord", taRaiseRecord);
             map.put("taRaiseHouseList", taRaiseHouseList);
             map.put("houseList", houseList);
             map.put("taOrder", taOrder);
+            map.put("refundOrder", refundOrder);
             map.put("taRaise", taRaise);
             responseBean.addSuccess(map);
         } catch (Exception e) {

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

@@ -360,7 +360,7 @@ public class TaSalesBatchController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/taSalesBatch/getBuildingById/{id}", method = RequestMethod.GET)
-    public ResponseBean getBuildingById(@PathVariable("id") Integer id, HttpServletRequest request) {
+    public ResponseBean getBuildingById(@PathVariable("id") String id, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean = iTaSalesBatchService.getBuildingById(id, getOrgId(request));

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

@@ -175,7 +175,7 @@ public class WxPayController extends BaseController {
                                        HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            wxPayService.payRefund(taOrder,getOrgId(request),getUserId(request));
+            wxPayService.payRefund(taOrder,getOrgId(request),getOrgId(request));
         } catch (Exception e) {
             log.error("微信批量退款失败： {}" , e.getMessage());
             responseBean.addError(e.getMessage());

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

@@ -125,6 +125,12 @@ public class TaHousingResources implements Serializable {
     @TableField(exist = false)
     private String apartmentName;
 
+    @TableField(exist = false)
+    private Double insideArea;
+
+    @TableField(exist = false)
+    private Double buildingArea;
+
     /**
      * 状态
      */

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -226,4 +227,10 @@ public class TaRaiseRecord implements Serializable {
      */
     @TableField(exist = false)
     private List<TaBuildingImg> apartMentList = new ArrayList<>();
+
+    /**
+     * 置业顾问信息
+     */
+    @TableField(exist = false)
+    private TaUser consultantInfo;
 }

src/main/java/com/huiju/estateagents/job/JudglActivityTimeJob.java

@@ -54,7 +54,7 @@ public class JudglActivityTimeJob extends BaseController {
     /**
      * 开启定时任务，每天12：30执行
      */
-    @Scheduled(cron = "* 0/5 * * * ?")
+//    @Scheduled(cron = "* 0/5 * * * ?")
     private void configureTasks() {
         String time = DateUtils.cutSecond(LocalDateTime.now());
 

src/main/java/com/huiju/estateagents/mapper/TaSalesBatchMapper.java

@@ -50,6 +50,6 @@ public interface TaSalesBatchMapper extends BaseMapper<TaSalesBatch> {
      * @param orgId
      * @return
      */
-    TaBuilding getBuildingById(@Param("salesBatchId") Integer salesBatchId,
+    List<TaBuilding> getBuildingById(@Param("salesBatchId") String salesBatchId,
                                @Param("orgId") Integer orgId);
 }

src/main/java/com/huiju/estateagents/po/TaHousingResourcesPO.java

@@ -20,10 +20,6 @@ import java.util.List;
 @Accessors(chain = true)
 public class TaHousingResourcesPO extends TaHousingResources {
 
-    private Double insideArea;
-
-    private Double buildingArea;
-
     /**
      * 是否已经预选该房源，true 是 false 否
      */

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

@@ -51,9 +51,10 @@ public interface ITaRaiseService extends IService<TaRaise> {
     /**
      *
      * @param raiseId
+     * @param raiseRecordId
      * @param salesBatchId
      * @param personId
      * @return
      */
-    TaRaise getRaiseProfile(Integer raiseId, Integer salesBatchId, String personId);
+    TaRaise getRaiseProfile(Integer raiseId, Integer raiseRecordId, Integer salesBatchId, String personId);
 }

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

@@ -43,5 +43,5 @@ public interface ITaSalesBatchService extends IService<TaSalesBatch> {
      * @param orgId
      * @return
      */
-    ResponseBean getBuildingById(Integer salesBatchId,Integer orgId);
+    ResponseBean getBuildingById(String salesBatchId,Integer orgId);
 }

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

@@ -101,29 +101,39 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
     }
 
     @Override
-    public TaRaise getRaiseProfile(Integer raiseId, Integer salesBatchId, String personId) {
-        if (raiseId == null && salesBatchId == null) return null;
+    public TaRaise getRaiseProfile(Integer raiseId, Integer raiseRecordId, Integer salesBatchId, String personId) {
+        if (raiseId == null && salesBatchId == null && raiseRecordId == null) return null;
 
-        TaRaise taRaise;
-        if (raiseId != null) {
-            taRaise = this.getById(raiseId);
-        } else {
+        TaRaise taRaise = null;
+        TaRaiseRecord  taRaiseRecord = null;
+
+        // 通过认筹记录ID 或者 批次ID 查询
+        if (raiseId != null || salesBatchId != null) {
             QueryWrapper<TaRaise> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("sales_batch_id", salesBatchId);
+            queryWrapper.eq(raiseId != null,"raise_id", raiseId);
+            queryWrapper.eq(salesBatchId != null,"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)) {
+        // 通过认筹单记录ID 或者人员ID
+        boolean mayPerson = taRaise != null && !StringUtils.isEmpty(personId);
+        if (raiseRecordId != null || mayPerson) {
             QueryWrapper<TaRaiseRecord> wrapper = new QueryWrapper<>();
-            wrapper.eq("raise_id", taRaise.getRaiseId());
-            wrapper.eq("person_id", personId);
+            wrapper.eq(raiseRecordId != null,"raise_record_id", raiseRecordId);
+            wrapper.eq(mayPerson, "raise_id", taRaise.getRaiseId());
+            wrapper.eq(mayPerson,"person_id", personId);
             wrapper.eq("status", CommConstant.STATUS_NORMAL);
             wrapper.last("limit 1");
-            TaRaiseRecord  taRaiseRecord = taRaiseRecordMapper.selectOne(wrapper);
+            taRaiseRecord = taRaiseRecordMapper.selectOne(wrapper);
+
+            if (taRaise == null && taRaiseRecord != null) {
+                taRaise = this.getById(taRaiseRecord.getRaiseId());
+            }
+        }
+
+        if (taRaise != null && taRaiseRecord != null) {
             taRaise.setRecord(taRaiseRecord);
         }
 

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

@@ -197,7 +197,7 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
     }
 
     @Override
-    public ResponseBean getBuildingById(Integer salesBatchId, Integer orgId) {
+    public ResponseBean getBuildingById(String salesBatchId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         responseBean.addSuccess(taSalesBatchMapper.getBuildingById(salesBatchId, orgId));
         return responseBean;

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

@@ -151,6 +151,7 @@ public class WxPayServiceImpl implements IWxPayService {
      */
     @Override
     public void payRefund(TaOrder taOrder, Integer orgId, Integer userId) throws Exception {
+        taOrder.setOrgId(orgId);
         //构建微信配置
         WxConfig config = getWxConfig(taOrder.getOrgId());
         WXPay wxpay = new WXPay(config);
@@ -171,7 +172,7 @@ public class WxPayServiceImpl implements IWxPayService {
         data.put("total_fee", payPrice);
         data.put("refund_fee", payPrice);
         //退款原因
-        data.put("refund_desc", taOrder.getRefundReason());
+        data.put("refund_desc", "钱太少");//taOrder.getRefundReason()
         //回调地址
         data.put("notify_url", payRefund+taOrder.getTargetType());
         Map<String, String> resp = wxpay.refund(data);
@@ -285,6 +286,7 @@ public class WxPayServiceImpl implements IWxPayService {
             taOrder.setPersonId(refundOrder.getPersonId());
             taOrder.setTradeNo(refundOrder.getTradeNo());
             taOrder.setTotalFee(refundOrder.getTotalFee());
+            taOrder.setTransactionId(refundOrder.getTransactionId());
             return String.valueOf(refundOrder.getTotalFee());
         }
         return null;

src/main/resources/mapper/TaPersonMapper.xml

@@ -8,6 +8,7 @@
             t.company,
             t.department,
             t.post,
+            t.user_id as userId,
             t.tel AS phone,
             t.avatarurl AS avatar,
             t.photo,
@@ -135,6 +136,7 @@ FROM
         t.company,
         t.department,
         t.post,
+        t.user_id as userId,
         t.tel AS phone,
         t.avatarurl AS avatar,
         t.photo,