Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init
This commit is contained in:
@@ -23,6 +23,7 @@ import com.cool.store.service.CoolStoreStartFlowService;
|
|||||||
import com.cool.store.service.PreparationService;
|
import com.cool.store.service.PreparationService;
|
||||||
import com.cool.store.service.SysStoreAppService;
|
import com.cool.store.service.SysStoreAppService;
|
||||||
import com.cool.store.service.UserAuthMappingService;
|
import com.cool.store.service.UserAuthMappingService;
|
||||||
|
import com.cool.store.utils.poi.StringUtils;
|
||||||
import com.cool.store.utils.poi.constant.Constants;
|
import com.cool.store.utils.poi.constant.Constants;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@@ -440,7 +441,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe
|
|||||||
ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId);
|
ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId);
|
||||||
EnterpriseUserDO supervisor = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.SUPERVISION, shopInfoDO.getRegionId());
|
EnterpriseUserDO supervisor = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.SUPERVISION, shopInfoDO.getRegionId());
|
||||||
shopInfoDO.setStoreNum(request.getStoreNum()); //更新门店编码
|
shopInfoDO.setStoreNum(request.getStoreNum()); //更新门店编码
|
||||||
shopInfoDO.setSupervisorUserId(supervisor.getUserId());//更新督导
|
shopInfoDO.setSupervisorUserId(StringUtils.isBlank(supervisor.getUserId()) ? "" : supervisor.getUserId());//更新督导
|
||||||
SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectOne(SystemBuildingShopDO.builder().shopId(shopId).build());
|
SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectOne(SystemBuildingShopDO.builder().shopId(shopId).build());
|
||||||
shopInfoDO.setShopName(systemBuildingShopDO.getStoreName());//更新铺位名称
|
shopInfoDO.setShopName(systemBuildingShopDO.getStoreName());//更新铺位名称
|
||||||
shopInfoMapper.updateByPrimaryKeySelective(shopInfoDO);
|
shopInfoMapper.updateByPrimaryKeySelective(shopInfoDO);
|
||||||
|
|||||||
Reference in New Issue
Block a user