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

Merge #31 into master from cc_2021104_twelve_points

Browse Source 
十二分

* cc_2021104_twelve_points: (34 commits squashed)

  - fix:启用禁用规则合并

  - Merge branch 'refs/heads/master' into cc_2021104_twelve_points

  - fix:惩处规则列表新增描述字段

  - fix:新增用户管辖门店列表接口

  - fix:门店列表接口新增门店积分字段

  - fix:查询问题修复；新增草稿状态

  - fix:申请单审批补充审批人字段

  - fix:修改门店积分限制0-12

  - fix:积分流水接口修复；申请单查询接口添加日期筛选

  - fix:惩处单查询提供惩处待处理、惩处已处理状态筛选

  - fix:惩处单复议申请查询异常修复

  - fix:小程序惩处单详情接口字段补充

  - fix:查询字段补充

  - fix

  - fix:转义

  - fix

  - fix:新增撤销复议申请单接口

  - fix:补充字段

  - fix:补充字段

  - fix:新增门店分数接口

  - fix:申请单新增筛选条件

  - fix:门店积分接口返回参数修改

  - fix:小程序规则分页查询接口改为Post

  - fix:问题修复

  - fix:十二分导入

  - fix:导入状态部分失败改为失败

  - fix:字段补充

  - fix:异步下Excel导入图片临时文件被清理的问题

  - fix:扣分申请导入图片路径修改并使用CDN

  - fix:导入图片上传oss文件类型修改为图片

  - fix:批量审批

  - fix:批量审批新增备注字段

  - fix:字段补充

  - Merge branch 'master' into cc_2021104_twelve_points
    
    # Conflicts:
    #	coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
    #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
    #	coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
    #	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
    #	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
    #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCStoreController.java

Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Reviewed-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/31
This commit is contained in:
王非凡
2026-01-23 06:48:53 +00:00
committed by 正新
parent 1b1684f373
commit 41ae24478d
39 changed files with 998 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
View File

@@ -131,6 +131,19 @@ public class StoreDao {
return score;
}
/**
* 根据门店id查询门店编码
* @param storeIds 门店id列表
* @return store_id -> score
*/
public Map<String, BigDecimal> getScoreByStoreIds(List<String> storeIds) {
if (CollectionUtils.isEmpty(storeIds)) {
return Collections.emptyMap();
}
List<Map<String, Object>> list = storeMapper.getScoreByStoreIds(storeIds);
return CollStreamUtil.toMap(list, v -> MapUtils.getString(v, "storeId"), v -> BigDecimal.valueOf(MapUtils.getDouble(v, "score")));
}
/**
* 根据门店id查询门店映射
* @param storeIds 门店id列表
@@ -211,4 +224,14 @@ public class StoreDao {
);
}
/**
* 根据区域id查询门店列表
* @param regionIds 区域id
* @param keyword 门店名称或门店编码
* @return 门店列表
*/
public List<StoreDO> getStoreByRegionIds(List<String> regionIds, String keyword) {
return storeMapper.getStoreByRegionIds(regionIds, keyword);
}
}

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

@@ -134,7 +134,12 @@ public class TpApplyFormDAO {
* @return 申请单
*/
public TpApplyFormDO getAppealByPenaltyId(Long penaltyId) {
return tpApplyFormMapper.selectOne(TpApplyFormDO.builder().penaltyId(penaltyId).deleted(0).build());
Example example = new Example(TpApplyFormDO.class);
example.createCriteria()
.andEqualTo("penaltyId", penaltyId)
.andEqualTo("deleted", 0)
.andIn("status", Arrays.asList(TpFormStatusEnum.PENDING.getStatus(), TpFormStatusEnum.PASS.getStatus(), TpFormStatusEnum.EFFECTIVE.getStatus()));
return tpApplyFormMapper.selectOneByExample(example);
}
/**

7
coolstore-partner-dao/src/main/java/com/cool/store/dao/tp/TpRuleDAO.java
View File

@@ -61,6 +61,13 @@ public class TpRuleDAO {
return tpRuleMapper.selectByPrimaryKey(id);
}
/**
* 根据规则编码查询启用的规则
*/
public TpRuleDO getEnableByCode(String ruleNo) {
return tpRuleMapper.selectOne(TpRuleDO.builder().ruleNo(ruleNo).status(1).deleted(0).build());
}
public List<TpRuleDO> getEffectiveList(TpRuleQueryRequest request) {
Example example = new Example(TpRuleDO.class);
Example.Criteria criteria = example.createCriteria();

15
coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
View File

@@ -75,6 +75,13 @@ public interface StoreMapper {
*/
BigDecimal getStoreScore(@Param("storeId") String storeId);
/**
* 根据门店id查询门店编码
* @param storeIds 门店id列表
* @return store_id -> score
*/
List<Map<String, Object>> getScoreByStoreIds(@Param("storeIds") List<String> storeIds);
/**
* 更新门店积分
* @param storeId 门店id
@@ -131,4 +138,12 @@ public interface StoreMapper {
@Param("city") String city,
@Param("openStartTime") LocalDate openStartTime,
@Param("openEndTime") LocalDate openEndTime);
/**
* 根据区域id查询门店列表
* @param regionIds 区域id
* @param keyword 门店名称或门店编码
* @return 门店列表
*/
List<StoreDO> getStoreByRegionIds(@Param("regionIds") List<String> regionIds, @Param("keyword") String keyword);
}