* bug修复

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

@@ -19,8 +19,8 @@ import java.util.Map;
  * @since 2019-09-11
  */
 public interface ITaUserService extends IService<TaUser> {
-	
-	IPage<Map<String,Object>> getPageList(IPage<TaUser> pg, Integer channelId);
+
+    IPage<Map<String, Object>> getPageList(IPage<TaUser> pg, Integer channelId);
 
     TaUser newUserAndOrg(TaUser taUser, Integer channelId) throws Exception;
 
@@ -31,23 +31,25 @@ public interface ITaUserService extends IService<TaUser> {
     void turnUserOnOrNot(Integer id, boolean isOn, String plat) throws Exception;
 
     void resetPassword(Integer id, String newPass) throws Exception;
-    
+
     List<TaTags> getTagsList(TaUser e);
-    
+
     TaUser addAdminUser(TaUser taUser) throws Exception;
-    
+
     TaUser updateAdminUser(TaUser taUser) throws Exception;
 
     TaUser getAdminByAppID(String appid);
 
     /**
      * 查询所有城市
+     *
      * @return
      */
     ResponseBean cityTree();
 
     /**
      * 员工离职
+     *
      * @param userId
      * @param customerIdList
      * @param consultantUserId 置业顾问的userId
@@ -57,10 +59,20 @@ public interface ITaUserService extends IService<TaUser> {
 
     /**
      * 分页查询用户列表
+     *
      * @param pg
      * @param taUser
      * @param taPersonBuildingListByUserId
      * @return
      */
     IPage<TaUser> seleUserList(IPage pg, TaUser taUser, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 获取用户信息
+     *
+     * @param userId
+     * @param orgId
+     * @return
+     */
+    TaUser getUserInfoById(Integer userId, Integer orgId);
 }

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

@@ -82,9 +82,10 @@ public class TaRaiseHouseController extends BaseController {
             }
 
             Integer orgId = getOrgId(request);
+            Integer userId = getUserId(request);
 
             // 认筹表房源数+1
-            iTaRaiseRecordService.addHouseNum(taRaiseHouse.getRaiseRecordId(), orgId);
+            iTaRaiseRecordService.addHouseNum(taRaiseHouse.getRaiseRecordId(), orgId, userId);
 
             taRaiseHouse.setOrgId(orgId);
             taRaiseHouse.setCreateDate(LocalDateTime.now());

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

@@ -11,6 +11,7 @@ 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.center.taUser.service.impl.TaUserServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
 import com.huiju.estateagents.entity.*;
@@ -162,13 +163,12 @@ public class TaRaiseRecordController extends BaseController {
      * 批量作废
      *
      * @param raiseRecordList
-     * @param invalidReason
      * @return
      */
     @RequestMapping(value = "/admin/batchInvalidRaiseRecord", method = RequestMethod.PUT)
-    public ResponseBean batchInvalidRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList, String invalidReason) {
+    public ResponseBean batchInvalidRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList, HttpServletRequest request) {
 
-        logger.info("TaRaiseRecordController.batchInvalidRaiseRecord 接收参数：list:{},invalidReason:{}", JSONObject.toJSONString(raiseRecordList), invalidReason);
+        logger.info("TaRaiseRecordController.batchInvalidRaiseRecord 接收参数：TaRaiseRecord:{}", JSONObject.toJSONString(raiseRecordList));
 
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -178,8 +178,14 @@ public class TaRaiseRecordController extends BaseController {
                 return responseBean;
             }
 
+            // 获取用户信息
+            TaUser taUser = taUserService.getUserInfoById(getUserId(request), getOrgId(request));
+
             raiseRecordList.getTaRaiseRecords().stream().forEach(record -> {
-                record.setInvalidReason(invalidReason);
+                if (taUser != null) {
+                    record.setUpdateUserName(taUser.getUserName());
+                }
+                record.setInvalidReason(raiseRecordList.getInvalidReason());
                 record.setUpdateDate(LocalDateTime.now());
                 record.setStatus(0);
             });
@@ -203,7 +209,7 @@ public class TaRaiseRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/batchDeleteRaiseRecord", method = RequestMethod.PUT)
-    public ResponseBean batchDeleteRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList) {
+    public ResponseBean batchDeleteRaiseRecord(@RequestBody TaRaiseRecord raiseRecordList, HttpServletRequest request) {
         logger.info("TaRaiseRecordController.batchDeleteRaiseRecord 接收参数：{}", JSONObject.toJSONString(raiseRecordList));
 
         ResponseBean responseBean = new ResponseBean();
@@ -214,7 +220,13 @@ public class TaRaiseRecordController extends BaseController {
                 return responseBean;
             }
 
+            // 获取用户信息
+            TaUser taUser = taUserService.getUserInfoById(getUserId(request), getOrgId(request));
+
             raiseRecordList.getTaRaiseRecords().stream().forEach(record -> {
+                if (taUser != null) {
+                    record.setUpdateUserName(taUser.getUserName());
+                }
                 record.setStatus(CommConstant.STATUS_DELETE);
                 record.setUpdateDate(LocalDateTime.now());
             });
@@ -271,8 +283,14 @@ public class TaRaiseRecordController extends BaseController {
                 }
             }
 
+            // 获取用户信息
+            TaUser taUser = taUserService.getUserInfoById(getUserId(request), orgId);
+
             // 设置缴费状态为已缴费
             raiseRecordList.getTaRaiseRecords().stream().forEach(record -> {
+                if (taUser != null) {
+                    record.setUpdateUserName(taUser.getUserName());
+                }
                 record.setPayStatus(CommConstant.PAY_STATUS_PAID);
                 record.setUpdateDate(LocalDateTime.now());
             });
@@ -335,7 +353,13 @@ public class TaRaiseRecordController extends BaseController {
                 }
             }
 
+            // 获取用户信息
+            TaUser taUser = taUserService.getUserInfoById(getUserId(request), orgId);
+
             raiseRecordList.getTaRaiseRecords().stream().forEach(record -> {
+                if (taUser != null) {
+                    record.setUpdateUserName(taUser.getUserName());
+                }
                 record.setPayStatus(CommConstant.PAY_STATUS_REFUNDED);
                 record.setRefundReason(refundReason);
                 record.setUpdateDate(LocalDateTime.now());
@@ -449,9 +473,9 @@ public class TaRaiseRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/getUserInfo", method = RequestMethod.GET)
-    public ResponseBean getUserInfo(@RequestParam("raiseRecordId")Integer raiseRecordId,
-                                    @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+    public ResponseBean getUserInfo(@RequestParam("raiseRecordId") Integer raiseRecordId,
+                                    @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                     HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -499,10 +523,10 @@ public class TaRaiseRecordController extends BaseController {
             taRaise.setRaisePrice(taRaise.getRaisePrice());
             //置业顾问信息
             TaUser consultantInfo = taUserService.getById(taRaiseRecord.getUserId());
-            if (null != consultantInfo){
+            if (null != consultantInfo) {
                 //职业顾问信息
                 TaPerson consultantPerson = taPersonService.getOne(new QueryWrapper<TaPerson>().eq("user_id", taRaiseRecord.getUserId()));
-                if (null != consultantPerson){
+                if (null != consultantPerson) {
                     consultantInfo.setConsultantPersonId(consultantPerson.getPersonId());
                 }
             }
@@ -524,7 +548,7 @@ public class TaRaiseRecordController extends BaseController {
                 });
 
                 //塞入户型信息
-                if (!StringUtils.isEmpty(e.getApartmentId())){
+                if (!StringUtils.isEmpty(e.getApartmentId())) {
                     TaBuildingApartment buildingApartment = taBuildingApartmentService.getById(e.getApartmentId());
                     e.setApartmentName(buildingApartment.getApartmentName());
                     e.setInsideArea(buildingApartment.getInsideArea());
@@ -535,7 +559,7 @@ public class TaRaiseRecordController extends BaseController {
             //订单信息
             TaOrder taOrder = taOrderService.getById(taRaiseRecord.getOrderId());
             //退费信息
-            TaOrder refundOrder = taOrderService.getOne(new QueryWrapper<TaOrder>().eq("parent_order_id",taOrder.getOrderId()));
+            TaOrder refundOrder = taOrderService.getOne(new QueryWrapper<TaOrder>().eq("parent_order_id", taOrder.getOrderId()));
 
             Map<String, Object> map = new HashMap<>();
             map.put("taRaiseRecord", taRaiseRecord);
@@ -559,21 +583,21 @@ public class TaRaiseRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/taRaiseRecord/list", method = RequestMethod.GET)
-    public ResponseBean wxGetRaiseRecordList( @RequestParam(value = "buildingId", required = false) String buildingId,
-                                              @RequestParam(value = "salesBtchId", required = false) Integer salesBtchId,
-                                              @RequestParam(value = "houseLockingStatus", required = false) String houseLockingStatus,
-                                              @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
-                                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,HttpServletRequest request) {
+    public ResponseBean wxGetRaiseRecordList(@RequestParam(value = "buildingId", required = false) String buildingId,
+                                             @RequestParam(value = "salesBtchId", required = false) Integer salesBtchId,
+                                             @RequestParam(value = "houseLockingStatus", required = false) String houseLockingStatus,
+                                             @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             IPage<TaRaiseRecord> pg = new Page<>(pageNumber, pageSize);
             //获取认筹单列表信息
             QueryWrapper<TaRaiseRecord> taRaiseRecordQueryWrapper = new QueryWrapper<>();
-            taRaiseRecordQueryWrapper.eq("org_id",getOrgId(request));
-            taRaiseRecordQueryWrapper.eq("person_id",getPersonId(request));
-            taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(buildingId),"building_id",buildingId);
-            taRaiseRecordQueryWrapper.eq(null != salesBtchId,"sales_batch_id",salesBtchId);
-            taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(houseLockingStatus),"house_locking_status",houseLockingStatus);
+            taRaiseRecordQueryWrapper.eq("org_id", getOrgId(request));
+            taRaiseRecordQueryWrapper.eq("person_id", getPersonId(request));
+            taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(buildingId), "building_id", buildingId);
+            taRaiseRecordQueryWrapper.eq(null != salesBtchId, "sales_batch_id", salesBtchId);
+            taRaiseRecordQueryWrapper.eq(StringUtils.isNotEmpty(houseLockingStatus), "house_locking_status", houseLockingStatus);
             IPage<TaRaiseRecord> page = iTaRaiseRecordService.page(pg, taRaiseRecordQueryWrapper);
             List<TaRaiseRecord> list = page.getRecords();
             list.forEach(e -> {

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

@@ -74,8 +74,10 @@ public interface TaRaiseRecordMapper extends BaseMapper<TaRaiseRecord> {
      *
      * @param raiseRecordId
      * @param orgId
+     * @param updateUserName
      * @return
      */
     Boolean addHouseNum(@Param("raiseRecordId") Integer raiseRecordId,
-                        @Param("orgId") Integer orgId);
+                        @Param("orgId") Integer orgId,
+                        @Param("updateUserName") String updateUserName);
 }

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

@@ -79,5 +79,5 @@ public interface ITaRaiseRecordService extends IService<TaRaiseRecord> {
      * @param orgId
      * @return
      */
-    Boolean addHouseNum(Integer raiseRecordId, Integer orgId);
+    Boolean addHouseNum(Integer raiseRecordId, Integer orgId, Integer userId);
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,10 +9,13 @@ 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.impl.TaUserServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.ITaRaiseRecordService;
+import com.huiju.estateagents.service.ITaUvService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +55,9 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
     @Autowired
     private TaRaiseHouseMapper taRaiseHouseMapper;
 
+    @Autowired
+    private TaUserServiceImpl taUserService;
+
     @Override
     public ResponseBean listHousingRaiseByCondition(HousingRaiseRequestBO requestBO, Integer pageNumber, Integer pageSize) {
         logger.info("TaRaiseRecordServiceImpl.listRaiseRecordByCondition 接收参数：bo:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(requestBO), pageNumber, pageSize);
@@ -125,8 +132,19 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
     }
 
     @Override
-    public Boolean addHouseNum(Integer raiseRecordId, Integer orgId) {
-        return taRaiseRecordMapper.addHouseNum(raiseRecordId, orgId);
+    public Boolean addHouseNum(Integer raiseRecordId, Integer orgId, Integer userId) {
+
+        String updateUser = "";
+
+        // 获取用户信息
+        QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
+        userQueryWrapper.eq("user_id", userId);
+        userQueryWrapper.ne("status", -1);
+        TaUser taUser = taUserService.getOne(userQueryWrapper);
+        if (taUser != null) {
+            updateUser = taUser.getUserName();
+        }
+        return taRaiseRecordMapper.addHouseNum(raiseRecordId, orgId, updateUser);
     }
 
     /**

src/main/resources/mapper/TaRaiseRecordMapper.xml

@@ -189,7 +189,9 @@
 
     <update id="addHouseNum">
         UPDATE ta_raise_record t
-         SET t.house_num = IFNULL ( t.house_num, 0 ) + 1
+         SET t.house_num = IFNULL ( t.house_num, 0 ) + 1,
+             t.update_date = now( ),
+             t.update_user_name = #{updateUserName}
         WHERE
             t.raise_record_id = #{raiseRecordId}
             AND t.org_id = #{orgId}