feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>xiangsong</artifactId>
-	<version>1.0.50</version>
+	<version>1.0.52</version>
 	<name>xiangsong</name>
 	<description>香颂</description>
 

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.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.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -936,6 +936,7 @@ public class CommConstant {
     public static final String SMS_BIZ_REPAIRE_TICKET = "repaire-ticket";
 
     // 推送消息类型
-    public static final String TP_MESSAGE_BIRTHDAY = "birthday";
-    public static final String TP_MESSAGE_FESTIVAL= "festival";
+    public static final String TP_MESSAGE_BIRTHDAY = "birthday";    // 生日
+    public static final String TP_MESSAGE_FESTIVAL= "festival";     // 节日
+    public static final String TP_MESSAGE_TICKET= "ticket";         // 工单
 }

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

@@ -816,19 +816,14 @@ public class TaPersonController extends BaseController {
                                       @RequestParam(defaultValue = "10") int pageSize,
                                       @RequestParam(value = "name", required = false) String name,
                                       @RequestParam(value = "phone", required = false) String phone,
+                                      @RequestParam(value = "recommended", required = false) String recommended,
                                       HttpServletRequest request) {
         Integer orgId = getOrgId(request);
 
-        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("org_id", orgId);
-        queryWrapper.like(!StringUtils.isEmpty(name),"nickname", "%"+name+"%");
-        queryWrapper.eq(!StringUtils.isEmpty(phone),"phone", phone);
-        queryWrapper.isNotNull("avatarurl");
-        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
-
         IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
+        IPage<TaPerson> result = taPersonService.getPersonBy(page, orgId, name, phone, recommended);
 
-        return ResponseBean.success(taPersonService.page(page, queryWrapper));
+        return ResponseBean.success(result);
     }
 
 }

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

@@ -258,4 +258,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
     List<Map<String, Object>> selectCityPerson(@Param("orgId") Integer orgId);
 
     Integer cancelConsulatant(@Param("personId") String personId);
+
+    IPage<TaPerson> getPersonBy(IPage<TaPerson> page, @Param("orgId") Integer orgId, @Param("name") String name,  @Param("phone") String phone, @Param("recommended") String recommended);
+
 }

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

@@ -11,8 +11,11 @@ import com.google.common.collect.Maps;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.WxUtils;
 import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.entity.TaMpTemplate;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.mapper.TaPersonMapper;
@@ -31,12 +34,15 @@ import com.huiju.estateagents.redpack.mapper.TaMpPersonMapper;
 import com.huiju.estateagents.redpack.service.ITaMpPersonService;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ISysSmsEventService;
+import com.huiju.estateagents.service.ITaMpTemplateService;
+import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.third.entity.TaMpInfo;
 import com.huiju.estateagents.third.service.ITaMpInfoService;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
 import org.apache.commons.lang3.StringUtils;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.BeanUtils;
@@ -105,9 +111,15 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
     @Autowired
     ITaMpPersonService iTaMpPersonService;
 
+    @Autowired
+    ITaPersonService iTaPersonService;
+
     @Autowired
     private IMiniAppService iMiniAppService;
 
+    @Autowired
+    private ITaMpTemplateService iTaMpTemplateService;
+
     @Autowired
     WxUtils wxUtils;
 
@@ -382,7 +394,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         WxMpKefuMessage kefuMessage = WxMpKefuMessage.MINIPROGRAMPAGE().appId(taMiniapp.getMiniappId())
                 .toUser(person.getMpOpenid())
                 .title(taMiniapp.getName() + "有您的订单需要分配!")
-                .pagePath(miniAppTicket + ticket.getId() + "&mpOpenId=" + person.getMpOpenid() )
+                .pagePath(miniAppTicket + ticket.getId())
                 .thumbMediaId(mpInfo.getMiniappMedia())
                 .build();
 
@@ -390,6 +402,35 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
             mpService.getKefuService().sendKefuMessage(kefuMessage);
         } catch (WxErrorException e) {
             e.printStackTrace();
+
+            // 如果客服消息发送失败, 则发送普通模板消息
+            List<TaMpTemplate> mpTemplateList = iTaMpTemplateService.getAvailableList(ticket.getOrgId(), CommConstant.TP_MESSAGE_TICKET);
+            if (null == mpTemplateList || mpTemplateList.size() < 1) {
+                return;
+            }
+            TaMpTemplate mpTemplate = mpTemplateList.get(0);
+
+            try {
+                TaPerson propOwner = iTaPersonService.getById(ticket.getPersonId());
+                String message = String.format("业主电话: %s ; 报修内容: %s", propOwner.getPhone(), ticket.getTicketTitle());
+                String remark = String.format("请及时进入【%s】小程序进行处理", taMiniapp.getName());
+
+                WxUtils.sendTemplateMessage(mpService,
+                        person.getMpOpenid(),
+                        mpTemplate.getTemplateCode(),
+                        null,
+                        new ArrayList<WxMpTemplateData>(){{
+                            add(new WxMpTemplateData("first", "工单提醒"));
+                            add(new WxMpTemplateData("keyword1", "您有一个新的工单"));
+                            add(new WxMpTemplateData("keyword2", DateUtils.today()));
+                            add(new WxMpTemplateData("keyword3", message));
+                            add(new WxMpTemplateData("remark", remark));
+                        }}
+                );
+            } catch (Exception e2) {
+                e2.printStackTrace();
+            }
+
         }
     }
 

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

@@ -118,4 +118,6 @@ public interface ITaPersonService extends IService<TaPerson> {
                    TaCustomerFrom customerFrom) throws Exception;
 
     ResponseBean updateUserPhoto(String photoUrl, String openId);
+
+    IPage<TaPerson> getPersonBy(IPage<TaPerson> page, Integer orgId, String name, String phone, String recommended);
 }

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

@@ -950,6 +950,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         if (userList.size() > 0){
             TaUser taUser = userList.get(0);
             person.setPersonType(taUser.getType());
+            person.setUserId(taUser.getUserId());
         }
         updateById(person);
 
@@ -1322,4 +1323,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         responseBean.addSuccess("修改成功");
         return responseBean;
     }
+
+    @Override
+    public IPage<TaPerson> getPersonBy(IPage<TaPerson> page, Integer orgId, String name, String phone, String recommended) {
+        return taPersonMapper.getPersonBy(page, orgId, name, phone, recommended);
+    }
 }

src/main/resources/application.yml

@@ -14,7 +14,7 @@ sms-service:
 wx:
   miniapp:
     index: /pages/ShouYe/index
-    ticket: pages/WuYe/BaoXiuDetail/index?id=
+    ticket: /pages/WuYe/BaoXiuDetail/index?id=
   mp:
     festivalH5: https://xs.njyunzhi.com/jierih5.html
     birthdayH5: https://xs.njyunzhi.com/shengrih5.html

src/main/resources/mapper/TaPersonMapper.xml

@@ -639,6 +639,30 @@ FROM
             INNER JOIN td_city b ON b.citycode = a.citycode
             AND b.leveltype = 2
     </select>
+    <select id="getPersonBy" resultType="com.huiju.estateagents.entity.TaPerson">
+        SELECT
+            t.*,
+            s.nickname AS share_person_name
+        FROM
+            ta_person t
+            LEFT JOIN ta_person s ON s.org_id = t.org_id
+            AND t.recommend_person = s.person_id
+        WHERE
+            t.org_id = #{orgId}
+        <if test="name != null and '' != name">
+            AND t.nickname LIKE CONCAT( '%', #{name}, '%' )
+        </if>
+        <if test="phone != null and '' != phone">
+            AND t.phone = 123
+        </if>
+        <if test="recommended != null and '' != recommended">
+            AND s.nickname LIKE CONCAT( '%', #{recommended}, '%' )
+        </if>
+            AND IFNULL( t.avatarurl, '' ) > ''
+            AND t.`status` > - 1
+        ORDER BY
+            t.create_date
+    </select>
 
     <insert id="savePersonPosition" parameterType="com.huiju.estateagents.entity.TaPersonPositon">
         insert into ta_person_position