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

feat:域名切换

Browse Source
This commit is contained in:
苏竹红
2025-04-13 20:58:26 +08:00
parent 53b103edda
commit aefc333d5b
7 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopAccountDAO.java
View File

@@ -76,8 +76,8 @@ public class ShopAccountDAO {
* @param status 状态 * @param status 状态
* @return 影响的行数 * @return 影响的行数
*/ */
public int updateStatusByShopIdAndSystemName(Long shopId, List<String> systemNameList, Integer status){ public int updateStatusByShopIdAndSystemName(Long shopId, List<String> systemNameList, Integer status,Date syncTime){
return shopAccountMapper.updateStatusByShopIdAndSystemName(shopId,systemNameList,status); return shopAccountMapper.updateStatusByShopIdAndSystemName(shopId,systemNameList,status,syncTime);
} }
public int updateEntryStatusByShopIdAndSystemName(Long shopId, List<String> systemNameList, Integer status){ public int updateEntryStatusByShopIdAndSystemName(Long shopId, List<String> systemNameList, Integer status){

2
coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAccountMapper.java
View File

@@ -35,7 +35,7 @@ public interface ShopAccountMapper extends Mapper<ShopAccountDO> {
int updateStatusByShopIdAndSystemName( int updateStatusByShopIdAndSystemName(
@Param("shopId") Long shopId, @Param("shopId") Long shopId,
@Param("systemNameList") List<String> systemNameList, @Param("systemNameList") List<String> systemNameList,
@Param("status") Integer status @Param("status") Integer status,Date lastSyncTime
); );
int updateEntryStatusByShopIdAndSystemName( int updateEntryStatusByShopIdAndSystemName(

10
coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml
View File

@@ -75,8 +75,14 @@
<update id="updateStatusByShopIdAndSystemName"> <update id="updateStatusByShopIdAndSystemName">
UPDATE UPDATE
xfsg_shop_account xfsg_shop_account
SET <set>
status = #{status,jdbcType=BIT} <if test="status != null">
status = #{status},
</if>
<if test="syncTime != null">
last_sync_time = #{syncTime},
</if>
</set>
WHERE WHERE
shop_id = #{shopId} shop_id = #{shopId}
and system_name in and system_name in

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

@@ -42,7 +42,7 @@ public class OpenApiServiceImpl implements OpenApiService {
throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST);
} }
Integer openStatus = statusRefreshDTO.getOpenStatus()?OpenStatusEnum.OPENSTATUSENUM_5.getCode():OpenStatusEnum.OPENSTATUSENUM_6.getCode(); Integer openStatus = statusRefreshDTO.getOpenStatus()?OpenStatusEnum.OPENSTATUSENUM_5.getCode():OpenStatusEnum.OPENSTATUSENUM_6.getCode();
accountDAO.updateStatusByShopIdAndSystemName(shopInfoDO.getId(), Arrays.asList(statusRefreshDTO.getSystemSource()), openStatus); accountDAO.updateStatusByShopIdAndSystemName(shopInfoDO.getId(), Arrays.asList(statusRefreshDTO.getSystemSource()), openStatus,null);
//订货系统开通完成 //订货系统开通完成
if (ShopAccountEnum.YLS.getSystemName().equals(statusRefreshDTO.getSystemSource())){ if (ShopAccountEnum.YLS.getSystemName().equals(statusRefreshDTO.getSystemSource())){

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

@@ -337,7 +337,7 @@ public class PreparationServiceImpl implements PreparationService {
log.info("selectSiteAndBuildStoreComplete flag2->{} flag3->{}",flag2,flag3); log.info("selectSiteAndBuildStoreComplete flag2->{} flag3->{}",flag2,flag3);
//都完成了 进件状态修改 //都完成了 进件状态修改
if (flag2 && flag3) { if (flag2 && flag3) {
shopAccountDAO.updateStatusByShopIdAndSystemName(shopId, Arrays.asList(ShopAccountEnum.HUOMA.getSystemName()), OpenStatusEnum.OPENSTATUSENUM_2.getCode()); shopAccountDAO.updateStatusByShopIdAndSystemName(shopId, Arrays.asList(ShopAccountEnum.HUOMA.getSystemName()), OpenStatusEnum.OPENSTATUSENUM_2.getCode(),null);
} }
} }
return Boolean.TRUE; return Boolean.TRUE;
@@ -354,7 +354,7 @@ public class PreparationServiceImpl implements PreparationService {
log.info("selectSiteAndBuildStoreComplete flag3->{}",flag3); log.info("selectSiteAndBuildStoreComplete flag3->{}",flag3);
//建店完成了 状态修改 //建店完成了 状态修改
if (flag3) { if (flag3) {
shopAccountDAO.updateStatusByShopIdAndSystemName(shopId, Arrays.asList(ShopAccountEnum.YLS.getSystemName(),ShopAccountEnum.XZG.getSystemName()), OpenStatusEnum.OPENSTATUSENUM_2.getCode()); shopAccountDAO.updateStatusByShopIdAndSystemName(shopId, Arrays.asList(ShopAccountEnum.YLS.getSystemName(),ShopAccountEnum.XZG.getSystemName()), OpenStatusEnum.OPENSTATUSENUM_2.getCode(),null);
} }
} }
return Boolean.TRUE; return Boolean.TRUE;

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

@@ -141,7 +141,7 @@ public class ShopAccountServiceImpl implements ShopAccountService {
throw new ServiceException(ErrorCodeEnum.CURRENT_STATUS_NOT_OPERATION); throw new ServiceException(ErrorCodeEnum.CURRENT_STATUS_NOT_OPERATION);
} }
OpenStatusEnum openStatusEnum = accountAuditDTO.getAuditFlag() == 1 ? OpenStatusEnum.OPENSTATUSENUM_4 : OpenStatusEnum.OPENSTATUSENUM_3; OpenStatusEnum openStatusEnum = accountAuditDTO.getAuditFlag() == 1 ? OpenStatusEnum.OPENSTATUSENUM_4 : OpenStatusEnum.OPENSTATUSENUM_3;
shopAccountDAO.updateStatusByShopIdAndSystemName(accountAuditDTO.getShopId(),Arrays.asList(shopAccountDO.getSystemName()),openStatusEnum.getCode()); shopAccountDAO.updateStatusByShopIdAndSystemName(accountAuditDTO.getShopId(),Arrays.asList(shopAccountDO.getSystemName()),openStatusEnum.getCode(),null);
return Boolean.TRUE; return Boolean.TRUE;
} }
@@ -206,7 +206,7 @@ public class ShopAccountServiceImpl implements ShopAccountService {
if (DownSystemTypeEnum.POS.equals(downSystemTypeEnum)){ if (DownSystemTypeEnum.POS.equals(downSystemTypeEnum)){
Boolean successFlag = pushService.pushDataToPOS(data); Boolean successFlag = pushService.pushDataToPOS(data);
OpenStatusEnum openStatusEnum = successFlag ? OpenStatusEnum.OPENSTATUSENUM_5 : OpenStatusEnum.OPENSTATUSENUM_6; OpenStatusEnum openStatusEnum = successFlag ? OpenStatusEnum.OPENSTATUSENUM_5 : OpenStatusEnum.OPENSTATUSENUM_6;
shopAccountDAO.updateEntryStatusByShopIdAndSystemName(accountAuditDTO.getShopId(),Arrays.asList(ShopAccountEnum.HUOMA.getSystemName()),openStatusEnum.getCode()); shopAccountDAO.updateStatusByShopIdAndSystemName(accountAuditDTO.getShopId(),Arrays.asList(ShopAccountEnum.HUOMA.getSystemName()),openStatusEnum.getCode(),new Date());
}else { }else {
pushService.pushDataToXGJ(data); pushService.pushDataToXGJ(data);
} }

6
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
View File

@@ -288,5 +288,11 @@ public class PCTestController {
return ResponseResult.success(pushService.getPosToken(dto)); return ResponseResult.success(pushService.getPosToken(dto));
} }
@ApiOperation("获取加密子串")
@PostMapping("/getEncryptedSubstring")
public ResponseResult<String> getEncryptedSubstring(@RequestBody GetPasswordDTO dto) {
return ResponseResult.success(thirdXinGuanJiaService.getPassword(dto));
}
} }