bug修复

ch-core/src/main/java/com/wwdz/ch/core/consts/DistributionEnum.java

@@ -61,6 +61,7 @@ public class DistributionEnum {
         BLACK(8, "盲盒"),
         BLACK_COLLECTION(10, "盲袋集合，一个商品对应有多个sku"),
         GIFT(11, "赠品订单"),
+        QIANDAO_GIFT(11, "赠品订单"),
         ;
 
         private int code;

ch-dao/src/main/java/com/wwdz/ch/db/dao/qiandao/QdUserSignInNoteDao.java

@@ -14,4 +14,6 @@ public interface QdUserSignInNoteDao {
     QdUserSignInNote findByNoteId(long noteId);
 
     boolean updateByPrimaryKey(QdUserSignInNote qdUserSignInNote);
+
+    boolean delete(long userId, long taskId);
 }

ch-dao/src/main/java/com/wwdz/ch/db/impl/qiandao/QdUserSignInNoteDaoImpl.java

@@ -11,6 +11,7 @@ import com.xxdxxs.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
+import java.util.Date;
 import java.util.List;
 
 @Repository
@@ -46,6 +47,7 @@ public class QdUserSignInNoteDaoImpl implements QdUserSignInNoteDao {
         QdUserSignInNoteExample example = new QdUserSignInNoteExample();
         QdUserSignInNoteExample.Criteria criteria = example.createCriteria();
         criteria.andIdEqualTo(noteId);
+        criteria.andIsDeletedEqualTo(false);
         return qdUserSignInNoteMapper.selectOneByExample(example);
     }
 
@@ -53,4 +55,17 @@ public class QdUserSignInNoteDaoImpl implements QdUserSignInNoteDao {
     public boolean updateByPrimaryKey(QdUserSignInNote qdUserSignInNote) {
         return qdUserSignInNoteMapper.updateByPrimaryKeySelective(qdUserSignInNote) > 0;
     }
+
+
+    @Override
+    public boolean delete(long userId, long taskId) {
+        QdUserSignInNoteExample example = new QdUserSignInNoteExample();
+        QdUserSignInNoteExample.Criteria criteria = example.createCriteria();
+        criteria.andUserIdEqualTo(userId);
+        criteria.andTaskIdEqualTo(taskId);
+        QdUserSignInNote qdUserSignInNote = new QdUserSignInNote();
+        qdUserSignInNote.setUpdateTime(new Date());
+        qdUserSignInNote.setIsDeleted(true);
+        return qdUserSignInNoteMapper.updateByExampleSelective(qdUserSignInNote, example) > 0;
+    }
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/qiandao/SignInTaskVo.java

@@ -93,7 +93,7 @@ public class SignInTaskVo implements Entity {
     /**
      * 参加的人数
      */
-    private Long joinPeopleNum;
+    private Long joinPeopleNum = 0L;
 
     /**
      * 今天是否签到

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/qiandao/QdUserSignInNoteServiceImpl.java

@@ -51,6 +51,7 @@ public class QdUserSignInNoteServiceImpl implements QdUserSignInNoteService {
             //查询多有动态，查询时剔除指定用户
             if (dto.getOnlySelf() == null || !dto.getOnlySelf()) {
                 dto.setUserId(null);
+                dto.setIsPrivate(false);
             }
             List<QdSignInNoteVo> list = new ArrayList<>();
             List<QdUserSignInNote> qdUserSignInNoteList = qdUserSignInNoteDao.findByPage(dto);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/qiandao/QdUserSignInServiceImpl.java

@@ -227,7 +227,7 @@ public class QdUserSignInServiceImpl implements QdUserSignInService {
             distributionOrder.setReceiverPhone(dto.getReceiverPhone());
             distributionOrder.setCreateTime(new Date());
             distributionOrder.setUpdateTime(new Date());
-            distributionOrder.setType(DistributionEnum.DistributionTypeEnum.GIFT.getCode());
+            distributionOrder.setType(DistributionEnum.DistributionTypeEnum.QIANDAO_GIFT.getCode());
             distributionOrder.setRemark(null);
             distributionOrder.setState(DistributionEnum.DistributionOrderStateEnum.PRE_PAY.getCode());
             distributionOrderDao.insert(distributionOrder);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/qiandao/QdUserSignInTaskServiceImpl.java

@@ -3,6 +3,7 @@ package com.wwdz.ch.wx.impl.qiandao;
 import com.wwdz.ch.core.consts.qiandao.SignInTaskEnum;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dao.qiandao.QdUserSignInDao;
+import com.wwdz.ch.db.dao.qiandao.QdUserSignInNoteDao;
 import com.wwdz.ch.db.dao.qiandao.QdUserSignInTaskDao;
 import com.wwdz.ch.db.dao.qiandao.SignInTaskDao;
 import com.wwdz.ch.db.domain.qiandao.QdUserSignIn;
@@ -39,6 +40,8 @@ public class QdUserSignInTaskServiceImpl implements QdUserSignInTaskService {
     @Autowired
     QdUserSignInTaskDao qdUserSignInTaskDao;
 
+    @Autowired
+    QdUserSignInNoteDao qdUserSignInNoteDao;
 
     @Override
     public Result join(QdUserSignInTaskRequestDto dto) {
@@ -76,6 +79,9 @@ public class QdUserSignInTaskServiceImpl implements QdUserSignInTaskService {
             qdUserSignInRequestDto.setUserId(dto.getUserId());
             qdUserSignInRequestDto.setTaskId(dto.getTaskId());
             qdUserSignInDao.updateInvalid(qdUserSignInRequestDto);
+
+            //删除所有打开笔记
+            qdUserSignInNoteDao.delete(dto.getUserId(), dto.getTaskId());
             return Result.success();
         } catch (Exception e) {
             logger.error("退出签到任务 error:{}", e);
@@ -98,6 +104,8 @@ public class QdUserSignInTaskServiceImpl implements QdUserSignInTaskService {
                 SignInTaskVo signInTaskVo = new SignInTaskVo();
                 SignInTask signInTask = signInTaskDao.findById(qdUserSignInTask.getTaskId());
                 EntityMapper.copyAttribute(signInTask, signInTaskVo);
+                long joinPeopleNum = qdUserSignInTaskDao.countByTaskId(qdUserSignInTask.getTaskId());
+                signInTaskVo.setJoinPeopleNum(joinPeopleNum);
                 QdUserSignIn qdUserSignIn = qdUserSignInDao.findTodayRecord(qdUserSignInTask.getUserId(), qdUserSignInTask.getTaskId());
                 if (qdUserSignIn != null) {
                     signInTaskVo.setIsTodaySignIn(true);