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

Merge remote-tracking branch 'origin/cc_20240605_fix' into cc_20240603_wantarea_bigregion

Browse Source
This commit is contained in:
苏竹红
2024-06-05 20:17:21 +08:00
parent 3f88f78745 7ba6b0d709
commit 31550757b1
4 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-dao/src/main/java/com/cool/store/mapper/SystemBuildingShopMapper.java
View File

@@ -8,4 +8,7 @@ import org.apache.ibatis.annotations.Param;
public interface SystemBuildingShopMapper extends tk.mybatis.mapper.common.Mapper<SystemBuildingShopDO> {
void updateAuditByShopId(@Param("auditId") Long auditId,
@Param("shopId") Long shopId);
SystemBuildingShopDO selectByShopId(@Param("shopId") Long shopId);
}

5
coolstore-partner-dao/src/main/resources/mapper/SystemBuildingShopMapper.xml
View File

@@ -13,5 +13,10 @@
set audit_id = #{auditId}
where shop_id = #{shopId}
</update>
<select id="selectByShopId" resultType="com.cool.store.entity.SystemBuildingShopDO">
select * from xfsg_system_building_shop
where shop_id = #{shopId};
</select>
</mapper>

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
View File

@@ -140,6 +140,10 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
if (Objects.isNull(request.getShopId())) {
throw new ServiceException(ErrorCodeEnum.SHOP_ID_NOT_EXIST);
}
SignFranchiseDO isExist = signFranchiseMapper.selectByShopId(request.getShopId());
if (Objects.nonNull(isExist) && Objects.isNull(request.getId())){
throw new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION);
}
String lockKey = "submitSignFranchise:" + request.getShopId();
//流水
String lockValue = UUID.randomUUID().toString();

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java
View File

@@ -95,6 +95,10 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe
if (Objects.isNull(request)) {
throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
}
SystemBuildingShopDO isExist = systemBuildingShopMapper.selectByShopId(request.getShopId());
if (Objects.nonNull(isExist) && Objects.isNull(request.getId())){
throw new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION);
}
String lockKey = "submitSysBuildStore:" + request.getShopId();
String lockValue = UUID.randomUUID().toString();
boolean acquired = false;