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

Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

Browse Source
This commit is contained in:
苏竹红
2023-06-30 11:10:40 +08:00
parent 06a15fb527 39f48f67cb
commit 5907722cd4
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-common/pom.xml
View File

@@ -106,7 +106,7 @@
<exclusions>
<exclusion>
<groupId>javax.media</groupId>
<artifactId>jai-core</artifactId>
<artifactId>jai_core</artifactId>
</exclusion>
</exclusions>
</dependency>

8
coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml
View File

@@ -43,7 +43,7 @@
<resultMap id="passLetterDetail" type="com.cool.store.vo.PartnerPassLetterDetailVO">
<association property="partnerName" column="partner_id" select="queryPartnerName"></association>
<association property="verifyCity" column="partner_id" select="getVerifyCity"></association>
<association property="verifyCity" column="partner_line_id" select="getVerifyCity"></association>
</resultMap>
<sql id="Base_Column_List">
@@ -317,7 +317,9 @@
<!-- 获取通知函详情 -->
<select id="getPassLetterDetail" resultMap="passLetterDetail">
SELECT auth_code, pass_code, pass_pdf_url, pass_image_url, expiry_date, partner_id
SELECT auth_code, pass_code, pass_pdf_url, pass_image_url,
expiry_date, pass_time as createTime,
partner_id, partner_line_id
FROM hy_partner_interview
WHERE interview_plan_id = #{interviewPlanId} and deleted = 0
</select>
@@ -328,7 +330,7 @@
WHERE id = (
SELECT want_shop_area
FROM hy_partner_intent_info
WHERE partner_id = #{partner_id}
WHERE partner_line_id = #{partner_line_id}
)
</select>
<select id="selectByPrimaryKeySelective" resultType="com.cool.store.entity.HyPartnerInterviewDO">

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ContentServiceImpl.java
View File

@@ -41,7 +41,7 @@ public class ContentServiceImpl implements ContentService {
//增加不允许重复标题的逻辑
Boolean isDuplicated = contentInfoMapper.whetherTitleDuplicated(dto.getContentTitle());
if (isDuplicated) {
throw new ApiException(ErrorCodeEnum.DATA_CONVERT_ERROR);
throw new ApiException(ErrorCodeEnum.CONTENT_DUPLICATED);
}
HyContentInfoDO hyContentInfoDO = new HyContentInfoDO();
BeanUtil.copyProperties(dto, hyContentInfoDO);