From 49ec1df2c772310874b235c312ad3eec447c724c Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sat, 12 Apr 2025 17:55:33 +0800 Subject: [PATCH 01/21] fix --- .../java/com/cool/store/service/WarehouseInfoService.java | 3 ++- .../cool/store/service/impl/WarehouseInfoServiceImpl.java | 6 ++++-- .../store/controller/webb/PCWarehouseInfoController.java | 7 ++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/WarehouseInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/WarehouseInfoService.java index 03a412217..4fe0aadda 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/WarehouseInfoService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/WarehouseInfoService.java @@ -1,6 +1,7 @@ package com.cool.store.service; import com.cool.store.entity.WarehouseInfoDO; +import com.github.pagehelper.PageInfo; import java.util.List; @@ -12,5 +13,5 @@ import java.util.List; */ public interface WarehouseInfoService { - List getAllAndActive(String keyword,Integer pageNum,Integer pageSize); + PageInfo getAllAndActive(String keyword, Integer pageNum, Integer pageSize); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WarehouseInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WarehouseInfoServiceImpl.java index 053999ee1..a369d8ee5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WarehouseInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/WarehouseInfoServiceImpl.java @@ -4,6 +4,7 @@ import com.cool.store.entity.WarehouseInfoDO; import com.cool.store.mapper.WarehouseInfoMapper; import com.cool.store.service.WarehouseInfoService; import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.lowagie.text.PageSize; import org.springframework.stereotype.Service; @@ -23,8 +24,9 @@ public class WarehouseInfoServiceImpl implements WarehouseInfoService { @Resource private WarehouseInfoMapper warehouseInfoMapper; @Override - public List getAllAndActive(String keyword,Integer pageNum,Integer pageSize) { + public PageInfo getAllAndActive(String keyword,Integer pageNum,Integer pageSize) { PageHelper.startPage(pageNum,pageSize); - return warehouseInfoMapper.getAllAndActive(keyword); + List allAndActive = warehouseInfoMapper.getAllAndActive(keyword); + return new PageInfo<>(allAndActive); } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCWarehouseInfoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCWarehouseInfoController.java index a009be68d..07beb7709 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCWarehouseInfoController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCWarehouseInfoController.java @@ -3,6 +3,7 @@ package com.cool.store.controller.webb; import com.cool.store.entity.WarehouseInfoDO; import com.cool.store.response.ResponseResult; import com.cool.store.service.WarehouseInfoService; +import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; @@ -29,9 +30,9 @@ public class PCWarehouseInfoController { @GetMapping("/getAllAndActive") @ApiOperation(value = "获取正新鸡排仓库配置") - public ResponseResult> getAllAndActive(@RequestParam("keyword")String keyword , - @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum, - @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize) { + public ResponseResult> getAllAndActive(@RequestParam("keyword")String keyword , + @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum, + @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize) { return ResponseResult.success(warehouseInfoService.getAllAndActive(keyword,pageNum,pageSize)); } } From 8f15b46ab4d034d6482f589a5eebcd3e3f8a020d Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sat, 12 Apr 2025 18:52:03 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=E8=80=81=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dao/OldShopDAO.java | 31 ++++++++++++ .../com/cool/store/mapper/OldShopMapper.java | 14 ++++++ .../main/resources/mapper/OldShopMapper.xml | 17 +++++++ .../java/com/cool/store/entity/OldShopDO.java | 47 +++++++++++++++++++ .../store/service/impl/ShopServiceImpl.java | 16 ++++++- 5 files changed, 124 insertions(+), 1 deletion(-) create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/dao/OldShopDAO.java create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/mapper/OldShopMapper.java create mode 100644 coolstore-partner-dao/src/main/resources/mapper/OldShopMapper.xml create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/entity/OldShopDO.java diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/OldShopDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/OldShopDAO.java new file mode 100644 index 000000000..00a80d9d2 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/OldShopDAO.java @@ -0,0 +1,31 @@ +package com.cool.store.dao; + +import com.cool.store.entity.OldShopDO; +import com.cool.store.mapper.OldShopMapper; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Repository; +import tk.mybatis.mapper.entity.Example; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author: WangShuo + * @Date: 2025/04/12/18:36 + * @Version 1.0 + * @注释: + */ +@Repository +public class OldShopDAO { + @Resource + private OldShopMapper oldShopMapper; + + public List getByMobile(String mobile) { + if (StringUtils.isBlank(mobile)){ + return null; + } + Example example = new Example(OldShopDO.class); + example.createCriteria().andEqualTo("mobile", mobile); + return oldShopMapper.selectByExample(example); + } +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/OldShopMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/OldShopMapper.java new file mode 100644 index 000000000..07ee5acdd --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/OldShopMapper.java @@ -0,0 +1,14 @@ +package com.cool.store.mapper; + +import com.cool.store.entity.OldShopDO; +import tk.mybatis.mapper.common.BaseMapper; +import tk.mybatis.mapper.common.Mapper; + +/** + * @Author: WangShuo + * @Date: 2025/04/12/18:33 + * @Version 1.0 + * @注释: + */ +public interface OldShopMapper extends Mapper { +} diff --git a/coolstore-partner-dao/src/main/resources/mapper/OldShopMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/OldShopMapper.xml new file mode 100644 index 000000000..fa668e9e9 --- /dev/null +++ b/coolstore-partner-dao/src/main/resources/mapper/OldShopMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + id, shop_code, shop_name,mobile, create_time, update_time + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/OldShopDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/OldShopDO.java new file mode 100644 index 000000000..f4f786a7d --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/OldShopDO.java @@ -0,0 +1,47 @@ +package com.cool.store.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import javax.persistence.*; +import java.util.Date; + +@Data +@Table(name = "xfsg_old_shop") +public class OldShopDO { + + /** + * 主键ID + */ + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private Long id; + + /** + * 门店编码 + */ + @Column(name = "shop_code") + private String shopCode; + + @Column(name = "shop_name") + private String shopName; + + /** + * 手机号 + */ + @Column(name = "mobile") + private String mobile; + + /** + * 创建时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 更新时间 + */ + @Column(name = "update_time") + private Date updateTime; +} \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index 1f8983d66..f2ed49817 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -55,6 +55,9 @@ import static com.cool.store.enums.ErrorCodeEnum.UPDATE_INVESTMENT_MANAGER_FAIL; @Service @Slf4j public class ShopServiceImpl implements ShopService { + + @Resource + private OldShopDAO oldShopDAO; @Value("${mybatis.configuration.variables.enterpriseId}") private String eid; @Resource @@ -578,6 +581,7 @@ public class ShopServiceImpl implements ShopService { @Override public ShopResponse getShopNameAndCode(Long shopId, Long lineId) { boolean flag = false; + LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(lineId); MiniShopsResponse shopInfo = shopInfoDAO.currentShopWhetherOpen(shopId,eid); ShopResponse response = new ShopResponse(); if (Objects.nonNull(shopInfo)&&StringUtils.isNotBlank(shopInfo.getShopCode())) { @@ -596,9 +600,19 @@ public class ShopServiceImpl implements ShopService { dto.setShopCode(shopInfoDO.getShopCode()); list.add(dto); } - response.setShopList(list); flag = true; } + List oldMobile = oldShopDAO.getByMobile(lineInfoDO.getMobile()); + if (CollectionUtils.isNotEmpty(oldMobile)){ + for (OldShopDO oldShopDO : oldMobile){ + ShopNameAndCodeDTO dto = new ShopNameAndCodeDTO(); + dto.setShopName(oldShopDO.getShopName()); + dto.setShopCode(oldShopDO.getShopCode()); + list.add(dto); + } + flag = true; + } + response.setShopList(list); if (flag) { return response; } else { From c8fa77699da807ed75be7e94af3fc39e539ad57c Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sat, 12 Apr 2025 20:20:36 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E8=80=81=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/ShopInfoMapper.xml | 12 ++++++----- .../impl/PlatformBuildServiceImpl.java | 21 ++++++++++--------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index 8426de4fe..79d47d54a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -222,11 +222,13 @@ xsi.deleted = 0 and xssi.shop_stage = 3 and xssi.shop_sub_stage_status != -100 - and - xsi.region_id in - - #{item} - + + and + xsi.region_id in + + #{item} + + and (xsi.shop_name like concat("%",#{request.shopKeyword},"%") or xsi.shop_code like concat("%",#{request.shopKeyword},"%")) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java index 39f34880b..97b15bc98 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java @@ -17,11 +17,8 @@ import com.cool.store.request.PlatformBuildRequest; import com.cool.store.request.platformBuildListRequest; import com.cool.store.response.PlatformBuildListResponse; import com.cool.store.response.PlatformBuildResponse; -import com.cool.store.service.OperationLogService; -import com.cool.store.service.PlatformBuildService; +import com.cool.store.service.*; import com.cool.store.mapper.PlatformBuildMapper; -import com.cool.store.service.RegionService; -import com.cool.store.service.UserAuthMappingService; import com.cool.store.utils.poi.DateUtils; import com.cool.store.utils.poi.StringUtils; import com.cool.store.vo.PartnerUserInfoVO; @@ -52,6 +49,8 @@ import static com.cool.store.enums.point.ShopSubStageStatusEnum.*; @Service public class PlatformBuildServiceImpl implements PlatformBuildService { + @Resource + private SysRoleService sysRoleService; @Resource private ApplyLicenseMapper applyLicenseMapper; @Resource @@ -280,13 +279,15 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { @Override public PageInfo platformBuildList(platformBuildListRequest request) { String userId = request.getOperateUserId(); - List regionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(userId); - if (CollectionUtils.isEmpty(regionIds)) { - return new PageInfo<>(); - } List regionIdList = new ArrayList<>(); - for (String regionId : regionIds) { - regionIdList.add(Long.parseLong(regionId)); + if (!sysRoleService.checkIsAdmin(userId)){ + List regionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(userId); + if (CollectionUtils.isEmpty(regionIds)) { + return new PageInfo<>(); + } + for (String regionId : regionIds) { + regionIdList.add(Long.parseLong(regionId)); + } } List subRegionIdsByRegionIdList = regionMapper.getSubRegionIdsByRegionIdList(request.getRegionIds()); if (CollectionUtils.isNotEmpty(subRegionIdsByRegionIdList)) { From c710732f269b146dc07a30fc022ae1edde492a5a Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sat, 12 Apr 2025 20:30:49 +0800 Subject: [PATCH 04/21] =?UTF-8?q?=E8=80=81=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dao/ShopInfoDAO.java | 3 --- .../impl/PlatformBuildServiceImpl.java | 22 ++++++++++--------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java index 5204b42dd..621ad22d2 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java @@ -198,9 +198,6 @@ public class ShopInfoDAO { public List platformBuildList(List regionIds, platformBuildListRequest request){ - if(CollectionUtils.isEmpty(regionIds)){ - return new ArrayList<>(); - } return shopInfoMapper.platformBuildList(regionIds, request); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java index 97b15bc98..8e7ac2b90 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java @@ -280,7 +280,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { public PageInfo platformBuildList(platformBuildListRequest request) { String userId = request.getOperateUserId(); List regionIdList = new ArrayList<>(); - if (!sysRoleService.checkIsAdmin(userId)){ + if (!sysRoleService.checkIsAdmin(userId)) { List regionIds = userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(userId); if (CollectionUtils.isEmpty(regionIds)) { return new PageInfo<>(); @@ -289,9 +289,11 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { regionIdList.add(Long.parseLong(regionId)); } } - List subRegionIdsByRegionIdList = regionMapper.getSubRegionIdsByRegionIdList(request.getRegionIds()); - if (CollectionUtils.isNotEmpty(subRegionIdsByRegionIdList)) { - request.setRegionIds(subRegionIdsByRegionIdList); + if (CollectionUtils.isNotEmpty(request.getRegionIds())) { + List subRegionIdsByRegionIdList = regionMapper.getSubRegionIdsByRegionIdList(request.getRegionIds()); + if (CollectionUtils.isNotEmpty(subRegionIdsByRegionIdList)) { + request.setRegionIds(subRegionIdsByRegionIdList); + } } PageHelper.startPage(request.getPageNum(), request.getPageSize()); List responses = shopInfoDAO.platformBuildList(regionIdList, request); @@ -339,20 +341,20 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { platformBuildResponse.setLegalIdCardFront(qualificationsInfoDO.getLegalIdCardFront()); platformBuildResponse.setLegalIdCardBack(qualificationsInfoDO.getLegalIdCardBack()); } - if (Objects.nonNull(pointInfo)){ - platformBuildResponse.setShopProvinceCityDistrict(pointInfo.getProvince()+pointInfo.getCity()+pointInfo.getDistrict()); + if (Objects.nonNull(pointInfo)) { + platformBuildResponse.setShopProvinceCityDistrict(pointInfo.getProvince() + pointInfo.getCity() + pointInfo.getDistrict()); platformBuildResponse.setShopAddress(pointInfo.getAddress()); } platformBuildResponse.setShopCode(shopInfo.getShopCode()); platformBuildResponse.setFranchiseBrand(FranchiseBrandEnum.getDescByCode(shopInfo.getFranchiseBrand())); platformBuildResponse.setShopName(shopInfo.getShopName()); platformBuildResponse.setBusinessMobile(informationDO.getBusinessMobile()); - if (Objects.nonNull(licenseTransactDO)){ + if (Objects.nonNull(licenseTransactDO)) { platformBuildResponse.setCreditUrl(licenseTransactDO.getCreditUrl()); //("二证合一标识；0否 1 是") - if (licenseTransactDO.getTwoCertificatesOne().equals(1)){ + if (licenseTransactDO.getTwoCertificatesOne().equals(1)) { platformBuildResponse.setFoodBusinessLicenseUrl(licenseTransactDO.getCreditUrl()); - }else if (licenseTransactDO.getTwoCertificatesOne().equals(0)){ + } else if (licenseTransactDO.getTwoCertificatesOne().equals(0)) { platformBuildResponse.setFoodBusinessLicenseUrl(licenseTransactDO.getFoodBusinessLicenseUrl()); } } @@ -525,7 +527,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService { List operationLogs = operationLogDAO.getBySubStageStatusEnumAndsStatus(shopId, nowStatus, OperationTypeEnum.OPERATION_TYPE_1.getCode()); operationLogService.batchUpdateProcessed(operationLogs, auditId, request.getOperateUserId(), request.getReason()); //平台账号维护 - accountDAO.changeStatus(shopId,platformBuildDO.getType(),request.getAccount(),request.getPassword(),request.getResultType()); + accountDAO.changeStatus(shopId, platformBuildDO.getType(), request.getAccount(), request.getPassword(), request.getResultType()); platformBuildDO.setAuditId(auditId); platformBuildDO.setAccount(request.getAccount()); platformBuildDO.setPassword(request.getPassword()); From 4350aae97ddec10dbed559cd16f0eaaff34ef15a Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sat, 12 Apr 2025 21:49:08 +0800 Subject: [PATCH 05/21] fix --- .../src/main/java/com/cool/store/vo/point/PointPageVO.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointPageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointPageVO.java index 9dc7ebb36..ab275f763 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointPageVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointPageVO.java @@ -92,6 +92,8 @@ public class PointPageVO { pointPageVO.setCreateTime(pointInfo.getCreateTime()); pointPageVO.setUpdateTime(pointInfo.getUpdateTime()); pointPageVO.setOpenShopName(pointInfo.getOpenName()); + pointPageVO.setOpportunityPointCode(pointInfo.getOpportunityPointCode()); + pointPageVO.setOpportunityPointName(pointInfo.getOpportunityPointName()); resultList.add(pointPageVO); } return resultList; From 3dbe3c227fc7a6b0013502d50675bb99f266a480 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sat, 12 Apr 2025 22:42:19 +0800 Subject: [PATCH 06/21] fix --- .../src/main/java/com/cool/store/enums/ErrorCodeEnum.java | 2 +- .../com/cool/store/service/impl/ShopAccountServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index adcef8116..91ba7a476 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -87,7 +87,7 @@ public enum ErrorCodeEnum { LINE_PAY_IS_NOT_EXIST(500019, "意向金信息不存在！", null), INTENT_PASS(500020, "审核已通过，请刷新页面！", null), APPOINTMENT_TIME_FAIL(500020, "预约失败，请刷新后再试", null), - LINE_REGION_NOT_EXIST(500021, "线索的所属大区/分公司未填写", null), + LINE_REGION_NOT_EXIST(500021, "请先补充加盟商所属大区/分公司", null), POINT_NOT_COMPLETE(600000, "铺位信息未填写完全，请完善后生成评估报告", null), POINT_NOT_EXIST(600001, "铺位信息不存在", null), diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java index 73cb2fb20..fe547edd6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java @@ -68,7 +68,7 @@ public class ShopAccountServiceImpl implements ShopAccountService { shopAccountDOS.forEach(x->{ ShopAccountDTO shopAccountDTO = new ShopAccountDTO(); - + shopAccountDTO.setBoundPhone(x.getBoundPhone()); shopAccountDTO.setShopId(x.getShopId()); shopAccountDTO.setSystemName(x.getSystemName()); shopAccountDTO.setAccount(x.getAccount()); From 387dee767765a94864187dedc356dcb5a8ba3b20 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sat, 12 Apr 2025 22:55:46 +0800 Subject: [PATCH 07/21] fix --- .../src/main/resources/mapper/PointRecommendMapper.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/PointRecommendMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PointRecommendMapper.xml index 751d2c724..9fe6c4b43 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PointRecommendMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PointRecommendMapper.xml @@ -126,7 +126,8 @@ p.create_time as createTime, p.opportunity_point_code as opportunityPointCode, p.opportunity_point_name as opportunityPointName, - c.picture_obj as pictureObj + c.picture_obj as pictureObj, + pr.status as recommendStatus from xfsg_point_recommend pr inner join xfsg_point_info p on p.id = pr.point_id From 697cf5357d35c18767d58aa757d4df9ac35237da Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sat, 12 Apr 2025 23:58:27 +0800 Subject: [PATCH 08/21] fix --- .../src/main/resources/mapper/AcceptanceInfoMapper.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/AcceptanceInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/AcceptanceInfoMapper.xml index d9e8d6f23..3234c9d3d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/AcceptanceInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/AcceptanceInfoMapper.xml @@ -82,19 +82,19 @@ booking_user =#{bookingUser}, - plan_exit_time =#{planExitTime} + plan_exit_time =#{planExitTime}, - ks_account =#{ksAccount} + ks_account =#{ksAccount}, - verification_mobile =#{verificationMobile} + verification_mobile =#{verificationMobile}, - shop_location_screenshots =#{shopLocationScreenshots} + shop_location_screenshots =#{shopLocationScreenshots}, - shop_doorway_photo =#{shopDoorwayPhoto} + shop_doorway_photo =#{shopDoorwayPhoto}, shop_interior_photo =#{shopInteriorPhoto} From bec865217cc762e89851cb35cd97cb4a5a807ce2 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sun, 13 Apr 2025 00:06:37 +0800 Subject: [PATCH 09/21] fix --- .../service/impl/JoinIntentionServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index e950c0d56..1502a6674 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -10,6 +10,7 @@ import com.cool.store.mapper.HyOpenAreaInfoMapper; import com.cool.store.mapper.JoinIntentionMapper; import com.cool.store.mapper.LineAuditInfoMapper; import com.cool.store.mapper.LineInfoMapper; +import com.cool.store.request.GetPasswordDTO; import com.cool.store.request.JoinIntentionRequest; import com.cool.store.service.JoinIntentionService; import com.cool.store.service.ThirdXinGuanJiaService; @@ -37,7 +38,8 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt private EnterpriseUserDAO enterpriseUserDAO; @Resource JoinIntentionMapper joinIntentionMapper; - + @Resource + ThirdXinGuanJiaService thirdXinGuanJiaService; @Resource QualificationsInfoDAO qualificationsInfoDAO; @@ -64,8 +66,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt CommonService commonService; @Resource HyPartnerUserInfoDAO hyPartnerUserInfoDAO; - @Resource - ThirdXinGuanJiaService thirdXinGuanJiaService; + @Override @Transactional(rollbackFor = Exception.class) @@ -132,11 +133,12 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt byte[] saltBytes = PasswordUtil.generateSalt(); String salt = PasswordUtil.bytesToHex(saltBytes); String password = PasswordUtil.encryptPassword(substring, salt); + GetPasswordDTO getPasswordDTO = new GetPasswordDTO(); + getPasswordDTO.setPassword(substring); + String downstreamSystemSecondaryPassword = thirdXinGuanJiaService.getPassword(getPasswordDTO); HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(lineInfo.getPartnerId()); hyPartnerUserInfoDO.setDownstreamSystemPassword(password); - - - + hyPartnerUserInfoDO.setDownstreamSystemSecondaryPassword(downstreamSystemSecondaryPassword); hyPartnerUserInfoDO.setDownstreamSystemSalting(salt); hyPartnerUserInfoDO.setUpdateTime(new Date()); hyPartnerUserInfoDAO.updatePasswordByPartnerId(hyPartnerUserInfoDO); From d1ffb5d405dc505903dff47803a295d226e6df44 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sun, 13 Apr 2025 00:10:20 +0800 Subject: [PATCH 10/21] fix --- .../com/cool/store/response/ThreeSignResponse.java | 10 ++++++++++ .../cool/store/service/impl/DecorationServiceImpl.java | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/ThreeSignResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/ThreeSignResponse.java index f0bce1bfc..19a0c6db3 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/ThreeSignResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/ThreeSignResponse.java @@ -18,4 +18,14 @@ public class ThreeSignResponse { private ThreeAcceptanceDTO operationsAcceptance; @ApiModelProperty("加盟商验收") private ThreeAcceptanceDTO partnerAcceptance; + @ApiModelProperty("快手号") + private String ksAccount; + @ApiModelProperty("核销手机号") + private String verificationPhone; + @ApiModelProperty("高德、百度定位截图") + private String shopLocationScreenshots; + @ApiModelProperty("门店门头照片") + private String shopDoorwayPhoto; + @ApiModelProperty("门店内景照片") + private String shopInteriorPhoto; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java index e67f704af..56958fd54 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java @@ -746,6 +746,11 @@ public class DecorationServiceImpl implements DecorationService { ThreeAcceptanceDTO partner = JSONObject.parseObject(acceptanceInfoDO.getPartnerAcceptanceSignatures(), ThreeAcceptanceDTO.class); threeSignResponse.setPartnerAcceptance(partner); } + threeSignResponse.setKsAccount(acceptanceInfoDO.getKsAccount()); + threeSignResponse.setVerificationPhone(acceptanceInfoDO.getVerificationMobile()); + threeSignResponse.setShopLocationScreenshots(acceptanceInfoDO.getShopLocationScreenshots()); + threeSignResponse.setShopDoorwayPhoto(acceptanceInfoDO.getShopDoorwayPhoto()); + threeSignResponse.setShopInteriorPhoto(acceptanceInfoDO.getShopInteriorPhoto()); return threeSignResponse; } From 29b0f7baac53a60e5acecbec898f0b6c73cd20d1 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sun, 13 Apr 2025 00:21:49 +0800 Subject: [PATCH 11/21] fix --- .../src/main/resources/mapper/ShopAccountMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml index e2fa8680c..a0e7b3558 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml @@ -105,7 +105,7 @@ SET account = #{account}, password = #{password}, - status = #{status}, + status = #{status} WHERE shop_id = #{shopId} AND system_name = #{systemName} From d2202fbc5c53809b96e536e44f3f4e449699af6f Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sun, 13 Apr 2025 00:31:57 +0800 Subject: [PATCH 12/21] fix --- .../java/com/cool/store/request/ThreeAcceptanceRequest.java | 2 ++ .../src/main/java/com/cool/store/request/ZxjpApiRequest.java | 5 ++++- .../com/cool/store/service/impl/SyncDataServiceImpl.java | 1 + .../cool/store/controller/webb/PCDecorationController.java | 3 ++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java index 1052efcc9..b9d735f30 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ThreeAcceptanceRequest.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.apache.commons.lang3.StringUtils; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -17,6 +18,7 @@ import java.util.List; */ @Data public class ThreeAcceptanceRequest { + @NotNull private Long shopId; @ApiModelProperty("工程部验收") private ThreeAcceptanceDTO engineeringAcceptance; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java index 5d3bc419d..2229bb5e9 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java @@ -59,9 +59,12 @@ public class ZxjpApiRequest { @ApiModelProperty(value = "店铺品牌") private String franchiseBrand; - @ApiModelProperty(value = "新管家对应组织") + @ApiModelProperty(value = "新管家对应组织id") private String xgjRegionId; + @ApiModelProperty(value = "新管家对应组织") + private String xgjRegionName; + @ApiModelProperty(value = "新管家副总裁") private String xgjVicePresident; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java index 46ed56270..14ab526fa 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java @@ -132,6 +132,7 @@ public class SyncDataServiceImpl implements SyncDataService { } if (orderSysInfoDO != null) { request.setXgjRegionId(orderSysInfoDO.getXgjRegionId()); + request.setXgjRegionName(orderSysInfoDO.getXgjRegionName()); request.setXgjVicePresident(orderSysInfoDO.getXgjVicePresident()); request.setAddresseeName(orderSysInfoDO.getAddresseeName()); request.setAddresseeMobile(orderSysInfoDO.getAddresseeMobile()); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java index b0e9a07a1..55e3ca2df 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java @@ -21,6 +21,7 @@ import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -89,7 +90,7 @@ public class PCDecorationController { } @ApiOperation("提交三方验收签字") @PostMapping("/submitThreeAcceptanceSign") - public ResponseResult submitThreeAcceptanceSign(@RequestBody ThreeAcceptanceRequest request){ + public ResponseResult submitThreeAcceptanceSign(@RequestBody @Validated ThreeAcceptanceRequest request){ return ResponseResult.success(decorationService.pcSubmitAcceptanceSign(request)); } @ApiOperation("查看三方验收签字") From e123987f3e4512f5ae873350a1596e47a3eced73 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sun, 13 Apr 2025 14:08:28 +0800 Subject: [PATCH 13/21] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=BF=85=E5=A1=AB=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/request/AddPointDetailRequest.java | 1 + .../cool/store/service/impl/PointServiceImpl.java | 13 +++++++++++++ .../controller/webb/PCOrderSysInfoController.java | 4 +++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java index b9ebf62c1..1d09a90ba 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddPointDetailRequest.java @@ -85,6 +85,7 @@ public class AddPointDetailRequest { private String landlordUsername; @ApiModelProperty("房东电话") + @NotBlank(message = "房东电话不能为空") private String landlordMobile; @Min(1) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index 5be75b346..fcb1118e5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -302,6 +302,9 @@ public class PointServiceImpl implements PointService { log.error("铺位详细信息不存在"); throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); } + if (!checkIsAudit(pointInfo,pointDetailInfo)) { + throw new ServiceException(ErrorCodeEnum.THE_DATA_IS_NOT_FILLED); + } //处理子任务审核记录表 AuditSettingVO auditSetting = getAuditSetting(); if (Objects.isNull(auditSetting)) { @@ -328,7 +331,17 @@ public class PointServiceImpl implements PointService { dealNextAuditRecord(pointInfo, pointAuditRecordMap, NodeNoEnum.NODE_NO_0.getCode()); return pointInfoDAO.updatePointInfo(updatePoint); } + private Boolean checkIsAudit(PointInfoDO pointInfo,PointDetailInfoDO pointDetailInfoDO){ + if (StringUtils.isAnyBlank(pointInfo.getPointArea(),pointInfo.getLatitude(), + pointInfo.getLongitude(),pointInfo.getAddress(),pointInfo.getProvince(),pointInfo.getCity(), + pointInfo.getDistrict(),pointInfo.getTownship(),pointInfo.getOpportunityPointCode(),pointInfo.getOpportunityPointName() + ,pointInfo.getProvinceCode(),pointInfo.getCityCode(),pointInfo.getDistrictCode(),pointDetailInfoDO.getMonthRent() + ,pointDetailInfoDO.getLandlordMobile())){ + return false; + } + return true; + } @Override public Integer auditSetting(AuditSettingRequest request) { String cacheKey = MessageFormat.format(AUDIT_SETTING_KEY, enterpriseId); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOrderSysInfoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOrderSysInfoController.java index 2ac36d2a3..36d1dc501 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOrderSysInfoController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOrderSysInfoController.java @@ -1,6 +1,7 @@ package com.cool.store.controller.webb; import com.cool.store.context.CurrentUserHolder; +import com.cool.store.dto.XgjOrganizationDTO; import com.cool.store.enums.OrderSysTypeEnum; import com.cool.store.request.OrderSysInfoRequest; import com.cool.store.response.ResponseResult; @@ -12,6 +13,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; /** * @Author: WangShuo @@ -45,7 +47,7 @@ public class PCOrderSysInfoController { @GetMapping("/getXgjOrganization") @ApiOperation("获取新管家组织架构") - public ResponseResult getXgjOrganization(@RequestParam(value = "partnerId", required = true,defaultValue = "0") String partnerId) { + public ResponseResult> getXgjOrganization(@RequestParam(value = "partnerId", required = true,defaultValue = "0") String partnerId) { return ResponseResult.success(pushService.getXgjOrganization(partnerId)); } From 688e14a7d89debe98dc4fe776f6e0173989dbf77 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sun, 13 Apr 2025 16:23:21 +0800 Subject: [PATCH 14/21] fix --- .../src/main/resources/mapper/PointInfoMapper.xml | 11 +++++++++-- .../main/java/com/cool/store/entity/PointInfoDO.java | 3 +++ .../cool/store/request/UpdatePointDetailRequest.java | 1 + .../java/com/cool/store/vo/point/PointDetailVO.java | 9 +++++++++ .../com/cool/store/service/impl/PointServiceImpl.java | 1 + .../cool/store/service/impl/SyncDataServiceImpl.java | 2 +- 6 files changed, 24 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml index 68b1e93a7..9978cc6fd 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml @@ -33,6 +33,7 @@ + @@ -41,7 +42,7 @@ development_time, point_status, point_score, select_status, submit_audit_count, point_source, deleted, create_time, update_time, province, city, district, township, opportunity_point_code, opportunity_point_name, - province_code, city_code, district_code + province_code, city_code, district_code, point_location