diff --git a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml index bed1f1879..e84b27a2e 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LinePayMapper.xml @@ -23,7 +23,7 @@ - + id,shop_id, partner_id, line_id, pay_status, pay_type, pay_user_name, pay_account, bank_code, diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/DecorationModelDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/DecorationModelDTO.java index 523e58d90..e82de962a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/DecorationModelDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/DecorationModelDTO.java @@ -2,6 +2,8 @@ package com.cool.store.dto.decoration; import lombok.Data; +import java.math.BigDecimal; + /** * @Auther: WangShuo * @Date: 2024/04/28/下午9:33 @@ -10,6 +12,6 @@ import lombok.Data; */ @Data public class DecorationModelDTO { - private String totalAmount; + private BigDecimal totalAmount; private String payUrl; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/LinePayDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/LinePayDO.java index f14efd1ce..7c308bf7c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/LinePayDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/LinePayDO.java @@ -3,6 +3,7 @@ package com.cool.store.entity; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; import lombok.AllArgsConstructor; @@ -82,5 +83,5 @@ public class LinePayDO implements Serializable { @ApiModelProperty("支付类型 0-缴纳意向金 1-缴纳加盟费 2-装修款") private Integer payBusinessType; @ApiModelProperty("缴费金额") - private String amount; + private BigDecimal amount; } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java index e58d83997..82bccaba2 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotNull; +import java.math.BigDecimal; import java.util.Date; @Data @@ -56,5 +57,5 @@ public class LinePaySubmitRequest { @ApiModelProperty("铺位id") private Long shopId; @ApiModelProperty("缴费金额") - private String amount; + private BigDecimal amount; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java index 6b0ca1d5b..4b01bf28d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java @@ -29,14 +29,6 @@ import java.util.List; */ public interface DecorationService { - - /** - * @Auther: wangshuo - * @Date: 2024/5/3 - * @description:获取新店装修阶段的数据/flush - */ - FitmentResponse getFitmentSub(Long shopId); - /** * @Auther: wangshuo * @Date: 2024/4/28 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java index ad1907719..1048c2c17 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java @@ -42,7 +42,12 @@ public interface PreparationService { * @param shopId */ void whetherToOpenForAcceptance(Long shopId); - + /** + * @Auther: wangshuo + * @Date: 2024/5/9 + * @description:装修阶段刷新 + */ + Boolean decorationFlush(Long shopId); } 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 da73d0e65..54b63ca61 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 @@ -45,6 +45,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; @@ -95,35 +97,6 @@ public class DecorationServiceImpl implements DecorationService { private ShopInfoMapper shopInfoMapper; - @Override - public FitmentResponse getFitmentSub(Long shopId) { - FitmentResponse fitmentResponse = new FitmentResponse(); - List stageInfoList = new ArrayList<>(); - //设计 - this.DesignInfo(shopId); - stageInfoList.add(getDecorationStageVOS(shopId, ShopSubStageEnum.SHOP_STAGE_9)); - //装修款 - this.getDecorationModel(shopId, null); - stageInfoList.add(getDecorationStageVOS(shopId, ShopSubStageEnum.SHOP_STAGE_10)); - //施工阶段 - this.getConstructionInfo(shopId); - stageInfoList.add(getDecorationStageVOS(shopId, ShopSubStageEnum.SHOP_STAGE_11)); - fitmentResponse.setStageInfoList(stageInfoList); - return fitmentResponse; - } - - private @NotNull DecorationStageVO getDecorationStageVOS(Long shopId, ShopSubStageEnum shopSubStageEnum) { - ShopStageInfoDO ShopStage = shopStageInfoDAO.getShopSubStageInfo(shopId, shopSubStageEnum); - DecorationStageVO decorationStageVO = new DecorationStageVO(); - decorationStageVO.setShopSubStageStatus(ShopStage.getShopSubStageStatus()); - decorationStageVO.setShopSubStage(ShopStage.getShopSubStage()); - decorationStageVO.setShopSubStageName(shopSubStageEnum.getShopSubStageName()); - decorationStageVO.setCreatTime(ShopStage.getCreateTime()); - decorationStageVO.setPlanEndTime(ShopStage.getPlanCompleteTime()); - decorationStageVO.setActualEndTime(ShopStage.getActualCompleteTime()); - return decorationStageVO; - } - @Override public DesignInfoVo DesignInfo(Long shopId) { DecorationDTO decoration = getDecorationDTO(shopId); @@ -168,7 +141,6 @@ public class DecorationServiceImpl implements DecorationService { ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_100)); } } - return designInfoVo; } @@ -203,7 +175,8 @@ public class DecorationServiceImpl implements DecorationService { String payPic = regionQrcodeConfigDao.getPayPicByRegionId(regionId); DecorationModelDTO decorationModelDTO = new DecorationModelDTO(); decorationModelDTO.setPayUrl(payPic); - decorationModelDTO.setTotalAmount(vzHj); + BigDecimal totalAmount = new BigDecimal(vzHj); + decorationModelDTO.setTotalAmount(totalAmount.setScale(2, RoundingMode.HALF_UP)); return decorationModelDTO; } @@ -233,8 +206,8 @@ public class DecorationServiceImpl implements DecorationService { } else { request.setPayStatus(WorkflowSubStageStatusEnum.PAY_DEPOSIT_45.getCode()); shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_101); - } + request.setPayBusinessType(PayBusinessTypeEnum.DECORATION_MODEL.getCode()); Long payId = linePayService.submitPayInfo(request, partnerUserInfoVO); return payId.toString(); } @@ -243,7 +216,13 @@ public class DecorationServiceImpl implements DecorationService { @Transactional(rollbackFor = Exception.class) public LinePayVO getDecorationModel(Long shopId, PartnerUserInfoVO partnerUserInfoVO) { //获取支付信息 - LinePayVO linePayInfo = linePayService.getLinePayInfo(partnerUserInfoVO.getLineId(), PayBusinessTypeEnum.DECORATION_MODEL.getCode(), shopId); + LinePayVO linePayInfo = new LinePayVO(); + if (Objects.isNull(partnerUserInfoVO)) { + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); + linePayInfo = linePayService.getLinePayInfo(shopInfo.getLineId(), PayBusinessTypeEnum.DECORATION_MODEL.getCode(), shopId); + } else { + linePayInfo = linePayService.getLinePayInfo(partnerUserInfoVO.getLineId(), PayBusinessTypeEnum.DECORATION_MODEL.getCode(), shopId); + } if (Objects.isNull(linePayInfo)) { log.error("LinePayInfo is null"); return null; @@ -263,13 +242,14 @@ public class DecorationServiceImpl implements DecorationService { log.error("拉取云立方接口获取缴费信息为空"); return null; } - String totalAmount = proposedBookBudget.getTotalAmount(); //已完成 if (CollectionUtils.isNotEmpty(decoration.getPayment())) { linePayInfo.setPayStatus((byte) WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode().intValue()); LinePaySubmitRequest submitRequest = new LinePaySubmitRequest(); submitRequest.setLineId(linePayInfo.getLineId()); - submitRequest.setPayStatus(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode().intValue()); + submitRequest.setShopId(shopId); + submitRequest.setPayBusinessType(PayBusinessTypeEnum.DECORATION_MODEL.getCode()); + submitRequest.setPayStatus(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode()); linePayService.submitPayInfo(submitRequest, partnerUserInfoVO); //更新阶段状态 shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_102); @@ -316,7 +296,6 @@ public class DecorationServiceImpl implements DecorationService { Date date = CoolDateUtils.parseDate(approach.getActualBeginDate(), CoolDateUtils.DATE_FORMAT_DAY); acceptanceInfoDO.setActualEntryTime(date); } - //施工完成时间,计划开始和完成时间 // if (StringUtils.isNotEmpty(constructionSage.getActualEndDate())) { Date date = CoolDateUtils.parseDate(constructionSage.getActualEndDate(), CoolDateUtils.DATE_FORMAT_DAY); @@ -499,11 +478,8 @@ public class DecorationServiceImpl implements DecorationService { } } //施工计划完成时间 //施工实际完成实际//验收状态//计划验收时间//验收实际时间 - Map ConstructionScheduleMap = new HashMap<>(); Map ShopStageInfoDOMap = new HashMap<>(); for (Long shopId : ShopIdmap.keySet()) { - ConstructionScheduleDTO constructionInfo = this.getConstructionInfo(shopId); - ConstructionScheduleMap.put(shopId, constructionInfo); ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_12); ShopStageInfoDOMap.put(shopId, shopSubStageInfo); } @@ -528,29 +504,17 @@ public class DecorationServiceImpl implements DecorationService { fitmentCheckVO.setPartnerName(lineInfoDOMap.get(shopInfoDO.getLineId()).getUsername()); } if (shopInfoDO.getId() != null) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - try { - if (StringUtils.isNotEmpty(ConstructionScheduleMap.get(shopInfoDO.getId()).getPlanEndDate())) { - Date PlanEndTime = sdf.parse(ConstructionScheduleMap.get(shopInfoDO.getId()).getPlanEndDate()); - fitmentCheckVO.setPlanEndTime(PlanEndTime); - } - if (StringUtils.isNotEmpty(ConstructionScheduleMap.get(shopInfoDO.getId()).getActualEndDate())) { - Date actualEndDate = sdf.parse(ConstructionScheduleMap.get(shopInfoDO.getId()).getActualEndDate()); - fitmentCheckVO.setActualEndTime(actualEndDate); - } - if (StringUtils.isNotEmpty(ShopStageInfoDOMap.get(shopInfoDO.getId()).getPlanCompleteTime())) { - Date PlanAcceptanceTime = sdf.parse(ShopStageInfoDOMap.get(shopInfoDO.getId()).getPlanCompleteTime()); - fitmentCheckVO.setPlanAcceptanceTime(PlanAcceptanceTime); - } - if (StringUtils.isNotEmpty(ShopStageInfoDOMap.get(shopInfoDO.getId()).getActualCompleteTime())) { - Date ActualCompleteTime = sdf.parse(ShopStageInfoDOMap.get(shopInfoDO.getId()).getActualCompleteTime()); - fitmentCheckVO.setAcceptanceTime(ActualCompleteTime); - } + if (Objects.nonNull(ShopStageInfoDOMap.get(shopInfoDO.getId()))) { + Date PlanEndTime = CoolDateUtils.parseDate(ShopStageInfoDOMap.get(shopInfoDO.getId()).getPlanCompleteTime(), CoolDateUtils.DATE_FORMAT_DAY); + fitmentCheckVO.setPlanEndTime(PlanEndTime); + Date actualEndDate = CoolDateUtils.parseDate(ShopStageInfoDOMap.get(shopInfoDO.getId()).getActualCompleteTime(), CoolDateUtils.DATE_FORMAT_DAY); + fitmentCheckVO.setActualEndTime(actualEndDate); + Date PlanAcceptanceTime = CoolDateUtils.parseDate(ShopStageInfoDOMap.get(shopInfoDO.getId()).getPlanCompleteTime(), CoolDateUtils.DATE_FORMAT_DAY); + fitmentCheckVO.setPlanAcceptanceTime(PlanAcceptanceTime); fitmentCheckVO.setShopSubStageStatus(ShopStageInfoDOMap.get(shopInfoDO.getId()).getShopSubStageStatus()); - } catch (ParseException e) { - log.error("日期转化异常"); + } - } + } fitmentCheckVOList.add(fitmentCheckVO); } pageInfo.setList(fitmentCheckVOList); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java index 44eeb1630..c9b7543f5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java @@ -21,6 +21,7 @@ import com.cool.store.mapper.FranchiseFeeMapper; import com.cool.store.mapper.LineInfoMapper; import com.cool.store.request.LinePaySubmitRequest; import com.cool.store.service.LinePayService; +import com.cool.store.utils.poi.StringUtils; import com.cool.store.utils.poi.constant.Constants; import com.cool.store.vo.LinePayVO; import com.cool.store.vo.PartnerUserInfoVO; @@ -56,9 +57,9 @@ public class LinePayServiceImpl implements LinePayService { ShopStageInfoDAO shopStageInfoDAO; @Override - public LinePayVO getLinePayInfo(Long lineId,Integer businessType,Long shopId) { + public LinePayVO getLinePayInfo(Long lineId, Integer businessType, Long shopId) { LinePayVO result = null; - LinePayDO linePayDO = linePayDAO.getByLineIdAndPayTypeAndShopId(lineId,businessType,shopId); + LinePayDO linePayDO = linePayDAO.getByLineIdAndPayTypeAndShopId(lineId, businessType, shopId); if (linePayDO != null) { result = new LinePayVO(); BeanUtil.copyProperties(linePayDO, result); @@ -71,23 +72,23 @@ public class LinePayServiceImpl implements LinePayService { @Override @Transactional(rollbackFor = Exception.class) - public Long submitPayInfo(LinePaySubmitRequest request, PartnerUserInfoVO partnerUser){ - log.info("submitPayInfo request：{}，partnerUser：{}", JSONObject.toJSONString(request),JSONObject.toJSONString(partnerUser)); + public Long submitPayInfo(LinePaySubmitRequest request, PartnerUserInfoVO partnerUser) { + log.info("submitPayInfo request：{}，partnerUser：{}", JSONObject.toJSONString(request), JSONObject.toJSONString(partnerUser)); LineInfoDO lineInfo = new LineInfoDO(); - if (request.getLineId() != null){ + if (request.getLineId() != null) { lineInfo = lineInfoDAO.getLineInfo(request.getLineId()); } - LinePayDO linePayDO = linePayDAO.getByLineIdAndPayTypeAndShopId(request.getLineId(), request.getPayBusinessType(),request.getShopId()); + LinePayDO linePayDO = linePayDAO.getByLineIdAndPayTypeAndShopId(request.getLineId(), request.getPayBusinessType(), request.getShopId()); Long payId = checkAndFill(linePayDO, request, partnerUser); - if (PayBusinessTypeEnum.FRANCHISE_FEE.getCode().equals(request.getPayBusinessType()) && payId != null){ + if (PayBusinessTypeEnum.FRANCHISE_FEE.getCode().equals(request.getPayBusinessType()) && payId != null) { FranchiseFeeDO franchiseFeeDO = franchiseFeeMapper.selectByShopId(request.getShopId()); - if (Objects.isNull(franchiseFeeDO)){ + if (Objects.isNull(franchiseFeeDO)) { throw new ServiceException(ErrorCodeEnum.UNISSUED_STATEMENT); } franchiseFeeDO.setPayId(payId); franchiseFeeMapper.updateByPrimaryKeySelective(franchiseFeeDO); } - if (PayBusinessTypeEnum.INTENT_MONEY.getCode().equals(request.getPayBusinessType())){ + if (PayBusinessTypeEnum.INTENT_MONEY.getCode().equals(request.getPayBusinessType())) { lineInfo.setWorkflowSubStage(WorkflowSubStageEnum.PAY_DEPOSIT.getCode()); lineInfo.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode()); lineInfoDAO.insertOrUpdate(lineInfo); @@ -98,13 +99,12 @@ public class LinePayServiceImpl implements LinePayService { private Long checkAndFill(LinePayDO linePayDO, LinePaySubmitRequest request, PartnerUserInfoVO partnerUser) { - if (Objects.isNull(linePayDO)){ + if (Objects.isNull(linePayDO)) { linePayDO = new LinePayDO(); fillLinePay(Boolean.TRUE, linePayDO, request, partnerUser); Long aLong = linePayDAO.addLinePay(linePayDO); return aLong; - } - else { + } else { fillLinePay(Boolean.FALSE, linePayDO, request, partnerUser); linePayDAO.updateLinePay(linePayDO); return null; @@ -124,7 +124,7 @@ public class LinePayServiceImpl implements LinePayService { linePayDO.setPromisePic(request.getPromisePic()); linePayDO.setPayStatus(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode()); linePayDO.setPayBusinessType(request.getPayBusinessType()); - if (Objects.nonNull(request.getShopId())){ + if (Objects.nonNull(request.getShopId())) { linePayDO.setShopId(request.getShopId()); } if (isAdd) { @@ -135,7 +135,9 @@ public class LinePayServiceImpl implements LinePayService { linePayDO.setDeleted(false); } else { linePayDO.setUpdateTime(new Date()); - linePayDO.setUpdateUserId(partnerUser.getPartnerId()); + if (Objects.nonNull(partnerUser)) { + linePayDO.setUpdateUserId(partnerUser.getPartnerId()); + } } linePayDO.setAmount(request.getAmount()); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java index 75e4f18d6..1aaf7cc68 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java @@ -57,15 +57,13 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { @Resource private RegionService regionService; @Resource - private SysRoleService sysRoleService; - @Resource - private UserAuthMappingService userAuthMappingService; - @Resource private ShopInfoDAO shopInfoDAO; @Resource private CoolStoreStartFlowService coolStoreStartFlowService; @Resource private LineInfoDAO lineInfoDAO; + @Resource + private ShopService shopService; @Override @Transactional(rollbackFor = Exception.class) @@ -120,9 +118,8 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { String preparationUserIds = openingOperationPlanDO.getPreparationUserIds(); List stream = Arrays.stream(preparationUserIds.split(CommonConstants.COMMA)).collect(Collectors.toList()); List nameByUserId = enterpriseUserDAO.getNameByUserId(stream); - //TODO getname方法 - EnterpriseUserDO username = enterpriseUserDAO.getUserInfoById(openingOperationPlanDO.getSubmittedUserId()); - openingOperationPlanVO.setSubmittedUserName(username.getName()); + String userName = enterpriseUserDAO.getUserName(openingOperationPlanDO.getSubmittedUserId()); + openingOperationPlanVO.setSubmittedUserName(userName); openingOperationPlanVO.setPreparationUsers(nameByUserId); ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); openingOperationPlanVO.setShopName(shopInfo.getShopName()); @@ -196,16 +193,15 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { } @Override + @Transactional(rollbackFor = Exception.class) public Boolean flush(Long shopId) { ShopStageInfoDO orderStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_15); try { - if (orderStageInfo.getShopSubStageStatus(). - equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus())) { - //TODO 调试接口 - // ShopInfoDO shopInfo = shopService.getShopInfo(shopId); - // String shopCode = shopInfo.getShopCode(); - // Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode); - Boolean firstOrder = Boolean.TRUE; + if (!ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus(). + equals(orderStageInfo.getShopSubStageStatus())) { + ShopInfoDO shopInfo = shopService.getShopInfo(shopId); + String shopCode = shopInfo.getShopCode(); + Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode); log.info("saveOrder,flag:{}", firstOrder); if (firstOrder) { //更改子阶段状态 @@ -214,11 +210,12 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { preparationService.whetherToOpenForAcceptance(shopId); } } + return Boolean.TRUE; } catch (Exception e) { - log.error("获取鲜丰订货金异常", e); - return Boolean.FALSE; + log.error("获取鲜丰订货金异常或更新状态失败"); + throw new ServiceException(ErrorCodeEnum.YLF_ERROR); } - return Boolean.TRUE; + } 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 7c83a4fb5..c4c5f25e3 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 @@ -33,6 +33,7 @@ import javax.annotation.Resource; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -62,7 +63,8 @@ public class PreparationServiceImpl implements PreparationService { LineInfoDAO lineInfoDAO; @Resource private AcceptanceInfoDAO acceptanceInfoDAO; - + @Resource + private DecorationService decorationService; @Override public PageInfo getPreparationSchedule(PreparationRequest request) { @@ -215,5 +217,29 @@ public class PreparationServiceImpl implements PreparationService { } } + @Override + public Boolean decorationFlush(Long shopId) { + List shopStageInfo = shopStageInfoDAO.getShopStageInfo(shopId, ShopStageEnum.SHOP_STAGE_2.getShopStage()); + Map collect = shopStageInfo.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopSubStage, Function.identity())); + //设计 + if (!ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_91.getShopSubStageStatus(). + equals(collect.get(ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage()).getShopSubStageStatus())) { + decorationService.DesignInfo(shopId); + } + //装修款 + if (!ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_102.getShopSubStageStatus(). + equals(collect.get(ShopSubStageEnum.SHOP_STAGE_10.getShopSubStage()).getShopSubStageStatus())) { + decorationService.getDecorationModel(shopId, null); + } + //施工阶段 + if (!ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_112.getShopSubStageStatus(). + equals(collect.get(ShopSubStageEnum.SHOP_STAGE_11.getShopSubStage()).getShopSubStageStatus())) { + decorationService.getConstructionInfo(shopId); + } + return Boolean.TRUE; + } + + + } 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 ff968b56c..c1d3b391a 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 @@ -11,6 +11,7 @@ import com.cool.store.response.FitmentResponse; import com.cool.store.response.ResponseResult; import com.cool.store.response.ThreeSignResponse; import com.cool.store.service.DecorationService; +import com.cool.store.service.PreparationService; import com.cool.store.vo.Fitment.DecorationModelVO; import com.cool.store.vo.Fitment.DesignInfoVo; import com.cool.store.vo.LinePayVO; @@ -39,10 +40,12 @@ import java.util.List; public class PCDecorationController { @Resource private DecorationService decorationService; - @ApiOperation("获取新店装修子阶段信息") - @GetMapping("/getFitmentSub") - public ResponseResult getFitmentSub(@RequestParam Long shopId) { - return ResponseResult.success(decorationService.getFitmentSub(shopId)); + @Resource + private PreparationService preparationService; + @ApiOperation("获取新店装修flush") + @GetMapping("/flush") + public ResponseResult getFitmentSub(@RequestParam Long shopId) { + return ResponseResult.success(preparationService.decorationFlush(shopId)); } @ApiOperation("获取设计子阶段信息") @GetMapping("/designSub") diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java index 9400e964b..a1f748e49 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java @@ -42,11 +42,6 @@ public class MiniDecorationController { private DecorationService decorationService; @Resource private AssessmentTemplateService assessmentTemplateService; - @ApiOperation("获取新店装修下阶段的数据/flush") - @GetMapping("/getFitmentSub") - public ResponseResult getFitmentSub(@RequestParam Long shopId) { - return ResponseResult.success(decorationService.getFitmentSub(shopId)); - } @ApiOperation("获取设计阶段子阶段信息") @GetMapping("/designSub") public ResponseResult getDesign(@RequestParam Long shopId){ diff --git a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java index af3242265..0b5666b30 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java @@ -212,7 +212,6 @@ public class XxlJobHandler { LocalDate localDate = instant.atZone(zone).toLocalDate(); LocalDate datePlusFiveDays = localDate.plusDays(CommonConstants.FOUR); // 添加5天 LocalDate now = LocalDate.now(); - //TODO 时间问题 if (datePlusFiveDays.equals(now)) { shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_120); }