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

Merge #146 into master from cc_20260520_declare_goods

Browse Source 
fix:新增获取门店报货信息接口

* cc_20260520_declare_goods: (2 commits squashed)

  - fix:新增根据门店编码列表获取门店报货信息接口

  - fix:新增字段

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

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/146
This commit is contained in:
王非凡
2026-05-21 09:38:59 +00:00
committed by 正新
parent ca54dc5468
commit 3d31c69b5b
12 changed files with 293 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ import com.cool.store.dto.store.StoreAddressDTO;
import com.cool.store.dto.store.StoreExtendSoftOpenDTO;
import com.cool.store.dto.store.StoreOrderTimeDTO;
import com.cool.store.entity.StoreDO;
import com.cool.store.enums.StoreStatusEnum;
import com.cool.store.entity.store.StoreExtendInfoDO;
import com.cool.store.mapper.StoreMapper;
import com.cool.store.response.MiniShopsResponse;
import com.google.common.collect.Lists;
@@ -318,4 +318,15 @@ public class StoreDao {
public void insertOrUpdateOpenReportTime(String storeId, Date openReportTime) {
storeMapper.insertOrUpdateOpenReportTime(storeId, openReportTime);
}
/**
* 门店扩展信息
*/
public Map<String, StoreExtendInfoDO> getExtendInfoMap(List<String> storeIds) {
if (CollectionUtils.isEmpty(storeIds)) {
return Collections.emptyMap();
}
List<StoreExtendInfoDO> list = storeMapper.getExtendInfoByStoreIds(storeIds);
return CollStreamUtil.toMap(list, StoreExtendInfoDO::getStoreId, v -> v);
}
}

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

@@ -5,6 +5,7 @@ import com.cool.store.dto.store.StoreAreaDTO;
import com.cool.store.dto.store.StoreExtendSoftOpenDTO;
import com.cool.store.dto.store.StoreOrderTimeDTO;
import com.cool.store.entity.StoreDO;
import com.cool.store.entity.store.StoreExtendInfoDO;
import com.cool.store.response.MiniShopsResponse;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -193,4 +194,9 @@ public interface StoreMapper {
* 新增或编辑门店开店流程完成时间
*/
void insertOrUpdateOpenReportTime(@Param("storeId") String storeId, @Param("openReportTime") Date openReportTime);
/**
* 门店扩展信息
*/
List<StoreExtendInfoDO> getExtendInfoByStoreIds(@Param("storeIds") List<String> storeIds);
}

11
coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
View File

@@ -51,6 +51,8 @@
<result column="addressee_area" property="addresseeArea" jdbcType="VARCHAR"/>
<result column="addressee_address" property="addresseeAddress" jdbcType="VARCHAR"/>
<result column="branch" property="branch" jdbcType="TINYINT"/>
<result column="declare_goods_type" property="declareGoodsType" jdbcType="TINYINT"/>
<result column="declare_goods_date" property="declareGoodsDate" jdbcType="VARCHAR"/>
</resultMap>
<select id="getByStoreId" resultMap="BaseResultMap">
@@ -493,4 +495,13 @@
ON DUPLICATE KEY UPDATE
open_report_time = VALUES(open_report_time)
</insert>
<select id="getExtendInfoByStoreIds" resultType="com.cool.store.entity.store.StoreExtendInfoDO">
SELECT *
FROM store_extend_info_${enterpriseId}
WHERE store_id IN
<foreach item="item" collection="storeIds" separator="," open="(" close=")">
#{item}
</foreach>
</select>
</mapper>