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

This commit is contained in:
shuo.wang
2025-04-16 14:56:36 +08:00

View File

@@ -49,22 +49,20 @@ public class OpenApiServiceImpl implements OpenApiService {
throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST);
}
Integer openStatus = statusRefreshDTO.getOpenStatus()?OpenStatusEnum.OPENSTATUSENUM_5.getCode():OpenStatusEnum.OPENSTATUSENUM_6.getCode();
accountDAO.updateStatusByShopIdAndSystemName(shopInfoDO.getId(), Arrays.asList(statusRefreshDTO.getSystemSource()), openStatus,null);
accountDAO.updateStatusByShopIdAndSystemName(shopInfoDO.getId(), Arrays.asList(ShopAccountEnum.YLS.getSystemName(),ShopAccountEnum.XZG.getSystemName()), openStatus,null);
//订货系统开通完成
if (ShopAccountEnum.YLS.getSystemName().equals(statusRefreshDTO.getSystemSource())){
ShopAccountDO shopAccountDO = accountDAO.selectByShopIdAndSystemName(shopInfoDO.getId(), ShopAccountEnum.YLS.getSystemName());
if (Objects.isNull(shopAccountDO)){
throw new ServiceException(ErrorCodeEnum.SYSTEM_DATA_ERROR);
}
PostAndOrderRequest postAndOrderRequest = new PostAndOrderRequest();
postAndOrderRequest.setShopId(shopInfoDO.getId());
postAndOrderRequest.setType(PosAndOrderEnum.ORDER.getCode());
postAndOrderRequest.setRemark("已为您开通订货系统账号和密码密码已加密初始密码为身份证后6位可通过加盟小程序修改密码");
postAndOrderRequest.setAccount(shopAccountDO.getAccount());
postAndOrderRequest.setPassword(shopAccountDO.getPassword());
posAndOrderInfoService.submitOrUpdate(postAndOrderRequest,null);
ShopAccountDO shopAccountDO = accountDAO.selectByShopIdAndSystemName(shopInfoDO.getId(), ShopAccountEnum.YLS.getSystemName());
if (Objects.isNull(shopAccountDO)){
throw new ServiceException(ErrorCodeEnum.SYSTEM_DATA_ERROR);
}
PostAndOrderRequest postAndOrderRequest = new PostAndOrderRequest();
postAndOrderRequest.setShopId(shopInfoDO.getId());
postAndOrderRequest.setType(PosAndOrderEnum.ORDER.getCode());
postAndOrderRequest.setRemark("已为您开通订货系统账号和密码密码已加密初始密码为身份证后6位可通过加盟小程序修改密码");
postAndOrderRequest.setAccount(shopAccountDO.getAccount());
postAndOrderRequest.setPassword(shopAccountDO.getPassword());
posAndOrderInfoService.submitOrUpdate(postAndOrderRequest,null);
return Boolean.TRUE;
}