From 5a0d8d2e5155fd01949c022d1b4f9917c589c53c Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 25 Apr 2024 11:29:06 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E9=93=BA=E4=BD=8D=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/PointServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 ea8692638..e1f1f050b 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 @@ -416,6 +416,12 @@ public class PointServiceImpl implements PointService { if(Objects.isNull(pointInfo)){ throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); } + if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus()) || PointStatusEnum.POINT_STATUS_6.getCode().equals(pointInfo.getPointStatus())){ + throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); + } + if(PointStatusEnum.POINT_STATUS_7.getCode().equals(pointInfo.getPointStatus())){ + throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); + } pointInfo.setDevelopmentManager(request.getDevelopmentManager()); return pointInfoDAO.updatePointInfo(pointInfo); } From bdb17a542e9ea1e0ea397d4c6d995089c65f706b Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 25 Apr 2024 11:47:00 +0800 Subject: [PATCH 02/18] add log --- .../java/com/cool/store/controller/webb/PointController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java index 62f5aa4b4..4a9790e4b 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PointController.java @@ -1,5 +1,6 @@ package com.cool.store.controller.webb; +import com.alibaba.fastjson.JSONObject; import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.PartnerUserHolder; import com.cool.store.request.*; @@ -11,6 +12,7 @@ import com.cool.store.vo.shop.ShopStageVO; 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.*; @@ -23,6 +25,7 @@ import java.util.List; * @Description: * @date 2024-03-29 15:36 */ +@Slf4j @Api(tags = "选址&铺位") @RestController @RequestMapping("/pc/point") @@ -34,6 +37,7 @@ public class PointController { @ApiOperation("新增铺位") @PostMapping("/add") public ResponseResult addPointDetailInfo(@RequestBody @Validated AddPointDetailRequest shopPointDetailRequest) { + log.info("新增铺位：{}", JSONObject.toJSONString(shopPointDetailRequest)); return ResponseResult.success(pointService.addPointDetailInfo(shopPointDetailRequest, CurrentUserHolder.getUserId())); } From c58f85abeb4a1576efe48c6e99845039b95e88b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 25 Apr 2024 14:08:56 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/dao/AssessmentTemplateDAO.java | 28 ++++++++++ .../mapper/AssessmentTemplateMapper.java | 13 +++++ .../mapper/AssessmentTemplateMapper.xml | 5 ++ .../store/entity/AssessmentTemplateDO.java | 6 +- .../cool/store/vo/AssessmentTemplateVO.java | 56 +++++++++++++++++++ .../service/AssessmentTemplateService.java | 25 +++++++++ .../impl/AssessmentTemplateServiceImpl.java | 44 +++++++++++++++ .../service/impl/PreparationServiceImpl.java | 6 +- .../webb/AssessmentTemplateController.java | 39 +++++++++++++ 9 files changed, 216 insertions(+), 6 deletions(-) create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentTemplateDAO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentTemplateVO.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/AssessmentTemplateService.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/impl/AssessmentTemplateServiceImpl.java create mode 100644 coolstore-partner-web/src/main/java/com/cool/store/controller/webb/AssessmentTemplateController.java diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentTemplateDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentTemplateDAO.java new file mode 100644 index 000000000..1370fafe5 --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/AssessmentTemplateDAO.java @@ -0,0 +1,28 @@ +package com.cool.store.dao; + +import com.cool.store.entity.AssessmentTemplateDO; +import com.cool.store.mapper.AssessmentTemplateMapper; +import com.google.common.collect.Lists; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2024/4/25 11:20 + * @Version 1.0 + */ +@Repository +public class AssessmentTemplateDAO { + @Resource + private AssessmentTemplateMapper assessmentTemplateMapper; + + public List listByType(@Param("type") Integer type){ + if (type == null){ + return Lists.newArrayList(); + } + return assessmentTemplateMapper.listByType(type); + } +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AssessmentTemplateMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AssessmentTemplateMapper.java index 823df567a..bde96aa59 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AssessmentTemplateMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/AssessmentTemplateMapper.java @@ -1,7 +1,20 @@ package com.cool.store.mapper; import com.cool.store.entity.AssessmentTemplateDO; +import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; +import java.util.List; + public interface AssessmentTemplateMapper extends Mapper { + + /** + * 根据类型查询 + * @param type + * @return + */ + List listByType(@Param("type") Integer type); + + + } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/AssessmentTemplateMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/AssessmentTemplateMapper.xml index c65c0aab4..2f7d2e13a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/AssessmentTemplateMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/AssessmentTemplateMapper.xml @@ -13,4 +13,9 @@ + + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/AssessmentTemplateDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/AssessmentTemplateDO.java index f7f240540..cf0d4e304 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/AssessmentTemplateDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/AssessmentTemplateDO.java @@ -11,7 +11,7 @@ public class AssessmentTemplateDO { /** * 模板类型：0 - 教练员, 1 - 店长, 2 - 店员, 3 - 三方验收 */ - private Boolean type; + private Integer type; /** * 模板类别，可为空 @@ -60,7 +60,7 @@ public class AssessmentTemplateDO { * * @return type - 模板类型：0 - 教练员, 1 - 店长, 2 - 店员, 3 - 三方验收 */ - public Boolean getType() { + public Integer getType() { return type; } @@ -69,7 +69,7 @@ public class AssessmentTemplateDO { * * @param type 模板类型：0 - 教练员, 1 - 店长, 2 - 店员, 3 - 三方验收 */ - public void setType(Boolean type) { + public void setType(Integer type) { this.type = type; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentTemplateVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentTemplateVO.java new file mode 100644 index 000000000..482502a8d --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentTemplateVO.java @@ -0,0 +1,56 @@ +package com.cool.store.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2024/4/25 11:26 + * @Version 1.0 + */ +@Data +public class AssessmentTemplateVO { + + @ApiModelProperty("ID") + private Long id; + + /** + * 模板类型：0 - 教练员, 1 - 店长, 2 - 店员, 3 - 三方验收 + */ + @ApiModelProperty("模板类型：0 - 教练员, 1 - 店长, 2 - 店员, 3 - 三方验收") + private Integer type; + + /** + * 模板类别，可为空 + */ + @ApiModelProperty("分类") + private String category; + + /** + * 模板名称 + */ + @ApiModelProperty("模板名称") + private String templateName; + + /** + * 模板remark + */ + @ApiModelProperty("模板remark") + private List templateRemarkList; + + /** + * 考核项分值 + */ + @ApiModelProperty("考核项分值") + private Long score; + + /** + * 模板要求明细，包括详细的考核要求描述 + */ + @ApiModelProperty("模板要求明细，包括详细的考核要求描述") + private String templateRequirements; + + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/AssessmentTemplateService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/AssessmentTemplateService.java new file mode 100644 index 000000000..4c81c4959 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/AssessmentTemplateService.java @@ -0,0 +1,25 @@ +package com.cool.store.service; + +import com.cool.store.vo.AssessmentTemplateVO; + +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2024/4/25 11:24 + * @Version 1.0 + */ +public interface AssessmentTemplateService { + + /** + * listByType + * @Description + * @Author suzhuhong + * @Date 2024/4/25 11:24 + * @param type + * @return + */ + List listByType(Integer type); + + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AssessmentTemplateServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AssessmentTemplateServiceImpl.java new file mode 100644 index 000000000..1cf96f4b6 --- /dev/null +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AssessmentTemplateServiceImpl.java @@ -0,0 +1,44 @@ +package com.cool.store.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSONObject; +import com.cool.store.dao.AssessmentTemplateDAO; +import com.cool.store.entity.AssessmentTemplateDO; +import com.cool.store.service.AssessmentTemplateService; +import com.cool.store.utils.poi.StringUtils; +import com.cool.store.vo.AssessmentTemplateVO; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2024/4/25 11:25 + * @Version 1.0 + */ +@Service +public class AssessmentTemplateServiceImpl implements AssessmentTemplateService { + + @Resource + AssessmentTemplateDAO assessmentTemplateDAO; + + @Override + public List listByType(Integer type) { + List assessmentTemplateDOS = assessmentTemplateDAO.listByType(type); + List result = new ArrayList<>(); + assessmentTemplateDOS.forEach(x->{ + AssessmentTemplateVO assessmentTemplateVO = new AssessmentTemplateVO(); + BeanUtil.copyProperties(x,assessmentTemplateVO); + x.getTemplateRemark(); + if (StringUtils.isNotEmpty(x.getTemplateRemark())){ + String[] split = x.getTemplateRemark().replaceAll("[\\[\\]\\s]", "").split(","); + assessmentTemplateVO.setTemplateRemarkList(Arrays.asList(split)); + } + result.add(assessmentTemplateVO); + }); + return result; + } +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java index ea9654b9c..da6af8a75 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java @@ -25,7 +25,7 @@ import java.util.stream.Collectors; * @Version 1.0 */ @Service -public class PreparationServiceImpl implements PreparationService { +public class PreparationServiceImpl implements PreparationService { @Resource private ShopStageInfoDAO shopStageInfoDAO; @@ -38,8 +38,8 @@ public class PreparationServiceImpl implements PreparationService { List shopStageInfo = shopStageInfoDAO.getShopStageInfo(shopId, null); if (CollectionUtils.isNotEmpty(shopStageInfo)){ Map shopStageInfoDOMap = shopStageInfo.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopSubStage, data -> data)); - Boolean buildStoreCompletionFlag= ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33.getShopSubStageStatusName().equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStage()).getShopSubStageStatus()); - Boolean contractCompletionFlag= ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_73.getShopSubStageStatusName().equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_7.getShopSubStage()).getShopSubStageStatus()); + Boolean buildStoreCompletionFlag= ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33.getShopSubStageStatus().equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStage()).getShopSubStageStatus()); + Boolean contractCompletionFlag= ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_73.getShopSubStageStatus().equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_7.getShopSubStage()).getShopSubStageStatus()); //都完成了 初始化后续流程数据 if (buildStoreCompletionFlag && contractCompletionFlag){ diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/AssessmentTemplateController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/AssessmentTemplateController.java new file mode 100644 index 000000000..71ff0a674 --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/AssessmentTemplateController.java @@ -0,0 +1,39 @@ +package com.cool.store.controller.webb; + +import com.cool.store.context.CurrentUserHolder; +import com.cool.store.context.LoginUserInfo; +import com.cool.store.response.ResponseResult; +import com.cool.store.service.AssessmentTemplateService; +import com.cool.store.vo.AssessmentTemplateVO; +import com.cool.store.vo.desk.IntendPendingVO; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author suzhuhong + * @Date 2024/4/25 11:41 + * @Version 1.0 + */ +@Api(tags = "模板列表") +@RestController +@RequestMapping("pc/template") +public class AssessmentTemplateController { + + @Resource + AssessmentTemplateService assessmentTemplateService; + + @ApiOperation("检查项模板列表type 0 1 2 3") + @GetMapping("/listByType") + public ResponseResult> intendPendingList(@RequestParam(value = "type",required = true)Integer type) { + return ResponseResult.success(assessmentTemplateService.listByType(type)); + } + +} From 47044118f00faa37255e4374ef3e1d16f9c1554f Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 25 Apr 2024 14:38:46 +0800 Subject: [PATCH 04/18] add log --- .../main/java/com/cool/store/service/impl/PointServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e1f1f050b..b46d40754 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 @@ -704,7 +704,7 @@ public class PointServiceImpl implements PointService { ShopInfoDO updateShop = new ShopInfoDO(); updateShop.setId(shopId); updateShop.setPointId(pointId); - shopInfoDAO.updateShopInfo(shopInfo); + shopInfoDAO.updateShopInfo(updateShop); shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_11); PointDetailInfoDO updateDetail = new PointDetailInfoDO(); updateDetail.setPointId(pointId); From f4e7b49665ae65ecd1f0acbc827a68cf3c110d93 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 25 Apr 2024 14:52:34 +0800 Subject: [PATCH 05/18] fix --- .../src/main/java/com/cool/store/dao/ShopInfoDAO.java | 2 +- .../src/main/java/com/cool/store/vo/shop/RentInfoToDoVO.java | 2 +- 2 files changed, 2 insertions(+), 2 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 f33d2f16a..5c67f455f 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 @@ -124,7 +124,7 @@ public class ShopInfoDAO { * @return */ public List getShopListByIds(List shopIds){ - if(CollectionUtils.isNotEmpty(shopIds)){ + if(CollectionUtils.isEmpty(shopIds)){ return new ArrayList<>(); } return shopInfoMapper.getShopListByIds(shopIds); diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/RentInfoToDoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/RentInfoToDoVO.java index ba76e7975..42a90de15 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/RentInfoToDoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/RentInfoToDoVO.java @@ -56,8 +56,8 @@ public class RentInfoToDoVO { if(Objects.nonNull(pointInfo)){ rent.setPointName(pointInfo.getPointName()); rent.setAddress(pointInfo.getAddress()); + rent.setRegionNodeName(regionNameMap.get(pointInfo.getRegionId())); } - rent.setRegionNodeName(regionNameMap.get(pointInfo.getRegionId())); rent.setSubmitTime(rentContractSubmitTimeMap.get(rent.getShopId())); resultList.add(rent); } From 044a54d94a20bf1d09e3a92634861c597489852b Mon Sep 17 00:00:00 2001 From: guohb Date: Thu, 25 Apr 2024 14:54:10 +0800 Subject: [PATCH 06/18] =?UTF-8?q?fix:=E7=A8=BD=E6=A0=B8=20feat:=E5=BB=BA?= =?UTF-8?q?=E5=BA=97&=E8=AF=81=E7=85=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/mapper/ShopAuditInfoMapper.java | 5 +++ .../resources/mapper/ApplyLicenseMapper.xml | 16 +++++++++ .../resources/mapper/AuditStatusMapper.xml | 2 +- .../resources/mapper/ShopAuditInfoMapper.xml | 6 ++++ .../cool/store/entity/ShopAuditInfoDO.java | 18 ++++++++++ .../store/request/SysStoreAppRequest.java | 4 ++- .../store/response/SubmitLicenseResponse.java | 14 +++----- .../store/response/SysStoreAppResponse.java | 12 +++++++ .../store/service/ApplyLicenseService.java | 23 ++++++++++++ .../service/CoolStoreStartFlowService.java | 2 +- .../service/impl/ApplyLicenseServiceImpl.java | 22 ++++++++++++ .../impl/CoolStoreStartFlowServiceImpl.java | 9 ++++- .../service/impl/SysStoreAppServiceImpl.java | 29 ++++++++++++--- .../cool/store/config/SignValidateFilter.java | 3 +- .../webb/PCApplyLicenseController.java | 25 ++++++++++--- .../webb/SysStoreAppController.java | 7 ++-- .../webc/MiniSysStoreAppController.java | 35 +++++++++++++++++++ 17 files changed, 204 insertions(+), 28 deletions(-) create mode 100644 coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniSysStoreAppController.java diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAuditInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAuditInfoMapper.java index 1f3a074a7..daf53879a 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAuditInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAuditInfoMapper.java @@ -10,6 +10,11 @@ public interface ShopAuditInfoMapper extends Mapper { ShopAuditInfoDO selectBykeyAndType(@Param("shopId") Long shopId); List getAuditInfoList(@Param("auditIds") List auditIds); + + List getListByShopIdAndType(@Param("shopId") Long shopId, + @Param("type") Integer type); + + /** * @Auther: wangshuo * @Date: 2024/4/23 diff --git a/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml index 782bc9cb4..0d4bb9539 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml @@ -19,5 +19,21 @@ xfsg_license_transact o LEFT JOIN xfsg_shop_info s ON o.shop_id = s.id LEFT JOIN xfsg_line_info l ON l.id = s.line_id + + + AND s.shop_name = #{request.storeName} + + + AND o.create_time BETWEEN #{request.submitStartTime} AND #{request.submitEndTime} + + + AND l.region_id = #{request.regionId} + + + AND o.submit_status = #{request.status} + + + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/AuditStatusMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/AuditStatusMapper.xml index 56a75ad57..504160e8b 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/AuditStatusMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/AuditStatusMapper.xml @@ -103,7 +103,7 @@ OR l.mobile = #{keyWord} ) - + AND lai.create_time BETWEEN #{startTime} AND #{endTime} diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopAuditInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopAuditInfoMapper.xml index 13c68313d..6fcb5dd9c 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopAuditInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopAuditInfoMapper.xml @@ -47,4 +47,10 @@ where shop_id = #{shopId} and deleted = 0 + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopAuditInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopAuditInfoDO.java index 39114ed85..800c55b68 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopAuditInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopAuditInfoDO.java @@ -1,5 +1,7 @@ package com.cool.store.entity; +import io.swagger.annotations.ApiModelProperty; + import java.util.Date; import javax.persistence.*; @@ -19,36 +21,42 @@ public class ShopAuditInfoDO { * 0-视觉验收 1-培训登记审批 2-开业运营方案 3-证照审批 */ @Column(name = "audit_type") + @ApiModelProperty("0-视觉验收 1-培训登记审批 2-开业运营方案 3-证照审批") private Integer auditType; /** * 提交人ID */ @Column(name = "submitted_user_id") + @ApiModelProperty("提交人ID") private String submittedUserId; /** * 提交人名称 */ @Column(name = "submitted_user_name") + @ApiModelProperty("提交人名称") private String submittedUserName; /** * 结果类型 0通过,1拒绝 */ @Column(name = "result_type") + @ApiModelProperty("结果类型 0通过,1拒绝") private Integer resultType; /** * 通过原因 */ @Column(name = "pass_reason") + @ApiModelProperty("通过原因") private String passReason; /** * 拒绝原因 */ @Column(name = "reject_reason") + @ApiModelProperty("拒绝原因") private String rejectReason; /** @@ -61,6 +69,7 @@ public class ShopAuditInfoDO { * 创建时间 */ @Column(name = "create_time") + @ApiModelProperty("时间") private Date createTime; /** @@ -75,6 +84,7 @@ public class ShopAuditInfoDO { private Boolean deleted; @Column(name = "data_type") + @ApiModelProperty("数据类型 0-提交 1-审批") private Integer dataType; /** @@ -288,4 +298,12 @@ public class ShopAuditInfoDO { public void setDeleted(Boolean deleted) { this.deleted = deleted; } + + public Integer getDataType() { + return dataType; + } + + public void setDataType(Integer dataType) { + this.dataType = dataType; + } } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/SysStoreAppRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/SysStoreAppRequest.java index fc3cd8369..c9f6a42de 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/SysStoreAppRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/SysStoreAppRequest.java @@ -51,7 +51,7 @@ public class SysStoreAppRequest { @Data @ApiModel("门店信息") public static class StoreDetail{ - @ApiModelProperty("门店性质") + @ApiModelProperty("门店性质 20：加盟 10：直营") private Integer storeNature; @ApiModelProperty("门店经营者") private Integer storeOperator; @@ -112,6 +112,8 @@ public class SysStoreAppRequest { private Integer storeSecurityDeposit; @ApiModelProperty("享受加盟费和保证金优惠原因") private String reasons; + @ApiModelProperty("品牌使用费率") + private String usageRate; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java index bc459990a..0c93646d3 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java @@ -1,11 +1,13 @@ package com.cool.store.response; import com.cool.store.entity.LicenseTransactDO; +import com.cool.store.entity.ShopAuditInfoDO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +import java.util.List; @Data @ApiModel("提交证照办理响应体") @@ -83,6 +85,8 @@ public class SubmitLicenseResponse { @ApiModelProperty("0:保存 1：提交到待审核 2:未通过 3:已通过 ") private Integer submitStatus; + @ApiModelProperty("流程记录") + private List processRecords; public static SubmitLicenseResponse from(LicenseTransactDO licenseTransactDO) { if (licenseTransactDO == null) { @@ -103,25 +107,15 @@ public class SubmitLicenseResponse { submitLicenseResponse.setRemark(licenseTransactDO.getRemark()); submitLicenseResponse.setRemarkUrl(licenseTransactDO.getRemarkUrl()); submitLicenseResponse.setSubmitStatus(licenseTransactDO.getSubmitStatus()); - // licenseUrl submitLicenseResponse.setLicenseUrl(licenseTransactDO.getCreditUrl()); - // licenseName submitLicenseResponse.setLicenseName(licenseTransactDO.getBusinessLicense()); - // socialCreditCode submitLicenseResponse.setSocialCreditCode(licenseTransactDO.getCreditCode()); - // idCardAndLicense1 submitLicenseResponse.setIdCardAndLicense1(licenseTransactDO.getIdCardNegativeCreditUrl()); - // idCardAndLicense2 submitLicenseResponse.setIdCardAndLicense2(licenseTransactDO.getIdCardPositiveCreditUrl()); - // foodLicenseUrl submitLicenseResponse.setFoodLicenseUrl(licenseTransactDO.getFoodBusinessLicenseUrl()); - // businessPremises submitLicenseResponse.setBusinessPremises(licenseTransactDO.getFoodLicenseAddress()); - // foodLicenseCode submitLicenseResponse.setFoodLicenseCode(licenseTransactDO.getFoodBusinessLicenseCode()); - // foodLicenseStartTime submitLicenseResponse.setFoodLicenseStartTime(licenseTransactDO.getFoodBusinessStartTime()); - // foodLicenseEndTime submitLicenseResponse.setFoodLicenseEndTime(licenseTransactDO.getFoodBusinessEndTime()); return submitLicenseResponse; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java index 0ac1c434e..602805a49 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java @@ -73,6 +73,18 @@ public class SysStoreAppResponse { @ApiModelProperty("门店邀约人姓名") private String storeInviteesName; + + @ApiModelProperty("招商姓名") + private String InvestmentName; + + @ApiModelProperty("招商人id") + private String InvestmentUserId; + + @ApiModelProperty("门店选址人姓名") + private String sitterName; + + @ApiModelProperty("门店选址人id") + private String sitterId; } @Data diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ApplyLicenseService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ApplyLicenseService.java index e0f0dbfd3..8d4718820 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ApplyLicenseService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ApplyLicenseService.java @@ -7,9 +7,32 @@ import com.cool.store.response.SubmitLicenseResponse; import com.github.pagehelper.PageInfo; public interface ApplyLicenseService { + /** + * 提交证照信息 + * @param request + * @return + */ Boolean submitLicense(SubmitLicenseRequest request); + /** + * 获取默认值 + * @param shopId + * @return + */ SubmitLicenseResponse getDefault(Long shopId); + /** + * 证照审核列表 + * @param request + * @return + */ PageInfo licenseList(LicenseListRequest request); + + /** + * 证照审核审批 + * @param id + * @param status 0通过 1不通过 + * @return + */ + Boolean licenseExamine(Long shopId, Integer status,String result); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/CoolStoreStartFlowService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/CoolStoreStartFlowService.java index 68f54c683..c33f3137a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/CoolStoreStartFlowService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/CoolStoreStartFlowService.java @@ -16,7 +16,7 @@ public interface CoolStoreStartFlowService { * @param request * @return */ - ResponseResult newStore(NewStoreRequest request); + ResponseResult newStore(NewStoreRequest request,Long shopId); /** *特许经营合同 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java index c4c63801f..7e4e14934 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java @@ -68,6 +68,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { LoginUserInfo user = CurrentUserHolder.getUser(); shopAuditInfoDO.setSubmittedUserId(user.getUserId()); shopAuditInfoDO.setSubmittedUserName(user.getName()); + shopAuditInfoDO.setDataType(0); shopAuditInfoMapper.insertSelective(shopAuditInfoDO); } return true; @@ -83,6 +84,8 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { throw new ServiceException(ErrorCodeEnum.LICENSE_NOT_EXIST); } SubmitLicenseResponse submitLicenseResponse = SubmitLicenseResponse.from(result); + List listByShopIdAndType = shopAuditInfoMapper.getListByShopIdAndType(shopId, AuditTypeEnum.LICENSE_APPROVAL.getCode()); + submitLicenseResponse.setProcessRecords(listByShopIdAndType); return submitLicenseResponse; } @@ -114,4 +117,23 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { } return new PageInfo<>(licenseListResponses); } + + @Override + public Boolean licenseExamine(Long shopId, Integer status,String result) { + ShopAuditInfoDO shopAuditInfoDO = new ShopAuditInfoDO(); + shopAuditInfoDO.setShopId(shopId); + shopAuditInfoDO.setAuditType(AuditTypeEnum.LICENSE_APPROVAL.getCode()); + LoginUserInfo user = CurrentUserHolder.getUser(); + shopAuditInfoDO.setSubmittedUserId(user.getUserId()); + shopAuditInfoDO.setSubmittedUserName(user.getName()); + shopAuditInfoDO.setDataType(1); + shopAuditInfoDO.setResultType(status); + if (status == Constants.ZERO_INTEGER){ + shopAuditInfoDO.setPassReason(result); + }else if (status == Constants.ONE_INTEGER){ + shopAuditInfoDO.setRejectReason(result); + } + shopAuditInfoMapper.insertSelective(shopAuditInfoDO); + return null; + } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CoolStoreStartFlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CoolStoreStartFlowServiceImpl.java index 289c6c6b1..1958e2f5a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CoolStoreStartFlowServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CoolStoreStartFlowServiceImpl.java @@ -1,8 +1,10 @@ package com.cool.store.service.impl; import com.alibaba.fastjson.JSONObject; +import com.cool.store.dao.ShopStageInfoDAO; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.WorkflowSubStageStatusEnum; +import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; import com.cool.store.mq.util.HttpRestTemplateService; import com.cool.store.request.FranchiseAgreementRequest; @@ -29,11 +31,14 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService @Value("${xfsg.url}") private String xfsgUrl; + @Resource + ShopStageInfoDAO shopStageInfoDAO; + @Resource private HttpRestTemplateService httpRestTemplateService; @Override - public ResponseResult newStore(NewStoreRequest request) { + public ResponseResult newStore(NewStoreRequest request,Long shopId) { log.info("newStore param:{}", JSONObject.toJSONString(request)); if (Objects.isNull(request)) { throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); @@ -46,6 +51,8 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService if (initiatingResponse.getCode() != 0L){ return new ResponseResult(500,initiatingResponse.getMsg(),initiatingResponse.getData()); }else { + //更新阶段信息 + shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_31,null); return new ResponseResult(200000,initiatingResponse.getMsg(),initiatingResponse.getData()); } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java index 82d4ed094..23a618d44 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java @@ -4,11 +4,13 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; +import com.cool.store.dao.ShopStageInfoDAO; import com.cool.store.entity.*; import com.cool.store.enums.AuditEnum; import com.cool.store.enums.AuditTypeEnum; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.UserRoleEnum; +import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.enums.prepare.newStore.BusinessDistrictEnum; import com.cool.store.enums.prepare.newStore.OfflineCompetitorEnum; import com.cool.store.enums.prepare.newStore.PassengerFlowEnum; @@ -72,6 +74,9 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer @Resource ShopInfoMapper shopInfoMapper; + @Resource + ShopStageInfoDAO shopStageInfoDAO; + @Override @Transactional(rollbackFor = Exception.class) public ResponseResult submitSysBuildStore(SysStoreAppRequest request) { @@ -92,7 +97,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer PointInfoDO pointInfoDO = pointInfoMapper.getDataByShopIdAndLineId(request.getLineId(), request.getShopId());//查铺位信息确定铺位所在大区、战区、门店所在省市区街道地址 //3.请求鲜丰接口 NewStoreRequest apiRequest = convertToNewStoreRequest(request,lineInfoDO,pointInfoDO); - return coolStoreStartFlowService.newStore(apiRequest); + return coolStoreStartFlowService.newStore(apiRequest,request.getShopId()); } @Override @@ -220,6 +225,14 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer franInfo.setPartnerNum(lineInfoDO.getPartnerNum()); franInfo.setFranchiseeMobile(lineInfoDO.getMobile()); franInfo.setFranchiseeName(lineInfoDO.getUsername()); + franInfo.setInvestmentUserId(lineInfoDO.getInvestmentManager()); + EnterpriseUserDO userInfoById = enterpriseUserMapper.getUserInfoById(lineInfoDO.getInvestmentManager()); + franInfo.setInvestmentName(userInfoById.getName()); + } + if (Objects.nonNull(pointInfoDO)){ + EnterpriseUserDO locationPeople = enterpriseUserMapper.getUserInfoById(pointInfoDO.getDevelopmentManager());//门店选址人 + franInfo.setSitterId(pointInfoDO.getDevelopmentManager()); + franInfo.setSitterName(locationPeople.getName()); } sysStoreAppResponse.setStoreDetail(storeDetail); sysStoreAppResponse.setSupervisorDetail(supervisorDetail); @@ -376,6 +389,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer String kdzBusinessId = request.getKdzBusinessId(); Long shopId = getShopId(kdzBusinessId); ShopAuditInfoDO shopAuditInfoDO = new ShopAuditInfoDO(); + ShopSubStageStatusEnum shopSubStageStatusEnum = null; //1.成功/失败原因 try { shopAuditInfoDO.setShopId(shopId); @@ -383,12 +397,14 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer LoginUserInfo user = CurrentUserHolder.getUser(); shopAuditInfoDO.setSubmittedUserId(user.getUserId()); shopAuditInfoDO.setSubmittedUserName(user.getName()); - if (request.getAuditResult() == 0){ - shopAuditInfoDO.setResultType(1); + if (request.getAuditResult() == Constants.ZERO_INTEGER){ + shopAuditInfoDO.setResultType(Constants.ONE_INTEGER); shopAuditInfoDO.setRejectReason(request.getCause()); - }else if (request.getAuditResult() == 1){ - shopAuditInfoDO.setResultType(0); + shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_32; + }else if (request.getAuditResult() == Constants.ONE_INTEGER){ + shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER); shopAuditInfoDO.setPassReason(request.getCause()); + shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33; } shopAuditInfoMapper.insertSelective(shopAuditInfoDO); }catch (Exception e){ @@ -396,10 +412,13 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer }finally { //2.校验建店与加盟签约合同是否完成 并初始化后续流程数据 preparationService.contractAndBuildStoreCompletion(shopId); + //更新门店编码 ShopInfoDO shopInfoDO = new ShopInfoDO(); shopInfoDO.setId(shopId); shopInfoDO.setStoreNum(request.getStoreNum()); shopInfoMapper.updateByPrimaryKeySelective(shopInfoDO); + //更新阶段状态 + shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, shopSubStageStatusEnum,null); } return true; } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java index 1d28cbf7b..30893c80c 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java @@ -57,7 +57,8 @@ public class SignValidateFilter implements Filter { "/**/swagger*/**", "/**/webjars/**", "/xfsg/mini/program/v1/partnerManage/openArea/areaApplyQuery", - "/xfsg/*/api/audit/result" + "/xfsg/*/api/audit/result", + "/xfsg/mini/**" ); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java index a92660b4f..435f858d0 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java @@ -4,16 +4,16 @@ import com.cool.store.request.LicenseListRequest; import com.cool.store.request.OpenAcceptanceRequest; import com.cool.store.response.LicenseListResponse; import com.cool.store.response.ResponseResult; +import com.cool.store.response.SubmitLicenseResponse; import com.cool.store.service.ApplyLicenseService; import com.cool.store.vo.OpenAcceptanceInfoListVO; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.models.auth.In; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.apache.ibatis.annotations.Param; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -34,7 +34,22 @@ public class PCApplyLicenseController { @ApiOperation("证照办理数据回显") @GetMapping("/default/get") - public ResponseResult getDefault(@RequestParam("shopId") Long shopId) { + public ResponseResult getDefault(@RequestParam("shopId") Long shopId) { return ResponseResult.success(applyLicenseService.getDefault(shopId)); } + + /** + * + * @param id + * @param status 0通过 1不通过 + * @return + */ + @PostMapping(path = "/examine") + @ApiOperation("证照审批列表") + public ResponseResult licenseExamine(@RequestParam("id") Long shopId, + @RequestParam("status") Integer status, + @RequestParam("result") String result) { + return ResponseResult.success(applyLicenseService.licenseExamine(shopId,status,result)); + } + } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysStoreAppController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysStoreAppController.java index f03c40817..98965b1c4 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysStoreAppController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysStoreAppController.java @@ -3,6 +3,7 @@ package com.cool.store.controller.webb; import com.cool.store.request.SysStoreAppRequest; import com.cool.store.response.ResponseResult; +import com.cool.store.response.SysStoreAppResponse; import com.cool.store.service.SysStoreAppService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -14,7 +15,7 @@ import java.util.Map; @RestController @RequestMapping("/pc/sysStore") -@Api(tags = "系统建店") +@Api(tags = "PC系统建店") @Slf4j public class SysStoreAppController { @@ -29,8 +30,8 @@ public class SysStoreAppController { @GetMapping(path = "/default/get") @ApiOperation("获取系统建店默认值") - public ResponseResult getDefaultValueSysBuildStore(@RequestParam("lineId") Long lineId, - @RequestParam("shopId") Long shopId) { + public ResponseResult getDefaultValueSysBuildStore(@RequestParam("lineId") Long lineId, + @RequestParam("shopId") Long shopId) { return ResponseResult.success(sysStoreAppService.getDefaultValueSysBuildStore(lineId,shopId)); } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniSysStoreAppController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniSysStoreAppController.java new file mode 100644 index 000000000..d068f00fc --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniSysStoreAppController.java @@ -0,0 +1,35 @@ +package com.cool.store.controller.webc; + +import com.cool.store.request.SysStoreAppRequest; +import com.cool.store.response.ResponseResult; +import com.cool.store.response.SysStoreAppResponse; +import com.cool.store.service.SysStoreAppService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +@RestController +@RequestMapping("/mini/sysStore") +@Api(tags = "mini系统建店") +@Slf4j +public class MiniSysStoreAppController { + + @Resource + private SysStoreAppService sysStoreAppService; + + @PostMapping(path = "/submit") + @ApiOperation("提交(更新) 系统建店申请") + public ResponseResult submitSysBuildStore(@RequestBody SysStoreAppRequest request) { + return sysStoreAppService.submitSysBuildStore(request); + } + + @GetMapping(path = "/default/get") + @ApiOperation("获取系统建店默认值") + public ResponseResult getDefaultValueSysBuildStore(@RequestParam("lineId") Long lineId, + @RequestParam("shopId") Long shopId) { + return ResponseResult.success(sysStoreAppService.getDefaultValueSysBuildStore(lineId,shopId)); + } +} From 6561852b6b077c134e897c0480c6a748cf5f7e88 Mon Sep 17 00:00:00 2001 From: guohb Date: Thu, 25 Apr 2024 15:07:50 +0800 Subject: [PATCH 07/18] =?UTF-8?q?updateShopStageAndAuditInfo=E4=BD=BF?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/ApplyLicenseServiceImpl.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java index 7e4e14934..063efc18c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java @@ -5,10 +5,12 @@ import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.EnterpriseUserDAO; import com.cool.store.dao.RegionDao; +import com.cool.store.dao.ShopStageInfoDAO; import com.cool.store.entity.LicenseTransactDO; import com.cool.store.entity.ShopAuditInfoDO; import com.cool.store.enums.AuditTypeEnum; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; import com.cool.store.mapper.ApplyLicenseMapper; import com.cool.store.mapper.ShopAuditInfoMapper; @@ -48,6 +50,9 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { @Resource private RegionDao regionDao; + @Resource + ShopStageInfoDAO shopStageInfoDAO; + @Override public Boolean submitLicense(SubmitLicenseRequest request) { log.info("submitLicense request：{}", JSONObject.toJSONString(request)); @@ -71,6 +76,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { shopAuditInfoDO.setDataType(0); shopAuditInfoMapper.insertSelective(shopAuditInfoDO); } + shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_41,null); return true; } @@ -122,6 +128,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { public Boolean licenseExamine(Long shopId, Integer status,String result) { ShopAuditInfoDO shopAuditInfoDO = new ShopAuditInfoDO(); shopAuditInfoDO.setShopId(shopId); + ShopSubStageStatusEnum shopSubStageStatusEnum = null; shopAuditInfoDO.setAuditType(AuditTypeEnum.LICENSE_APPROVAL.getCode()); LoginUserInfo user = CurrentUserHolder.getUser(); shopAuditInfoDO.setSubmittedUserId(user.getUserId()); @@ -130,10 +137,13 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { shopAuditInfoDO.setResultType(status); if (status == Constants.ZERO_INTEGER){ shopAuditInfoDO.setPassReason(result); + shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_43; }else if (status == Constants.ONE_INTEGER){ shopAuditInfoDO.setRejectReason(result); + shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_42; } shopAuditInfoMapper.insertSelective(shopAuditInfoDO); + shopStageInfoDAO.updateShopStageAndAuditInfo(shopId,shopSubStageStatusEnum,null); return null; } } From 807edaccfc6e8826d39541e2c98c000e66c3d38c Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 25 Apr 2024 15:20:33 +0800 Subject: [PATCH 08/18] fix --- .../java/com/cool/store/request/AddPointDetailRequest.java | 3 --- 1 file changed, 3 deletions(-) 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 1bbcab303..66cc52ef9 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 @@ -30,15 +30,12 @@ public class AddPointDetailRequest { @ApiModelProperty("纬度") private String latitude; - @NotBlank @ApiModelProperty("省") private String province; - @NotBlank @ApiModelProperty("市") private String city; - @NotBlank @ApiModelProperty("区/县") private String district; From 33cf9be5f24e1d12020ccbc888d81034049a82f0 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 25 Apr 2024 15:39:46 +0800 Subject: [PATCH 09/18] fix --- .../main/java/com/cool/store/config/SignValidateFilter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java index 30893c80c..1d28cbf7b 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java @@ -57,8 +57,7 @@ public class SignValidateFilter implements Filter { "/**/swagger*/**", "/**/webjars/**", "/xfsg/mini/program/v1/partnerManage/openArea/areaApplyQuery", - "/xfsg/*/api/audit/result", - "/xfsg/mini/**" + "/xfsg/*/api/audit/result" ); From 2b786d21407d68e1a729a8e7bb2d4aabfa6d3039 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 25 Apr 2024 16:16:33 +0800 Subject: [PATCH 10/18] fix --- .../src/main/resources/mapper/PointInfoMapper.xml | 2 +- .../main/java/com/cool/store/request/OperationAuditRequest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml index 796f970d6..d14aefd4c 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml @@ -200,7 +200,7 @@ - update xfsg_point_info set line_id = null, shop_id = null, select_status = 0, update_time = now(), point_status = if(point_status = 6, 5, point_status)) where id = #{pointId} + update xfsg_point_info set line_id = null, shop_id = null, select_status = 0, update_time = now(), point_status = if(point_status = 6, 5, point_status) where id = #{pointId} \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/OperationAuditRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/OperationAuditRequest.java index 94bb6f4d5..d94d85998 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/OperationAuditRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/OperationAuditRequest.java @@ -90,6 +90,7 @@ public class OperationAuditRequest { pointDetailInfo.setClerkNum(request.getClerkNum()); pointDetailInfo.setClerkFee(request.getClerkFee()); pointDetailInfo.setOperationUserSign(request.getOperationUserSign()); + pointDetailInfo.setOperationUserSignTime(new Date()); return pointDetailInfo; } From 62ff276c623241fc7a4fa453bee32130acd43ffd Mon Sep 17 00:00:00 2001 From: guohb Date: Thu, 25 Apr 2024 16:18:38 +0800 Subject: [PATCH 11/18] getLineInfo --- .../main/java/com/cool/store/service/impl/LineServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java index cf87e3ce2..b783cd3cf 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java @@ -94,7 +94,7 @@ public class LineServiceImpl implements LineService { result.setInvestmentManagerName(user.getName()); result.setInvestmentManagerMobile(user.getMobile()); } - if(lineInfo.getRegionId()!=null){ + if(lineInfo.getRegionId() != null && lineInfo.getRegionId() != 0){ Long bigRegionIdByAreaId = regionService.getBigRegionIdByAreaId(lineInfo.getWantShopAreaId()); Map regionNameMap = regionDao.getRegionNameMap(Arrays.asList(bigRegionIdByAreaId, lineInfo.getRegionId())); result.setRegionId(lineInfo.getRegionId()); From ee3f76a0f0c2312641456165a8422c11db00a72d Mon Sep 17 00:00:00 2001 From: guohb Date: Thu, 25 Apr 2024 16:23:38 +0800 Subject: [PATCH 12/18] getLineInfo2 --- .../main/java/com/cool/store/service/impl/LineServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java index b783cd3cf..6af219718 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java @@ -85,6 +85,9 @@ public class LineServiceImpl implements LineService { if (lineInfo==null){ throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); } + if (StringUtil.isBlank(lineInfo.getInvestmentManager())){ + return null; + } if (lineInfo.getLineSource()!=null){ Map channelMapByIds = hyPartnerUserChannelDAO.getChannelMapByIds(Arrays.asList(lineInfo.getLineSource())); result.setLineSourceName(channelMapByIds.get(lineInfo.getLineSource())); From 408363182efb3bb6b59876e73beadb1661c30a9e Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 25 Apr 2024 16:26:29 +0800 Subject: [PATCH 13/18] fix --- .../main/java/com/cool/store/service/impl/PointServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 b46d40754..2450092f4 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 @@ -703,6 +703,7 @@ public class PointServiceImpl implements PointService { pointInfoDAO.updatePointInfo(updatePoint); ShopInfoDO updateShop = new ShopInfoDO(); updateShop.setId(shopId); + updateShop.setShopName(pointInfo.getPointName()); updateShop.setPointId(pointId); shopInfoDAO.updateShopInfo(updateShop); shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_11); From bfd467f1dffc2a6eddc55c3174edb2641292c075 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 25 Apr 2024 16:30:53 +0800 Subject: [PATCH 14/18] fix --- .../main/java/com/cool/store/vo/point/PointAuditRecordVO.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointAuditRecordVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointAuditRecordVO.java index 6318470d5..891969462 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointAuditRecordVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointAuditRecordVO.java @@ -52,6 +52,9 @@ public class PointAuditRecordVO { @ApiModelProperty("是否超时") private Boolean isTimeout; + @ApiModelProperty("节点") + private Integer nodeNo; + public static List convert(List auditRecordList, Map userMap) { List resultList = new ArrayList<>(); for (PointAuditRecordDO pointAuditRecord : auditRecordList) { @@ -63,6 +66,7 @@ public class PointAuditRecordVO { pointAuditRecordVO.setSignAddress(pointAuditRecord.getSignAddress()); pointAuditRecordVO.setPictureUrl(pointAuditRecord.getPictureUrl()); pointAuditRecordVO.setIsTimeout(Boolean.FALSE); + pointAuditRecordVO.setNodeNo(pointAuditRecord.getNodeNo()); if(Objects.nonNull(pointAuditRecord.getReceiveTaskTime())){ Date time = Objects.isNull(pointAuditRecord.getFinishTaskTime()) ? new Date() : pointAuditRecord.getFinishTaskTime(); LocalDateTime localDateTime = LocalDateTime.ofInstant(pointAuditRecord.getReceiveTaskTime().toInstant(), ZoneId.systemDefault()); From 1f248a55e6e89f8c5d61b027742ddcdc649e0910 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Thu, 25 Apr 2024 17:10:39 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=80=89=E5=9D=80=E6=95=B0=E9=87=8F=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/dao/ShopInfoDAO.java | 12 ++++++++++++ .../java/com/cool/store/mapper/ShopInfoMapper.java | 3 +++ .../src/main/resources/mapper/PointInfoMapper.xml | 2 +- .../src/main/resources/mapper/ShopInfoMapper.xml | 12 ++++++++++++ .../cool/store/service/impl/PointServiceImpl.java | 12 +++++++----- 5 files changed, 35 insertions(+), 6 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 5c67f455f..3200a5d80 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 @@ -2,6 +2,7 @@ package com.cool.store.dao; import com.cool.store.constants.CommonConstants; import com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO; +import com.cool.store.dto.point.LineCountDTO; import com.cool.store.entity.ShopInfoDO; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.exception.ServiceException; @@ -9,6 +10,7 @@ import com.cool.store.mapper.ShopInfoMapper; import com.cool.store.vo.shop.StageShopCountVO; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; +import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Repository; @@ -16,7 +18,9 @@ import org.springframework.stereotype.Repository; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; /** * @author zhangchenbiao @@ -139,4 +143,12 @@ public class ShopInfoDAO { PageHelper.startPage(pageNum, pageSize); return shopInfoMapper.getOpenPlanShopListByShopName(shopName,bigName,fightName); } + + public Map getSelectedShopNumMap(List lineIds) { + if(CollectionUtils.isEmpty(lineIds)){ + return Maps.newHashMap(); + } + List selectedShopNum = shopInfoMapper.getSelectedShopNum(lineIds); + return selectedShopNum.stream().collect(Collectors.toMap(k->k.getLineId(), v->v.getSelectedShopNum())); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java index 0337aa62f..2e8faf3fa 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java @@ -1,6 +1,7 @@ package com.cool.store.mapper; import com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO; +import com.cool.store.dto.point.LineCountDTO; import com.cool.store.entity.ShopInfoDO; import com.cool.store.vo.shop.StageShopCountVO; import com.github.pagehelper.Page; @@ -69,4 +70,6 @@ public interface ShopInfoMapper extends Mapper { */ Page getOpenPlanShopListByShopName(@Param("shopName") String shopName, @Param("bigName") String bigName, @Param("fightName") String fightName); + + List getSelectedShopNum(@Param("lineIds") List lineIds); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml index d14aefd4c..b05900717 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml @@ -106,7 +106,7 @@ line_id as lineId, count(1) as selectedShopNum from xfsg_point_info - where deleted = 0 and select_status = 1 and line_id in + where deleted = 0 and select_status = 1 and point_status !=7 and line_id in #{lineId} diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index 0de17677b..0bfd355fd 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -93,5 +93,17 @@ + + \ No newline at end of file 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 2450092f4..75c302826 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 @@ -168,7 +168,7 @@ public class PointServiceImpl implements PointService { updatePoint.setPointStatus(PointStatusEnum.POINT_STATUS_7.getCode()); pointInfoDAO.updatePointInfo(updatePoint); if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())){ - rollbackSelectPoint(pointInfo.getShopId()); + rollbackSelectPoint(pointInfo.getShopId(), pointInfo.getId()); } return pointRecommendDAO.updateRecommendStatus(pointId, PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_6, null); } @@ -177,8 +177,11 @@ public class PointServiceImpl implements PointService { * 回退选址状态 * @return */ - private void rollbackSelectPoint(Long shopId){ + private void rollbackSelectPoint(Long shopId, Long pointId){ + //店铺回退待带选址 shopInfoDAO.unbindPoint(shopId); + //铺位回退 + pointInfoDAO.recyclePoint(pointId); //回到待选址状态 shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_10); //租赁合同回到未开始 @@ -200,9 +203,8 @@ public class PointServiceImpl implements PointService { if(PointStatusEnum.POINT_STATUS_6.getCode().equals(pointInfo.getPointStatus())){ throw new ServiceException(ErrorCodeEnum.POINT_SIGNED); } - pointInfoDAO.recyclePoint(pointId); if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())){ - rollbackSelectPoint(pointInfo.getShopId()); + rollbackSelectPoint(pointInfo.getShopId(), pointInfo.getId()); } //将已选择、已被他人选择的状态更新成待选泽 return pointRecommendDAO.updateRecommendStatusByStatusAndPointId(pointId, PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_1, Arrays.asList(PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_2, PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_3)); @@ -435,7 +437,7 @@ public class PointServiceImpl implements PointService { List wantShopAreaIds = lineList.stream().map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList()); Map recommendShopNumMap = pointRecommendDAO.getPushShopNumMap(lineIds); Map cityMap = hyOpenAreaInfoDAO.getCityMap(wantShopAreaIds); - Map selectedShopNumMap = pointInfoDAO.getSelectedShopNumMap(lineIds); + Map selectedShopNumMap = shopInfoDAO.getSelectedShopNumMap(lineIds); Map userNameMap = enterpriseUserDAO.getUserNameMap(investmentManagerUserIds); Map userPortraitMap = labelService.getUserPortraitMap(userPortraitList); List resultList = LinePointBaseInfoVO.convertList(lineList, userNameMap, userPortraitMap, cityMap, recommendShopNumMap, selectedShopNumMap); From 3db1d9651547b02ceaaab64b4a955f04ab93981b Mon Sep 17 00:00:00 2001 From: guohb Date: Thu, 25 Apr 2024 17:34:44 +0800 Subject: [PATCH 16/18] =?UTF-8?q?feat:=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dao/LinePayDAO.java | 5 ++ .../cool/store/mapper/FranchiseFeeMapper.java | 8 ++ .../com/cool/store/mapper/LinePayMapper.java | 2 + .../resources/mapper/FranchiseFeeMapper.xml | 5 ++ .../main/resources/mapper/LinePayMapper.xml | 16 +++- .../com/cool/store/entity/FranchiseFeeDO.java | 47 +++++++++++ .../java/com/cool/store/entity/LinePayDO.java | 3 + .../store/request/FranchiseFeeRequest.java | 77 +++++++++++++++++++ .../store/request/LinePaySubmitRequest.java | 5 ++ .../store/response/FranchiseFeeResponse.java | 73 ++++++++++++++++++ .../store/service/FranchiseFeeService.java | 20 +++++ .../service/impl/FranchiseFeeServiceImpl.java | 37 +++++++++ .../service/impl/LinePayServiceImpl.java | 52 ++++++++++--- .../webb/PCFranchiseFeeController.java | 33 ++++++++ 14 files changed, 369 insertions(+), 14 deletions(-) create mode 100644 coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java create mode 100644 coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseFeeDO.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseFeeRequest.java create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/FranchiseFeeService.java create mode 100644 coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java create mode 100644 coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseFeeController.java diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LinePayDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LinePayDAO.java index 0756ccac5..422cb4c08 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LinePayDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LinePayDAO.java @@ -27,6 +27,11 @@ public class LinePayDAO { return linePayDO; } + public LinePayDO getLinePayByLineIdAndPayType(Long lineId,Integer payBusinessType) { + LinePayDO linePayDO = linePayMapper.getLinePayByLineIdAndPayType(lineId,payBusinessType); + return linePayDO; + } + public Long addLinePay(LinePayDO linePayDO){ linePayMapper.insertSelective(linePayDO); return linePayDO.getId(); diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java new file mode 100644 index 000000000..e1f2ea8cd --- /dev/null +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java @@ -0,0 +1,8 @@ +package com.cool.store.mapper; + +import com.cool.store.entity.FirstOrderDO; +import com.cool.store.entity.FranchiseFeeDO; +import tk.mybatis.mapper.common.Mapper; + +public interface FranchiseFeeMapper extends Mapper { +} diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java index aa29f55b4..e30a5e8de 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LinePayMapper.java @@ -40,6 +40,8 @@ public interface LinePayMapper { int deleteByPrimaryKey(Long id); LinePayDO getLinePayByLineId(@Param("lineId") Long lineId); + LinePayDO getLinePayByLineIdAndPayType(@Param("lineId") Long lineId, + @Param("payBusinessType")Integer payBusinessType); /** * getLinePayByLineIds diff --git a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml new file mode 100644 index 000000000..5bac3d1d7 --- /dev/null +++ b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml index c17e94300..849df60c3 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml @@ -21,11 +21,12 @@ + id, partner_id, line_id, pay_status, pay_type, pay_user_name, pay_account, bank_code, bank_name, branch_bank_code, branch_bank_name, pay_time, pay_pic, promise_pic, create_time, - update_time, create_user_id, update_user_id, deleted + update_time, create_user_id, update_user_id, deleted,pay_business_type - select * from xfsg_line_pay where line_id = #{lineId} and deleted = '0' + select * + from xfsg_line_pay + where line_id = #{lineId} + and deleted = '0' + + + diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniNewStoreOpeningController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniNewStoreOpeningController.java new file mode 100644 index 000000000..d51a4e7e8 --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniNewStoreOpeningController.java @@ -0,0 +1,42 @@ +package com.cool.store.controller.webc; + +import com.cool.store.response.ResponseResult; +import com.cool.store.service.NewStoreOpeningService; +import com.cool.store.vo.NewStoreOpeningVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author byd + * @Date 2023/6/15 9:49 + * @Version 1.0 + */ +@RestController +@RequestMapping("/mini//newStoreOpening") +@Api(tags = "mini新店开业") +public class MiniNewStoreOpeningController { + + + @Resource + NewStoreOpeningService newStoreOpeningService; + + + @GetMapping(path = "/storeTodoList") + @ApiOperation("新店开业待办列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "shopId", value = "店铺id", required = true) + }) + public ResponseResult> storeTodoList(@RequestParam("shopId") Long shopId) { + return ResponseResult.success(newStoreOpeningService.storeTodoList(shopId)); + } + +} diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOpenAcceptanceInfoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOpenAcceptanceInfoController.java new file mode 100644 index 000000000..8040e5175 --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOpenAcceptanceInfoController.java @@ -0,0 +1,49 @@ +package com.cool.store.controller.webc; + +import com.cool.store.request.OpenAcceptanceRequest; +import com.cool.store.response.ResponseResult; +import com.cool.store.service.OpenAcceptanceInfoService; +import com.cool.store.vo.OpenAcceptanceInfoListVO; +import com.cool.store.vo.ShopAcceptanceVO; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @Author byd + * @Date 2023/6/15 9:49 + * @Version 1.0 + */ +@RestController +@RequestMapping("/mini/openAcceptanceInfo") +@Api(tags = "mini开业验收") +public class MiniOpenAcceptanceInfoController { + + @Resource + OpenAcceptanceInfoService openAcceptanceInfoService; + + @GetMapping(path = "/openAcceptanceList") + @ApiOperation("开业验收列表") + public ResponseResult> openAcceptanceList(OpenAcceptanceRequest openAcceptanceRequest) { + return ResponseResult.success(openAcceptanceInfoService.openAcceptanceList(openAcceptanceRequest)); + } + + @GetMapping(path = "/acceptanceStageList") + @ApiOperation("开业验收阶段结果列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "shopId", value = "店铺id", required = true) + }) + public ResponseResult acceptanceStageList(@RequestParam("shopId") Long shopId) { + return ResponseResult.success(openAcceptanceInfoService.acceptanceStageList(shopId)); + } + + +}