suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:十二分接口逻辑完善

Browse Source
This commit is contained in:
wangff
2025-11-20 14:31:12 +08:00
parent 13c44053c2
commit 4e5c228974
12 changed files with 79 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
coolstore-partner-dao/src/main/java/com/cool/store/dao/tp/TpApplyFormDAO.java
View File

@@ -1,7 +1,6 @@
package com.cool.store.dao.tp;
import cn.hutool.core.collection.CollStreamUtil;
import com.alibaba.excel.util.CollectionUtils;
import com.cool.store.entity.tp.TpApplyFormDO;
import com.cool.store.enums.tp.TpFormStatusEnum;
import com.cool.store.enums.tp.TpFormTypeEnum;
@@ -9,6 +8,7 @@ import com.cool.store.enums.tp.TpPayStatusEnum;
import com.cool.store.mapper.tp.TpApplyFormMapper;
import com.cool.store.request.tp.TpApplyQueryRequest;
import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Repository;
import tk.mybatis.mapper.entity.Example;
@@ -111,10 +111,10 @@ public class TpApplyFormDAO {
* 是否存在待审批的申请单
* @param storeId 门店id
* @param ruleId 规则id
* @param isReward 是否是加分申请
* @param types 单据类型
* @return 是否存在
*/
public boolean existsPendingApply(String storeId, Long ruleId, boolean isReward) {
public boolean existsPendingApply(String storeId, Long ruleId, List<Integer> types) {
Example example = new Example(TpApplyFormDO.class);
Example.Criteria criteria = example.createCriteria()
.andEqualTo("storeId", storeId)
@@ -122,10 +122,8 @@ public class TpApplyFormDAO {
.andEqualTo("status", TpFormStatusEnum.PENDING.getStatus())
.andEqualTo("isDraft", 0)
.andEqualTo("deleted", 0);
if (isReward) {
criteria.andEqualTo("type", TpFormTypeEnum.REWARD.getType());
} else {
criteria.andNotEqualTo("type", TpFormTypeEnum.REWARD.getType());
if (CollectionUtils.isNotEmpty(types)) {
criteria.andIn("type", types);
}
return tpApplyFormMapper.selectCountByExample(example) > 0;
}

3
coolstore-partner-dao/src/main/java/com/cool/store/dao/tp/TpAuditRecordDAO.java
View File

@@ -141,8 +141,9 @@ public class TpAuditRecordDAO {
Example example = new Example(TpAuditRecordDO.class);
example.createCriteria()
.andEqualTo("applyId", applyId)
.andNotEqualTo("auditStatus", 0)
.andEqualTo("deleted", 0);
example.setOrderByClause("createTime ASC");
example.setOrderByClause("create_time ASC");
List<TpAuditRecordDO> recordList = tpAuditRecordMapper.selectByExample(example);
List<AuditInfoResponse> result = new ArrayList<>();
for (TpAuditRecordDO auditRecordDO : recordList) {

2
coolstore-partner-dao/src/main/java/com/cool/store/dao/tp/TpScoreJournalDAO.java
View File

@@ -61,7 +61,7 @@ public class TpScoreJournalDAO {
if (StringUtils.isNotBlank(request.getApplyNo())) {
criteria.andLike("applyNo", "%" + request.getApplyNo() + "%");
}
example.setOrderByClause("createTime DESC");
example.setOrderByClause("create_time DESC");
return tpScoreJournalMapper.selectByExample(example);
}
}

9
coolstore-partner-dao/src/main/resources/mapper/tp/TpApplyFormMapper.xml
View File

@@ -78,17 +78,20 @@
AND a.score = #{score}
</if>
<if test="isPenalty != null and isPenalty">
AND a.type != 0
AND (a.type = 1 OR a.type = 2)
</if>
<if test="storeNameOrNum != null and storeNameOrNum != ''">
AND (b.store_name LIKE CONCAT('%', #{storeNameOrNum}, '%')
OR b.store_num LIKE CONCAT('%', #{storeNameOrNum}, '%')
</if>
<if test="appealReason != null and appealReason != ''">
AND b.appeal_reason LIKE CONCAT('%', #{appealReason}, '%')
AND a.appeal_reason LIKE CONCAT('%', #{appealReason}, '%')
</if>
<if test="isDraft != null">
AND b.is_draft = #{isDraft}
AND a.is_draft = #{isDraft}
</if>
<if test="overdue != null and overdue">
AND a.appeal_end_date &lt; CURRENT_DATE
</if>
</where>
ORDER BY a.create_time DESC