Merge branch 'dev' of http://git.ycjcjy.com/liyuanhui/service into dev

src/main/java/com/yunzhi/liyuanhui/controller/TaRecommenderController.java

@@ -7,19 +7,16 @@ import com.yunzhi.liyuanhui.common.BaseController;
 import com.yunzhi.liyuanhui.common.DateUtils;
 import com.yunzhi.liyuanhui.common.ResponseBean;
 import com.yunzhi.liyuanhui.common.StringUtils;
+import com.yunzhi.liyuanhui.entity.TaPerson;
+import com.yunzhi.liyuanhui.enums.StatusEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import com.yunzhi.liyuanhui.service.ITaRecommenderService;
 import com.yunzhi.liyuanhui.entity.TaRecommender;
-import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.Map;
 
@@ -62,7 +59,8 @@ public class TaRecommenderController extends BaseController {
                                           @RequestParam(value ="recName", required = false) String recName,
                                           @RequestParam(value ="recPhone", required = false) String recPhone,
                                           @RequestParam(value ="name", required = false) String name,
-                                          @RequestParam(value ="phone", required = false) String phone
+                                          @RequestParam(value ="phone", required = false) String phone,
+                                          @RequestParam(value ="status", required = false) Integer status
                                           ) throws Exception{
 
         IPage<Map<String, Object>> pg = new Page<>(pageNum, pageSize);
@@ -74,17 +72,40 @@ public class TaRecommenderController extends BaseController {
             endDate += " 23:59:59";
         }
 
-        IPage<Map<String, Object>> result = iTaRecommenderService.getListBy(pg, startDate, endDate, recName, recPhone, name, phone);
+        IPage<Map<String, Object>> result = iTaRecommenderService.getListBy(pg, startDate, endDate, recName, recPhone, name, phone, status);
         return ResponseBean.success(result);
     }
 
+    @GetMapping("/wx/person/{personId}/recommender")
+    public ResponseBean getRecommenderOf(@PathVariable Integer personId,
+                                         @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize
+                                         ) throws Exception {
+
+        IPage<TaRecommender> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaRecommender> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("person_id", personId);
+        queryWrapper.gt("status", StatusEnum.DELETED);
+        queryWrapper.orderByDesc("create_date");
+        return ResponseBean.success(iTaRecommenderService.list(queryWrapper));
+    }
+
     /**
      * 保存对象
      * @param taRecommender 实体对象
      * @return
      */
-    @RequestMapping(value="/taRecommender",method= RequestMethod.POST)
-    public ResponseBean taRecommenderAdd(@RequestBody TaRecommender taRecommender) throws Exception{
+    @RequestMapping(value="/wx/recommender",method= RequestMethod.POST)
+    public ResponseBean taRecommenderAdd(@RequestBody TaRecommender taRecommender, HttpServletRequest request) throws Exception{
+        TaPerson taPerson = getPerson(request);
+        if (null == taPerson) {
+            return ResponseBean.error("获取当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        // 推荐客户状态是未审核
+        taRecommender.setStatus(StatusEnum.READY.getCode());
+        // 设置当前推荐人
+        taRecommender.setPersonId(taPerson.getPersonId());
 
         if (iTaRecommenderService.save(taRecommender)){
             return ResponseBean.success(taRecommender);
@@ -100,7 +121,6 @@ public class TaRecommenderController extends BaseController {
     @ResponseBody
     @RequestMapping(value="/taRecommender/{id}", method= RequestMethod.DELETE)
     public ResponseBean taRecommenderDelete(@PathVariable Integer id) throws Exception{
-
         if(iTaRecommenderService.removeById(id)){
             return ResponseBean.success("success");
         }else {
@@ -114,12 +134,12 @@ public class TaRecommenderController extends BaseController {
      * @param taRecommender 实体对象
      * @return
      */
-    @RequestMapping(value="/taRecommender/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/recommender/{id}",method= RequestMethod.PUT)
     public ResponseBean taRecommenderUpdate(@PathVariable Integer id,
                                         @RequestBody TaRecommender taRecommender) throws Exception{
 
         if (iTaRecommenderService.updateById(taRecommender)){
-            return ResponseBean.success(taRecommender);
+            return ResponseBean.success(iTaRecommenderService.getById(id));
         }else {
             return ResponseBean.error("更新失败", ResponseBean.ERROR_UNAVAILABLE);
         }

src/main/java/com/yunzhi/liyuanhui/enums/StatusEnum.java

@@ -6,6 +6,7 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum StatusEnum implements BaseEnum {
+    READY(0, "待处理"),
     NORMAL(1, "正常"),
     DELETED(-1, "删除");
 

src/main/java/com/yunzhi/liyuanhui/mapper/TaRecommenderMapper.java

@@ -18,5 +18,5 @@ import java.util.Map;
 @Mapper
 public interface TaRecommenderMapper extends BaseMapper<TaRecommender> {
 
-    IPage<Map<String, Object>> getListBy(IPage<Map<String, Object>> pg, String start, String end, String recName, String recPhone, String name, String phone);
+    IPage<Map<String, Object>> getListBy(IPage<Map<String, Object>> pg, String start, String end, String recName, String recPhone, String name, String phone, Integer status);
 }

src/main/java/com/yunzhi/liyuanhui/service/ITaRecommenderService.java

@@ -25,8 +25,9 @@ public interface ITaRecommenderService extends IService<TaRecommender> {
      * @param recPhone 推荐人手机
      * @param name 被推荐人
      * @param phone 被推荐人手机
+     * @param status
      * @return
      * @throws Exception
      */
-    IPage<Map<String, Object>> getListBy(IPage<Map<String, Object>> pg, String start, String end, String recName, String recPhone, String name, String phone) throws Exception;
+    IPage<Map<String, Object>> getListBy(IPage<Map<String, Object>> pg, String start, String end, String recName, String recPhone, String name, String phone, Integer status) throws Exception;
 }

src/main/java/com/yunzhi/liyuanhui/service/impl/TaRecommenderServiceImpl.java

@@ -24,7 +24,7 @@ public class TaRecommenderServiceImpl extends ServiceImpl<TaRecommenderMapper, T
     TaRecommenderMapper taRecommenderMapper;
 
     @Override
-    public IPage<Map<String, Object>> getListBy(IPage<Map<String, Object>> pg, String start, String end, String recName, String recPhone, String name, String phone) throws Exception {
-        return taRecommenderMapper.getListBy(pg, start, end, recName, recPhone, name, phone);
+    public IPage<Map<String, Object>> getListBy(IPage<Map<String, Object>> pg, String start, String end, String recName, String recPhone, String name, String phone, Integer status) throws Exception {
+        return taRecommenderMapper.getListBy(pg, start, end, recName, recPhone, name, phone, status);
     }
 }

src/main/resources/mapper/TaRecommenderMapper.xml

@@ -4,36 +4,35 @@
 
     <select id="getListBy" resultType="java.util.Map">
         SELECT
-            t.person_id,
+            t.*,
             s.`name` AS rec_name,
             s.nickname AS rec_nickname,
-            s.phone AS rec_phone,
-            t.`name`,
-            t.phone,
-            t.sex,
-            t.create_date
+            s.phone AS rec_phone
         FROM
             ta_recommender t
         LEFT JOIN ta_person s ON t.person_id = s.person_id
-        WHERE
-            t.`status` = 1
-        <if test="start!=null and start!=''">
-            AND t.create_date &gt;= STR_TO_DATE(#{start}, '%Y-%m-%d %H:%i:%s')
-        </if>
-        <if test="end!=null and end!=''">
-            AND t.create_date &lt;= STR_TO_DATE(#{end}, '%Y-%m-%d %H:%i:%s')
-        </if>
-        <if test="phone!=null and phone!=''">
-            AND t.phone LIKE CONCAT( '%', #{phone}, '%' )
-        </if>
-        <if test="name!=null and name!=''">
-            AND t.`name` LIKE CONCAT( '%', #{name}, '%' )
-        </if>
-        <if test="recPhone!=null and recPhone!=''">
-            AND s.phone LIKE CONCAT( '%', #{recPhone}, '%' )
-        </if>
-        <if test="recName!=null and recName!=''">
-            AND (s.`name` LIKE CONCAT( '%', #{recName}, '%' ) OR s.nickname LIKE CONCAT( '%', #{recName}, '%' ))
-        </if>
+        <where>
+            <if test="status != null">
+                t.`status` = #{status}
+            </if>
+            <if test="start!=null and start!=''">
+                AND t.create_date &gt;= STR_TO_DATE(#{start}, '%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="end!=null and end!=''">
+                AND t.create_date &lt;= STR_TO_DATE(#{end}, '%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="phone!=null and phone!=''">
+                AND t.phone LIKE CONCAT( '%', #{phone}, '%' )
+            </if>
+            <if test="name!=null and name!=''">
+                AND t.`name` LIKE CONCAT( '%', #{name}, '%' )
+            </if>
+            <if test="recPhone!=null and recPhone!=''">
+                AND s.phone LIKE CONCAT( '%', #{recPhone}, '%' )
+            </if>
+            <if test="recName!=null and recName!=''">
+                AND (s.`name` LIKE CONCAT( '%', #{recName}, '%' ) OR s.nickname LIKE CONCAT( '%', #{recName}, '%' ))
+            </if>
+        </where>
     </select>
 </mapper>