Commit 91f0e261 by guojuxing

装修配置调整:如果没有店铺,不报错,继续走流程

parent 8299a3d1
......@@ -84,12 +84,6 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
if (!mainCardResult.isSuccess()) {
return ServiceResponse.failure(mainCardResult.getCode(), mainCardResult.getMessage());
}
//默认选中和主卡关联的店铺,不可编辑
ServiceResponse<ShopDTO> shopResult = getMainCardStore(appId, enterpriseId);
if (!shopResult.isSuccess()) {
return ServiceResponse.failure(shopResult.getCode(), shopResult.getMessage());
}
ShopDTO shopDTO = shopResult.getResult();
Long mainCardId = mainCardResult.getResult();
AppletDecorationConfigDTO result = new AppletDecorationConfigDTO();
......@@ -98,8 +92,14 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
dataAssetArea.setOrder(mainCardId.toString());
dataAssetArea.setCoupon(mainCardId.toString());
dataAssetArea.setIntegral(mainCardId.toString());
dataAssetArea.setMallOrder(shopDTO.getId().toString());
dataAssetArea.setMallOrderName(shopDTO.getName());
//默认选中和主卡关联的店铺,不可编辑
ServiceResponse<ShopDTO> shopResult = getMainCardStore(appId, enterpriseId);
if (shopResult.isSuccess()) {
ShopDTO shopDTO = shopResult.getResult();
dataAssetArea.setMallOrder(shopDTO.getId().toString());
dataAssetArea.setMallOrderName(shopDTO.getName());
}
//会员中心页面卡范围
result.setMemberCardArea(mainCardId.toString());
//数据资产对象
......@@ -311,12 +311,11 @@ public class AppletDecorationConfigApiServiceImpl implements AppletDecorationCon
//默认选中和主卡关联的店铺,不可编辑 //实时调用
ServiceResponse<ShopDTO> shopResult = getMainCardStore(appId, enterpriseId);
if (!shopResult.isSuccess()) {
return ServiceResponse.failure(shopResult.getCode(), shopResult.getMessage());
if (shopResult.isSuccess()) {
ShopDTO shopDTO = shopResult.getResult();
appletDataAssetArea.setMallOrder(shopDTO.getId().toString());
appletDataAssetArea.setMallOrderName(shopDTO.getName());
}
ShopDTO shopDTO = shopResult.getResult();
appletDataAssetArea.setMallOrder(shopDTO.getId().toString());
appletDataAssetArea.setMallOrderName(shopDTO.getName());
//数据资产设置
dto.setDataAssetArea(JSON.toJSONString(appletDataAssetArea));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment