fats

pom.xml

@@ -10,7 +10,11 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>xiangsong</artifactId>
+<<<<<<< HEAD
 	<version>1.0.40</version>
+=======
+	<version>1.0.45</version>
+>>>>>>> 1a20e7d0955d3ae606308f6e4b13d930a8687374
 	<name>xiangsong</name>
 	<description>香颂</description>
 

src/main/java/com/huiju/estateagents/center/taUser/mapper/TpLifeConsultantEvaluateMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.center.taUser.entity.TpLifeConsultantEvaluate;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -16,5 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TpLifeConsultantEvaluateMapper extends BaseMapper<TpLifeConsultantEvaluate> {
 
-    IPage<TpLifeConsultantEvaluate> getPageBy(IPage<TpLifeConsultantEvaluate> pg, Integer orgId, String userId, String evaluateTime);
+    IPage<TpLifeConsultantEvaluate> getPageBy(IPage<TpLifeConsultantEvaluate> pg, @Param("orgId") Integer orgId, @Param("userId") String userId, @Param("evaluateTime") String evaluateTime);
 }

src/main/java/com/huiju/estateagents/common/smsService/Captcha.java

@@ -89,6 +89,11 @@ public class Captcha {
             return false;
         }
 
+        String universalCode = getUniversalCode();
+        if (universalCode.equals(captcha)) {
+            return true;
+        }
+
         if (null == captcha || !captcha.equals(phone.getCaptcha())) {
             return false;
         }
@@ -102,6 +107,14 @@ public class Captcha {
         return !res;
     }
 
+    private String getUniversalCode() {
+        LocalDateTime now = LocalDateTime.now();
+        int month = now.getMonthValue();
+        String monthStr = month > 9 ? String.valueOf(month) : "0" + String.valueOf(month);
+
+        return String.valueOf(now.getYear()) + monthStr;
+    }
+
     /**
      * 辅助方法: 随机生成验证码
      * @param length

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

@@ -423,12 +423,12 @@ public class MiniAppController extends BaseController {
         if (verifyList.contains("1")){
             // 已认证
             verifyStatus = "certified";
-        }else if (verifyList.contains("2")){
-            // 认证未通过
-            verifyStatus = "certification_failed";
         }else if (verifyList.contains("0")){
             // 认证中
             verifyStatus = "certification_in_progress";
+        }else if (verifyList.contains("2")){
+            // 认证未通过
+            verifyStatus = "certification_failed";
         }
         return verifyStatus;
     }

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

@@ -61,6 +61,7 @@ public class TpMessageEventController extends BaseController {
 		    IPage<TpMessageEvent> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TpMessageEvent> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.gt("status", CommConstant.STATUS_DELETE);
             queryWrapper.like(!StringUtils.isEmpty(name), "name", "%"+name+"%");
             queryWrapper.like(!StringUtils.isEmpty(evtType), "evtType", "%"+evtType+"%");
             queryWrapper.orderByAsc("evt_type");
@@ -124,7 +125,7 @@ public class TpMessageEventController extends BaseController {
                                              @ApiParam("更新内容") @RequestBody TpMessageEvent tpMessageEvent,
                                              HttpServletRequest request) throws Exception{
 
-        if (null == tpMessageEvent || tpMessageEvent.getStatus().equals(CommConstant.STATUS_DELETE)) {
+        if (null == tpMessageEvent) {
             return ResponseBean.error("数据不存在", ResponseBean.ERROR_UNAVAILABLE);
         }
 

src/main/java/com/huiju/estateagents/property/controller/BillInvoiceController.java

@@ -95,7 +95,7 @@ public class BillInvoiceController extends BaseController {
     public ResponseBean offlinePayment(HttpServletRequest request, @RequestBody List<Integer> ids) {
         ResponseBean responseBean = new ResponseBean();
 
-        responseBean = iBillInvoiceService.offlinePayment(ids, getPersonId(request));
+        responseBean = iBillInvoiceService.offlinePayment(ids, getUserId(request).toString());
         return responseBean;
     }
 
@@ -163,7 +163,7 @@ public class BillInvoiceController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
         Double payPrice = JSONObject.parseObject(parameter).getDouble("payPrice");
-//        responseBean = iBillInvoiceService.updateBillInvoiceIdPayPrice(billId, PayPriceUtils.yuanConversionPoints(payPrice) , userElement);
+        responseBean = iBillInvoiceService.updateBillInvoiceIdPayPrice(billId, (int) (payPrice * 100 ), userElement);
         return responseBean;
     }
 

src/main/java/com/huiju/estateagents/property/dao/TpRoomNoMapper.java

@@ -29,13 +29,13 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
      * @return
      */
     @ResultType(TpRoomNo.class)
-    @Select("select * from tp_room_no " +
-            "where org_id = #{orgId} " +
-            "and phase_name = #{phaseName} " +
-            "and building_name = #{buildingName} " +
-            "and unit_name = #{unitName} " +
-            "and level_name = #{levelName} " +
-            "and name = #{roomNoName}")
+//    @Select("select * from tp_room_no " +
+//            "where org_id = #{orgId} " +
+//            "and phase_name = #{phaseName} " +
+//            "and building_name = #{buildingName} " +
+//            "and unit_name = #{unitName} " +
+//            "and level_name = #{levelName} " +
+//            "and name = #{roomNoName}")
     TpRoomNo selectCommunityIdAndAddressName(@Param("orgId") Integer orgId, @Param("phaseName") String phaseName, @Param("buildingName") String buildingName, @Param("unitName") String unitName, @Param("levelName") String levelName, @Param("roomNoName") String roomNoName);
 
     /**
@@ -45,7 +45,7 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
      * @return
      */
     @ResultType(TpRoomNo.class)
-    @Select("select * from tp_room_no where org_id = #{orgId} limit #{pageNum},#{pageSize}")
+//    @Select("select * from tp_room_no where org_id = #{orgId} limit #{pageNum},#{pageSize}")
     List<TpRoomNo> selectCommunityIdList(@Param("orgId") Integer orgId, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
 
     /**
@@ -54,15 +54,15 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
      * @return
      */
     @ResultType(Long.class)
-    @Select("select count(1) from tp_room_no where org_id = #{orgId}")
+//    @Select("select count(1) from tp_room_no where org_id = #{orgId}")
     Long selectCommunityIdCount(@Param("orgId") Integer orgId);
 
     @ResultType(TpRoomNo.class)
-    @Select("select * from tp_room_no where org_id=#{orgId} " +
-            "and phase_id=#{phaseId} " +
-            "and building_id=#{buildingId} " +
-            "and unit_id=#{unitId} " +
-            "and level_id=#{levelId}")
+//    @Select("select * from tp_room_no where org_id=#{orgId} " +
+//            "and phase_id=#{phaseId} " +
+//            "and building_id=#{buildingId} " +
+//            "and unit_id=#{unitId} " +
+//            "and level_id=#{levelId}")
     List<TpRoomNo> selectByAddress(Integer orgId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId);
 
 }

src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java

@@ -1129,8 +1129,8 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         bill.setCreateDate(new Date());
         bill.setCreateUser(userId);
         bill.setOrgId(orgId);
-        bill.setPayTotalNum(ticket.getPrice());
-        bill.setUnpayedNum(ticket.getPrice());
+        bill.setPayTotalNum(1);
+        bill.setUnpayedNum(1);
         billMapper.insert(bill);
 
         // 新增缴费单

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

@@ -127,6 +127,9 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
         // 发放积分
         TaPerson person = taPersonMapper.selectById(recommenderId);
+        if (null == person) {
+            return;
+        }
         if (savePoints(person, changeType, changeParams, pointsAmount, orgId)) {
             taPersonMapper.setPointsIncrement(person.getPersonId(), pointsAmount);
         }

src/main/resources/mapper/TpLifeConsultantEvaluateMapper.xml

@@ -10,7 +10,9 @@
         WHERE
             t.org_id = #{orgId}
             AND t.user_id = #{userId}
+        <if test="null != evaluateTime and '' != evaluateTime">
             AND t.evaluate_time = #{evaluateTime}
+        </if>
         ORDER BY t.create_date DESC
     </select>
 </mapper>

src/main/resources/mapper/property/BillInvoiceMapper.xml

@@ -55,7 +55,7 @@
                 AND tpi.status = 1
             </trim>
         </where>
-        order by tpi.create_date DESC
+        order by tpi.id DESC
 
     </select>
 

src/main/resources/mapper/property/TpAnnouncementMapper.xml

@@ -36,9 +36,7 @@
   <update id="updateTpAnnouncement" parameterType="com.huiju.estateagents.property.model.TpAnnouncement" >
     update tp_announcement
     <set >
-      <if test="orgId != null" >
-        org_id = #{orgId,jdbcType=INTEGER},
-      </if>
+        ann_type = #{annType},
       <if test="announcementTitle != null" >
         announcement_title = #{announcementTitle,jdbcType=VARCHAR},
       </if>

src/main/resources/mapper/property/TpRoomNoMapper.xml

@@ -2,4 +2,62 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.property.dao.TpRoomNoMapper">
 
+    <select id="selectCommunityIdList" resultType="com.huiju.estateagents.property.model.TpRoomNo">
+        SELECT
+            t.*
+        FROM
+            tp_room_no t
+            INNER JOIN tp_level s ON s.id = t.level_id
+            INNER JOIN tp_unit m ON m.id = t.unit_id
+            INNER JOIN tp_building n ON n.id = t.building_id
+            INNER JOIN tp_phase q ON q.id = t.phase_id
+        WHERE
+            t.org_id = #{orgId}
+        LIMIT #{pageNum}, #{pageSize}
+    </select>
+    <select id="selectCommunityIdCount" resultType="java.lang.Long">
+        SELECT
+            count(1)
+        FROM
+            tp_room_no t
+            INNER JOIN tp_level s ON s.id = t.level_id
+            INNER JOIN tp_unit m ON m.id = t.unit_id
+            INNER JOIN tp_building n ON n.id = t.building_id
+            INNER JOIN tp_phase q ON q.id = t.phase_id
+        WHERE
+            t.org_id = #{orgId}
+    </select>
+    <select id="selectCommunityIdAndAddressName" resultType="com.huiju.estateagents.property.model.TpRoomNo">
+        SELECT
+            t.*
+        FROM
+            tp_room_no t
+            INNER JOIN tp_level s ON s.id = t.level_id
+            INNER JOIN tp_unit m ON m.id = t.unit_id
+            INNER JOIN tp_building n ON n.id = t.building_id
+            INNER JOIN tp_phase q ON q.id = t.phase_id
+        WHERE
+            t.org_id = #{orgId}
+            AND s.`name` = #{levelName}
+            AND m.`name` = #{unitName}
+            AND n.`name` = #{buildingName}
+            AND q.`name` = #{phaseName}
+            AND t.`name` = #{roomNoName}
+    </select>
+    <select id="selectByAddress" resultType="com.huiju.estateagents.property.model.TpRoomNo">
+        SELECT
+            t.*
+        FROM
+            tp_room_no t
+            INNER JOIN tp_level s ON s.id = t.level_id
+            INNER JOIN tp_unit m ON m.id = t.unit_id
+            INNER JOIN tp_building n ON n.id = t.building_id
+            INNER JOIN tp_phase q ON q.id = t.phase_id
+        WHERE
+            t.org_id = #{orgId}
+            AND s.id = #{levelId}
+            AND m.id = #{unitId}
+            AND n.id = #{buildingId}
+            AND q.id = #{phaseId}
+    </select>
 </mapper>