合并

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

@@ -2,7 +2,10 @@ package com.huiju.estateagents.controller;
 
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaShareRecord;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.service.ITaShareActivityService;
 import com.huiju.estateagents.service.ITaShareRecordService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -10,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * <p>
@@ -27,8 +31,10 @@ public class TaShareRecordController extends BaseController {
 
     @Autowired
     public ITaShareRecordService iTaShareRecordService;
-
-
+    
+    @Autowired
+    private ITaPersonService taPersonService;
+    
     /**
      * 分页拼团成功列表
      * @param pageNum
@@ -185,4 +191,57 @@ public class TaShareRecordController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 微信端分页获取团长记录
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/taShareRecord",method= RequestMethod.GET)
+    public ResponseBean wxShareRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                 HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try {
+            responseBean = iTaShareRecordService.getShareRecordList(pageNum, pageSize, orgId, person);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareRecordList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+    
+    /**
+     * 保存拼团中的对象
+     * @param taShareRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/wx/taShareRecord",method= RequestMethod.POST)
+    public ResponseBean wxShareRecordAdd(@RequestBody TaShareRecord taShareRecord, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try {
+            responseBean = iTaShareRecordService.saveShareRecord(taShareRecord,orgId,person);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -72,6 +73,16 @@ public class HelpRecord implements Serializable {
      * 发起活动助力id
      */
     private Integer helpRecordInitiateId;
-
-
+    
+    @TableField(exist = false)
+    private String activityName;
+    
+    @TableField(exist = false)
+    private String mainImg;
+    
+    @TableField(exist = false)
+    private Integer activityStatus;
+    
+    @TableField(exist = false)
+    private LocalDateTime endDate;
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaShareRecord;
 import com.huiju.estateagents.po.TaShareRecordPO;
 import org.apache.ibatis.annotations.Mapper;
@@ -20,4 +21,6 @@ import java.util.List;
 public interface TaShareRecordMapper extends BaseMapper<TaShareRecord> {
     List<TaShareRecord> recordSuccessList(@Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
     List<TaShareRecordPO> recordFailAndProcessingList(@Param("phone") String phone, @Param("status") Integer status, @Param("orgId") Integer orgId);
+	
+	List<TaShareRecord> getShareRecordList(Page<TaShareRecord> pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaShareRecord;
 
 
@@ -18,4 +19,23 @@ public interface ITaShareRecordService extends IService<TaShareRecord> {
     ResponseBean getFailAndProcessingList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer orgId);
     ResponseBean validateRule(TaShareRecord taShareRecord);
     ResponseBean verifyCode(Integer activityId, String verifyCode);
+	
+	/**
+	 * 分页获取微信端发起拼团记录
+	 * @param pageNum
+	 * @param pageSize
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	ResponseBean getShareRecordList(Integer pageNum, Integer pageSize, Integer orgId, TaPerson person);
+	
+	/**
+	 * 微信端发起我的拼团
+	 * @param taShareRecord
+	 * @param orgId
+	 * @param person
+	 * @return
+	 */
+	ResponseBean saveShareRecord(TaShareRecord taShareRecord, Integer orgId, TaPerson person);
 }

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

@@ -85,13 +85,19 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		//反更新在入库
 		helpActivity.setEnlistNum(helpActivity.getEnlistNum()+1);
 		helpActivityMapper.updateById(helpActivity);
-		helpInitiateRecord.setEnlistNum(helpInitiateRecord.getEnlistNum()+1);
-		helpInitiateRecordMapper.updateById(helpInitiateRecord);
 		//插入数据
 		helpRecord.setOrgId(orgId);
 		helpRecord.setCreateDate(LocalDateTime.now());
 		helpRecord.setPersionId(person.getPersonId());
 		helpRecordMapper.insert(helpRecord);
+		if (helpActivity.getEnlistNum()+1 == helpActivity.getPersionNum()){
+			//发送微信模板消息所有人都发送--todo
+			
+			//生成核销码
+			helpInitiateRecord.setVerification(helpInitiateRecord.getHelpActivityId()+System.currentTimeMillis());
+		}
+		helpInitiateRecord.setEnlistNum(helpInitiateRecord.getEnlistNum()+1);
+		helpInitiateRecordMapper.updateById(helpInitiateRecord);
 		return ResponseBean.success(helpRecord);
 	}
 }

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

@@ -16,6 +16,7 @@ import com.huiju.estateagents.service.ITaShareRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -111,4 +112,55 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
         responseBean.addSuccess("核销成功");
         return responseBean;
     }
+    
+    /**
+     * 分页获取微信端发起拼团记录
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param person
+     * @return
+     */
+    @Override
+    public ResponseBean getShareRecordList(Integer pageNum, Integer pageSize, Integer orgId, TaPerson person) {
+        Page<TaShareRecord> pg = new Page<>(pageNum,pageSize);
+        List<TaShareRecord> list = taShareRecordMapper.getShareRecordList(pg,orgId,person.getPersonId());
+        pg.setRecords(list);
+        return ResponseBean.success(pg);
+    }
+    
+    /**
+     * 微信端发起我的拼团
+     *
+     * @param taShareRecord
+     * @param orgId
+     * @param person
+     * @return
+     */
+    @Override
+    public ResponseBean saveShareRecord(TaShareRecord taShareRecord, Integer orgId, TaPerson person) {
+        TaShareActivity taShareActivity = activityMapper.selectTaShareActivityById(taShareRecord.getGroupActivityId());
+    
+        QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("person_id", taShareRecord.getPersonId());
+        TaShareRecord record = taShareRecordMapper.selectOne(queryWrapper);
+    
+        if (record != null){
+            return ResponseBean.error("您已经发起拼团，请勿再次发起，加入好友的拼团吧",ResponseBean.ERROR_UNAVAILABLE);
+        }
+        if (person.getPoints() == null || person.getPoints() < taShareActivity.getIntegral()){
+            return ResponseBean.error("积分不足",ResponseBean.ERROR_UNAVAILABLE);
+        }
+        //扣取积分,更新参团人数
+        person.setPoints(person.getPoints() - taShareActivity.getIntegral());
+        taPersonMapper.updateById(person);
+        //保存拼团团长数据
+        taShareRecord.setOrgId(orgId);
+        taShareRecord.setPersonId(person.getPersonId());
+        taShareRecord.setCreateTime(LocalDateTime.now());
+        taShareRecord.setStatus(1);
+        taShareRecordMapper.insert(taShareRecord);
+        return ResponseBean.success(taShareRecord);
+    }
 }

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -53,4 +53,19 @@
             and t.phone = #{phone}
         </if> order by t.create_time desc
     </select>
+
+    <select id="getShareRecordList" resultType="com.huiju.estateagents.entity.TaShareRecord">
+        SELECT
+            t.*,
+            a.activity_name,
+            a.main_img,
+            a.activity_status,
+            a.end_time AS end_date
+        FROM
+            ta_share_record t
+            LEFT JOIN ta_share_activity a ON t.group_activity_id = a.group_acticity_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.person_id = #{personId}
+    </select>
 </mapper>