diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index d8e5dcc57..8b7a65ec4 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -192,6 +192,8 @@ public enum ErrorCodeEnum { TIME_NULL_FALSE(109013, "有时间为空", null), + UNISSUED_STATEMENT_2(109014, "该门店已发布账单", null), + INSERT_OPENING_OPERATION_PLAN_AUDIT_FALSE(103001,"插入运营方案审核信息失败",null), INSERT_OPENING_OPERATION_PLAN_FALSE(103002,"插入运营方案失败",null), diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java index 4da5a0baa..c6c7fdbc2 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java @@ -123,11 +123,6 @@ public enum MessageEnum { return "dingtalk://dingtalkclient/action/open_micro_app?appId=" + appId + "&corpId=" + corpId + "&page=" + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=franchiseeDetails×tamp=" + System.currentTimeMillis() + "&lineId=" + paramMap.get("lineId"), StandardCharsets.UTF_8.name()); case MESSAGE_15: - case MESSAGE_16: - case MESSAGE_18: - case MESSAGE_19: - case MESSAGE_20: - case MESSAGE_23: case MESSAGE_10_1: case MESSAGE_31: case MESSAGE_32: @@ -135,9 +130,6 @@ public enum MessageEnum { //跳转我的加盟商的加盟商详情都可以使用这个 return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=franchiseeDetails×tamp=" + System.currentTimeMillis() + "&lineId=" + paramMap.get("lineId"), StandardCharsets.UTF_8.name()); - case MESSAGE_17: - return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" + - URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=license×tamp=" + System.currentTimeMillis() + "&shopId=" + paramMap.get("shopId"), StandardCharsets.UTF_8.name()); case MESSAGE_21: return domainUrl + "/dd-noticemsg?appId="+appId+"&corpId="+corpId+"&page=" + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=employeeTraining×tamp="+System.currentTimeMillis()+"&userDetailId="+ paramMap.get("userDetailId"), StandardCharsets.UTF_8.name()); @@ -159,7 +151,20 @@ public enum MessageEnum { case MESSAGE_28: return "dingtalk://dingtalkclient/action/open_micro_app?appId="+appId+"&corpId="+corpId+"&page=" + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=eyeAcceptance×tamp="+System.currentTimeMillis()+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name()); - + case MESSAGE_16: + return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" + + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=sysStoreSchedule×tamp=" + System.currentTimeMillis() +"&lineId="+ paramMap.get("lineId")+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name()); + case MESSAGE_17: + return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" + + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=licenseSchedule×tamp=" + System.currentTimeMillis() +"&lineId="+ paramMap.get("lineId")+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name()); + case MESSAGE_18: + case MESSAGE_23: + return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" + + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=franchiseeSchedule×tamp=" + System.currentTimeMillis() +"&lineId="+ paramMap.get("lineId")+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name()); + case MESSAGE_19: + case MESSAGE_20: + return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId=" + corpId + "&appUrl=" + + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=contractSchedule×tamp=" + System.currentTimeMillis() +"&lineId="+ paramMap.get("lineId")+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name()); default: return ""; } diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java index 786b21fa2..93423cb2e 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java @@ -33,6 +33,7 @@ public enum SMSMsgEnum { FRANCHISE_FEE_NOT_PASS("缴纳加盟费缴纳失败", "", "SMS_465896262"), DECORATION_MODEL_PAY("装修款待缴费", "","SMS_465961253"), THREE_ACCEPTANCE_WAIT("三方验收待验收","","SMS_465961257"), + FIRST_ORDER("首批订货金代缴费","","SMS_467585281"), TRAINING_REGISTER_SUCCESS("培训登记中", "", "SMS_466035101"), TRAINING_ASSESSMENT_SUCCESS("员工培训已完成", "", "SMS_465901266"), diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java index a15b93363..fade44b4f 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java @@ -108,12 +108,12 @@ public class LineInfoDAO { List lineInfo = lineInfoMapper.listByInvestmentManager(investmentManagerUserId,subStageStatus); return lineInfo; } - public List listByInterview(String interviewId, Integer interviewType,Integer pendingInterviewStatus, + public List listByInterview(String interviewId, Integer interviewType,List pendingInterviewStatusList, Integer notPassingTheInterview,List subStageStatus) { if (StringUtils.isBlank(interviewId)){ return null; } - List lineInfo = lineInfoMapper.listByInterview(interviewId,interviewType,pendingInterviewStatus,notPassingTheInterview,subStageStatus); + List lineInfo = lineInfoMapper.listByInterview(interviewId,interviewType,pendingInterviewStatusList,notPassingTheInterview,subStageStatus); return lineInfo; } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java index f83873167..8eeea8f33 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/LineInfoMapper.java @@ -35,7 +35,7 @@ public interface LineInfoMapper extends Mapper { */ List listByInterview(@Param("interviewId") String interviewId, @Param("interviewType") Integer interviewType, - @Param("pendingInterviewStatus") Integer pendingInterviewStatus, + @Param("pendingInterviewStatusList") List pendingInterviewStatusList, @Param("notPassingTheInterview") Integer notPassingTheInterview, @Param("codes") List codes); diff --git a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml index 223b49db0..f5df125cd 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml @@ -6,5 +6,7 @@ select * from xfsg_franchise_fee where shop_id = #{shopId} + order by create_time desc + limit 1 \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index 170543761..84834535c 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -335,8 +335,10 @@ #{code} - - and ((workflow_sub_stage_status = #{pendingInterviewStatus} + + + #{status} + and first_interviewer = #{interviewId} @@ -377,7 +379,7 @@ sum( IF ( investment_manager = #{userId} AND workflow_sub_stage = 15, 1, 0 ) ) AS payStageCount, sum( IF ( investment_manager = #{userId} AND workflow_sub_stage = 20, 1, 0 ) ) AS signingCount, sum( IF ( investment_manager = #{userId} AND workflow_sub_stage = 25, 1, 0 ) ) AS storeExperienceCount, - sum( IF ( investment_manager = #{userId} AND workflow_sub_stage = 30, 1, 0 ) ) AS secondInterviewCount + sum( IF ( investment_manager = #{userId} AND workflow_sub_stage = 30 and workflow_stage =1, 1, 0 ) ) AS secondInterviewCount FROM xfsg_line_info where deleted = 0 and line_status = 1 and investment_manager = #{userId} diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml index 66c2cbf29..d65cb27c8 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml @@ -176,7 +176,7 @@ xfsg_shop_stage_info a inner join xfsg_line_info b on a.line_id = b.id where - a.shop_sub_stage = #{shopSubStage} and a.shop_sub_stage_status = #{shopSubStageStatus} and a.deleted = 0 and b.deleted = 0 and b.investment_manager = #{userId} + a.shop_sub_stage = #{shopSubStage} and a.shop_sub_stage_status = #{shopSubStageStatus} and a.deleted = 0 and b.deleted = 0 and b.development_manager = #{userId} diff --git a/coolstore-partner-dao/src/main/resources/mapper/ThirdDepartmentMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ThirdDepartmentMapper.xml index 71f8d4b3a..32dfd5381 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ThirdDepartmentMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ThirdDepartmentMapper.xml @@ -107,6 +107,7 @@ SELECT FROM third_department_${enterpriseId} WHERE department_name = #{name} + limit 1 \ No newline at end of file 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 75b391a16..62b8051a3 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 @@ -179,10 +179,10 @@ public class SubmitLicenseResponse { submitLicenseResponse.setLicenseLegalPerson(storeDocument.getStoreDirector()); submitLicenseResponse.setIssueTime(DateUtil.parseDate(storeDocument.getStoreBusinessDate())); submitLicenseResponse.setLicenseAddress(storeDocument.getStoreBusinessAdd()); - submitLicenseResponse.setValidity(storeBusinessValidPeriod ? null : DateUtil.parseTime(storeDocument.getStoreBusinessValidPeriod())); + submitLicenseResponse.setValidity(storeBusinessValidPeriod ? null : DateUtil.parse(storeDocument.getStoreBusinessValidPeriod(),"yyyy-MM-dd")); submitLicenseResponse.setValidityType(storeBusinessValidPeriod ? 0 : 1); - submitLicenseResponse.setOperator(storeDocument.getStoreDirector()); - submitLicenseResponse.setFoodLicenseLegalPerson(storeDocument.getStoreFoodLicenseOperatorName()); + submitLicenseResponse.setOperator(storeDocument.getStoreFoodLicenseOperatorName()); + submitLicenseResponse.setFoodLicenseLegalPerson(storeDocument.getStoreFoodLicenseLegalRepresentative()); submitLicenseResponse.setMainBusiness(storeDocument.getStoreFoodLicenseMainBusiness()); submitLicenseResponse.setBusinessProject(storeDocument.getStoreFoodLicenseBusinessScope()); submitLicenseResponse.setRemark(storeDocument.getStoreRemark()); 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 7aa4443d7..59fc74506 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 @@ -111,6 +111,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { requestMap.put("storeName", shopInfoDO.getShopName()); requestMap.put("partnerName", lineInfoDO.getUsername()); requestMap.put("partnerMobile", lineInfoDO.getMobile()); + requestMap.put("lineId", String.valueOf(lineInfoDO.getId())); log.info("submitLicense SMS requestMap:{}", JSONObject.toJSONString(requestMap)); List sendUsers = new ArrayList<>(); //如果没有督导，则发送给管辖此区域的所有战区经理 @@ -190,10 +191,10 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { submitLicenseResponse.setLicenseLegalPerson(storeDocument.getStoreDirector()); submitLicenseResponse.setIssueTime(DateUtil.parseDate(storeDocument.getStoreBusinessDate())); submitLicenseResponse.setLicenseAddress(storeDocument.getStoreBusinessAdd()); - submitLicenseResponse.setValidity(storeBusinessValidPeriod ? null : DateUtil.parseTime(storeDocument.getStoreBusinessValidPeriod())); + submitLicenseResponse.setValidity(storeBusinessValidPeriod ? null : DateUtil.parse(storeDocument.getStoreBusinessValidPeriod(),"yyyy-MM-dd")); submitLicenseResponse.setValidityType(storeBusinessValidPeriod ? 0 : 1); submitLicenseResponse.setOperator(storeDocument.getStoreDirector()); - submitLicenseResponse.setFoodLicenseLegalPerson(storeDocument.getStoreFoodLicenseOperatorName()); + submitLicenseResponse.setFoodLicenseLegalPerson(storeDocument.getStoreFoodLicenseLegalRepresentative()); submitLicenseResponse.setMainBusiness(storeDocument.getStoreFoodLicenseMainBusiness()); submitLicenseResponse.setBusinessProject(storeDocument.getStoreFoodLicenseBusinessScope()); submitLicenseResponse.setRemark(storeDocument.getStoreRemark()); 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 9f8f2a12e..355c54c6e 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 @@ -302,13 +302,15 @@ public class DecorationServiceImpl implements DecorationService { shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_130); //发送给品牌设计经理 EnterpriseUserDO enterpriseUser = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.DESIGN_MANAGER, lineInfo.getWantShopAreaId()); - Map messageMap = new HashMap<>(); - messageMap.put("storeName",shopInfo.getShopName()); - messageMap.put("shopId",String.valueOf(shopId)); - messageMap.put("shopName",shopInfo.getShopName()); - messageMap.put("partnerUsername",lineInfo.getUsername()); - messageMap.put("partnerMobile",lineInfo.getMobile()); - commonService.sendMessage(Arrays.asList(enterpriseUser.getUserId()), MessageEnum.MESSAGE_28, messageMap); + if (Objects.nonNull(enterpriseUser)){ + Map messageMap = new HashMap<>(); + messageMap.put("storeName",shopInfo.getShopName()); + messageMap.put("shopId",String.valueOf(shopId)); + messageMap.put("shopName",shopInfo.getShopName()); + messageMap.put("partnerUsername",lineInfo.getUsername()); + messageMap.put("partnerMobile",lineInfo.getMobile()); + commonService.sendMessage(Arrays.asList(enterpriseUser.getUserId()), MessageEnum.MESSAGE_28, messageMap); + } } ConstructionScheduleDTO withdrawal = constructionScheduleDTO; if (Objects.nonNull(acceptanceInfoDO)) { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 56babcf19..17b191d0e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -114,7 +114,7 @@ public class DeskServiceImpl implements DeskService { public PageInfo firstInterviewPendingList(Integer pageNum, Integer pageSize, LoginUserInfo userInfo) { PageHelper.startPage(pageNum, pageSize); List lineInfoDOS = lineInfoDAO.listByInterview(userInfo.getUserId(),InterviewTypeEnum.INTERVIEW.getCode(), - WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_30.getCode(),WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_40.getCode(),null); + Arrays.asList(WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_30.getCode(),WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_35.getCode()),WorkflowSubStageStatusEnum.FIRST_INTERVIEWS_40.getCode(),null); PageInfo page = new PageInfo(lineInfoDOS); Map userPortraitMap = this.getUserPortraitMap(lineInfoDOS); List wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList()); @@ -147,7 +147,7 @@ public class DeskServiceImpl implements DeskService { public PageInfo secondInterviewPendingList(Integer pageNum, Integer pageSize, LoginUserInfo userInfo) { PageHelper.startPage(pageNum, pageSize); List lineInfoDOS = lineInfoDAO.listByInterview(userInfo.getUserId(),InterviewTypeEnum.SECOND_INTERVIEW.getCode(), - WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_105.getCode(), WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_115.getCode(),null); + Arrays.asList(WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_105.getCode(),WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_110.getCode()), WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_115.getCode(),null); PageInfo page = new PageInfo(lineInfoDOS); Map userPortraitMap = this.getUserPortraitMap(lineInfoDOS); List wantShopAreaIds = lineInfoDOS.stream().filter(lineInfoDO -> lineInfoDO.getWantShopAreaId() != null).map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java index 2de20dc94..24546ef28 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java @@ -6,12 +6,15 @@ import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.EnterpriseUserDAO; import com.cool.store.dao.FirstOrderDAO; +import com.cool.store.dao.LineInfoDAO; import com.cool.store.dao.ShopStageInfoDAO; import com.cool.store.dto.openPreparation.FirstOrderDTO; import com.cool.store.entity.FirstOrderDO; +import com.cool.store.entity.LineInfoDO; import com.cool.store.entity.ShopInfoDO; import com.cool.store.entity.ShopStageInfoDO; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.SMSMsgEnum; import com.cool.store.enums.point.ShopSubStageEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; @@ -29,6 +32,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.lang.reflect.InvocationTargetException; import java.util.Date; +import java.util.HashMap; +import java.util.Map; import java.util.Objects; @@ -46,6 +51,8 @@ public class FirstOrderServiceImp implements FirstOrderService { @Resource private PreparationService preparationService; @Resource + private CommonService commonService; + @Resource private ShopService shopService; @Resource private ShopStageInfoDAO shopStageInfoDAO; @@ -53,6 +60,9 @@ public class FirstOrderServiceImp implements FirstOrderService { private CoolStoreStartFlowService coolStoreStartFlowService; @Resource private EnterpriseUserDAO enterpriseUserDAO; + @Resource + private LineInfoDAO lineInfoDAO; + @Override public Integer saveOrder(FirstOrderRequest request, LoginUserInfo user) { log.info("save order:{}", JSONObject.toJSONString(request)); @@ -84,10 +94,15 @@ public class FirstOrderServiceImp implements FirstOrderService { } shopStageInfoDAO.updateShopStageInfo(order.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152); + //发送消息至加盟商 + ShopInfoDO shopInfo = shopService.getShopInfo(order.getShopId()); + LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId()); + Map messageMap =new HashMap<>(); + messageMap.put("totalOrderDeposit",request.getTotalOrderDeposit()); + commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.FIRST_ORDER, messageMap); //云立方同步 if (num > 0) { try { - ShopInfoDO shopInfo = shopService.getShopInfo(order.getShopId()); String storeNum = shopInfo.getStoreNum(); Boolean flag = coolStoreStartFlowService.getFirstOrder(storeNum); log.info("saveOrder,flag:{}", flag); @@ -106,6 +121,7 @@ public class FirstOrderServiceImp implements FirstOrderService { } return num; } + @Transactional(rollbackFor = Exception.class) @Override public FirstOrderDTO getOrder(Long shopId) { @@ -116,12 +132,11 @@ public class FirstOrderServiceImp implements FirstOrderService { } FirstOrderDTO order = firstOrderDAO.selectFirstOrderByShopId(shopId); ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_15); - if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())) - { + if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())) { String userName = enterpriseUserDAO.getUserName(order.getCreateUserId()); order.setPartnerName(userName); - order.setFirstOrderSubStage( ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus()); + order.setFirstOrderSubStage(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus()); return order; } if (Objects.nonNull(order)) { @@ -140,9 +155,9 @@ public class FirstOrderServiceImp implements FirstOrderService { //更改子阶段状态 shopStageInfoDAO.updateShopStageInfo(order.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151); - order.setFirstOrderSubStage( ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus()); + order.setFirstOrderSubStage(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus()); preparationService.whetherToOpenForAcceptance(order.getShopId()); - }else { + } else { order.setFirstOrderSubStage(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus()); } } catch (Exception e) { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java index 24e7d9a30..4c3299a7c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java @@ -59,6 +59,10 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { franchiseFeeDO.setId(request.getId()); franchiseFeeMapper.updateByPrimaryKeySelective(franchiseFeeDO); } else { + FranchiseFeeDO isExist = franchiseFeeMapper.selectByShopId(request.getShopId()); + if (Objects.nonNull(isExist)){ + throw new ServiceException(ErrorCodeEnum.UNISSUED_STATEMENT_2); + } franchiseFeeMapper.insertSelective(franchiseFeeDO); } ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(request.getShopId()); @@ -69,9 +73,7 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { @Override public FranchiseFeeResponse getDetail(Long shopId) { - FranchiseFeeDO franchiseFeeDO = new FranchiseFeeDO(); - franchiseFeeDO.setShopId(shopId); - FranchiseFeeDO result = franchiseFeeMapper.selectOne(franchiseFeeDO); + FranchiseFeeDO result = franchiseFeeMapper.selectByShopId(shopId); if (Objects.isNull(result)){ return new FranchiseFeeResponse(); } @@ -116,6 +118,7 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { requestMap.put("partnerName", lineInfo.getUsername()); requestMap.put("partnerMobile", lineInfo.getMobile()); requestMap.put("lineId", String.valueOf(lineInfo.getId())); + requestMap.put("shopId", String.valueOf(shopInfoDO.getId())); commonService.sendMessage(Collections.singletonList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_19, requestMap); } else if (Constants.ONE_INTEGER.equals(request.getStatus())) { shopAuditInfoDO.setRejectReason(request.getResult()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index 07a39a9cb..23301a940 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -65,7 +65,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(request.getLineId()); log.info("lineInfoDO : {}", JSONObject.toJSONString(lineInfoDO)); if (!Objects.isNull(lineInfoDO) && (WorkflowSubStageStatusEnum.INTENT_5.getCode().equals(lineInfoDO.getWorkflowSubStageStatus())|| - WorkflowSubStageEnum.INTEND.getCode() requestMap = new HashMap<>(); - requestMap.put("partnerName",lineInfo.getUsername()); - requestMap.put("partnerMobile",lineInfo.getMobile()); - requestMap.put("lineId",String.valueOf(lineInfo.getId())); - commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_23,requestMap); } return lineInterviewDAO.updateInterviewInfo(updateInterviewInfo) > 0; } 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 4f6042c75..3044faf77 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 @@ -103,6 +103,7 @@ public class LinePayServiceImpl implements LinePayService { requestMap.put("partnerName",lineInfo.getUsername()); requestMap.put("partnerMobile",lineInfo.getMobile()); requestMap.put("lineId",String.valueOf(lineInfo.getId())); + requestMap.put("shopId",String.valueOf(shopInfoDO.getId())); commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_18,requestMap); } if (PayBusinessTypeEnum.INTENT_MONEY.getCode().equals(request.getPayBusinessType())) { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OSSServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OSSServiceImpl.java index 5c89bb197..e0230e857 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OSSServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OSSServiceImpl.java @@ -1,5 +1,6 @@ package com.cool.store.service.impl; +import cn.hutool.core.date.DateUtil; import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; import com.aliyun.oss.common.utils.BinaryUtil; @@ -9,6 +10,7 @@ import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.exception.ServiceException; import com.cool.store.response.ResponseResult; import com.cool.store.service.OSSService; +import com.cool.store.utils.poi.DateUtils; import com.cool.store.vo.oss.OssUploadConfigVO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -57,7 +59,8 @@ public class OSSServiceImpl implements OSSService { byte[] binaryData = postPolicy.getBytes("utf-8"); String encodedPolicy = BinaryUtil.toBase64String(binaryData); String signature = client.calculatePostSignature(postPolicy); - OssUploadConfigVO result = new OssUploadConfigVO(accessKeyId, encodedPolicy, signature, dir, host, String.valueOf(expireEndTime / 1000), cdnUrl); + String time = DateUtil.format(new Date(), "yyMM") + "/"; + OssUploadConfigVO result = new OssUploadConfigVO(accessKeyId, encodedPolicy, signature, dir + time, host, String.valueOf(expireEndTime / 1000), cdnUrl); return result; }catch (Exception e){ log.info("exception", e); 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 166082a5d..821d0d6d0 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 @@ -910,7 +910,7 @@ public class PointServiceImpl implements PointService { messageMap.put("lineId", String.valueOf(lineInfo.getId())); messageMap.put("partnerUsername", lineInfo.getUsername()); messageMap.put("submitTime", DateUtils.parseDateToStr(DateUtils.NOTICE_DATE, new Date())); - commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_15, messageMap); + commonService.sendMessage(Arrays.asList(lineInfo.getDevelopmentManager()), MessageEnum.MESSAGE_15, messageMap); return shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_21); } @@ -943,8 +943,12 @@ public class PointServiceImpl implements PointService { if(!ShopStageEnum.SHOP_STAGE_1.getShopStage().equals(shopInfo.getShopStage())){ throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE); } - Long auditId = shopAuditInfoDAO.addAuditInfo(AuditRentContractRequest.convert(request, AuditTypeEnum.UPLOAD_RENT_CONTRACT)); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId()); + if(!request.getOperateUserId().equals(lineInfo.getDevelopmentManager())){ + throw new ServiceException(ErrorCodeEnum.NO_PERMISSION); + } + Long auditId = shopAuditInfoDAO.addAuditInfo(AuditRentContractRequest.convert(request, AuditTypeEnum.UPLOAD_RENT_CONTRACT)); + ShopSubStageStatusEnum subStageStatus = AuditResultTypeEnum.PASS.getCode().equals(request.getResultType()) ? ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_23 : ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_22; if(AuditResultTypeEnum.REJECT.getCode().equals(request.getResultType())){ commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.RENT_CONTRACT_AUDIT_FAIL, null); @@ -973,6 +977,7 @@ public class PointServiceImpl implements PointService { requestMap.put("partnerName",lineInfo.getUsername()); requestMap.put("partnerMobile",lineInfo.getMobile()); requestMap.put("lineId",String.valueOf(lineInfo.getId())); + requestMap.put("shopId",String.valueOf(shopId)); if (Objects.nonNull(shopInfo.getShopName())) { requestMap.put("storeName",shopInfo.getShopName()); commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16,requestMap); @@ -997,7 +1002,7 @@ public class PointServiceImpl implements PointService { messageMap.put("lineId", String.valueOf(lineInfo.getId())); messageMap.put("partnerUsername", lineInfo.getUsername()); messageMap.put("submitTime", DateUtils.parseDateToStr(DateUtils.NOTICE_DATE, new Date())); - commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_15, messageMap); + commonService.sendMessage(Arrays.asList(lineInfo.getDevelopmentManager()), MessageEnum.MESSAGE_15, messageMap); } return shopRentInfoDAO.updateRentContract(shopRentInfo); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index de121ae07..854d21c64 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -3,6 +3,7 @@ package com.cool.store.service.impl; import com.cool.store.dao.*; import com.cool.store.entity.*; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.MessageEnum; import com.cool.store.enums.SMSMsgEnum; import com.cool.store.enums.point.*; import com.cool.store.exception.ServiceException; @@ -17,10 +18,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -70,7 +68,16 @@ public class ShopServiceImpl implements ShopService { } shopInfoDAO.batchAddShop(addShopList); List shopIds = addShopList.stream().map(ShopInfoDO::getId).collect(Collectors.toList()); - return shopStageInfoDAO.initShopStageInfo(lineInfo.getId(), shopIds); + Integer result = shopStageInfoDAO.initShopStageInfo(lineInfo.getId(), shopIds); + Map requestMap = new HashMap<>(); + for (Long shopId : shopIds) { + requestMap.put("partnerName",lineInfo.getUsername()); + requestMap.put("partnerMobile",lineInfo.getMobile()); + requestMap.put("lineId",String.valueOf(lineInfo.getId())); + requestMap.put("shopId",String.valueOf(shopId)); + commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_23,requestMap); + } + return result; } @Override diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index cd0a2eaaa..e599d8c91 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -105,6 +105,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu requestMap.put("partnerName", lineInfo.getUsername()); requestMap.put("partnerMobile", lineInfo.getMobile()); requestMap.put("lineId", String.valueOf(lineInfo.getId())); + requestMap.put("shopId", String.valueOf(shopInfoDO.getId())); commonService.sendMessage(Collections.singletonList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_20, requestMap); } else if (Constants.ONE_INTEGER.equals(request.getAuditResult())) { shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java index 6159ee6e7..329db143c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java @@ -46,10 +46,16 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr @Resource EnterpriseUserRoleMapper enterpriseUserRoleMapper; + @Resource + UserAuthMappingMapper userAuthMappingMapper; + @Resource private CommonService commonService; + @Resource + RegionMapper regionMapper; + @Override @Transactional(rollbackFor = Exception.class) public boolean distribution(TrainingExperienceDistributionRequest request) { @@ -121,6 +127,7 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr List roleNames = new ArrayList<>(); roleNames.add("加盟店店长"); roleNames.add("加盟店储备店长"); + roleNames.add("店长"); LeaseBaseInfoDO leaseBaseInfoDO = trainingExperienceMapper.selectByLineId(lineId); if (Objects.isNull(leaseBaseInfoDO)) { @@ -136,10 +143,18 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr } List xfStoreManager = sysRoleMapper.getXFStoreManager(roleNames); List roleIds = xfStoreManager.stream().map(SysRoleDO::getId).collect(Collectors.toList()); + //店长角色的用户id List userIdsByRoleIdList = enterpriseUserRoleMapper.getUserIdsByRoleIdList(roleIds); - List userInfoByUserIds = enterpriseUserMapper.getUserInfoByUserIds(userIdsByRoleIdList); - String storeManagers = userInfoByUserIds.stream().map(EnterpriseUserDO::getName).collect(Collectors.toList()).toString(); - leaseBaseInfoDO.setStoreManager(storeManagers); + //当前门店 + RegionDO storeRegion = regionMapper.getRegionByStoreId(leaseBaseInfoDO.getStoreId()); + //权限 + List userIdsByMappingIds = userAuthMappingMapper.getUserIdsByMappingIds(Collections.singletonList(storeRegion.getRegionId())); + //过滤 + userIdsByMappingIds.retainAll(userIdsByRoleIdList); + //用户 + List userInfoByUserIds = enterpriseUserMapper.getUserInfoByUserIds(userIdsByMappingIds); + String nameList = userInfoByUserIds.stream().map(EnterpriseUserDO::getName).collect(Collectors.toList()).toString(); + leaseBaseInfoDO.setStoreManager(nameList); return leaseBaseInfoDO; } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java index 157431756..c62459ae0 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.request.AuditResultRequest; import com.cool.store.request.LicenseBizContentRequest; -import com.cool.store.request.SysBuildResultRequest; import com.cool.store.request.XfsgOpenApiRequest; import com.cool.store.response.LicenseApiResponse; import com.cool.store.response.ResponseResult; @@ -33,12 +32,12 @@ public class KdzApiController { public ResponseResult auditResult(@PathVariable(value = "enterprise-id") String eid, @RequestBody XfsgOpenApiRequest request) { log.info("auditResult requestBody :{}", JSONObject.toJSONString(request)); - if(!verifyMD5(request,eid)){ - log.error("验签失败,request：{};eid:{}",JSONObject.toJSONString(request),eid); + if (!verifyMD5(request, eid)) { + log.error("验签失败,request：{};eid:{}", JSONObject.toJSONString(request), eid); return ResponseResult.fail(ErrorCodeEnum.VERIFY_MD5_FALSE); } - if(eid == null || request.getBizContent() == null){ - log.error("参数校验失败,BizContent：{}",JSONObject.toJSONString(request.getBizContent())); + if (eid == null || request.getBizContent() == null) { + log.error("参数校验失败,BizContent：{}", JSONObject.toJSONString(request.getBizContent())); return ResponseResult.fail(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); } AuditResultRequest auditResultRequest = JSONObject.parseObject(request.getBizContent(), AuditResultRequest.class); @@ -50,12 +49,12 @@ public class KdzApiController { public ResponseResult license(@PathVariable(value = "enterprise-id") String eid, @RequestBody XfsgOpenApiRequest request) { log.info("license requestBody :{}", JSONObject.toJSONString(request)); - if(!verifyMD5(request,eid)){ - log.error("验签失败,request：{};eid:{}",JSONObject.toJSONString(request),eid); + if (!verifyMD5(request, eid)) { + log.error("验签失败,request：{};eid:{}", JSONObject.toJSONString(request), eid); return ResponseResult.fail(ErrorCodeEnum.VERIFY_MD5_FALSE); } - if(eid == null || request.getBizContent() == null){ - log.error("参数校验失败,BizContent：{}",JSONObject.toJSONString(request.getBizContent())); + if (eid == null || request.getBizContent() == null) { + log.error("参数校验失败,BizContent：{}", JSONObject.toJSONString(request.getBizContent())); return ResponseResult.fail(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); } LicenseBizContentRequest storeNum = JSONObject.parseObject(request.getBizContent(), LicenseBizContentRequest.class); @@ -63,9 +62,7 @@ public class KdzApiController { } - - - public static boolean verifyMD5(XfsgOpenApiRequest request, String eid){ + public static boolean verifyMD5(XfsgOpenApiRequest request, String eid) { //签名 StringBuffer sb = new StringBuffer(); //用户唯一标识id diff --git a/coolstore-partner-web/src/main/resources/application-ab.properties b/coolstore-partner-web/src/main/resources/application-ab.properties index 483541223..3afaec71e 100644 --- a/coolstore-partner-web/src/main/resources/application-ab.properties +++ b/coolstore-partner-web/src/main/resources/application-ab.properties @@ -5,18 +5,7 @@ default.datasource.username=coolstore default.datasource.password=CSCErYcXniNYm7bT #redis -spring.redis.host=tstore-coolcollege.redis.rds.aliyuncs.com -spring.redis.port=6379 -spring.redis.password=Cx111111 -spring.redis.database=0 -spring.redis.timeout=2000ms -spring.redis.lettuce.pool.max-wait=100ms -spring.redis.lettuce.pool.max-active=1024 -spring.redis.lettuce.pool.max-idle=200 -spring.redis.lettuce.pool.min-idle=0 -spring.redis.lettuce.shutdown-timeout=100ms redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/0 -redis.isv.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/2 #pagehelper pagehelper.helper-dialect=mysql @@ -50,8 +39,7 @@ oss.bucket=cool-store-hsay oss.file.dir=partner/171cddee76471740/ oss.excelFile.dir=lineExcel/ -#企业corpId -corp.id=171cddee76471740 + #cdn地址 cdn.url=https://testhsaypic.coolstore.cn diff --git a/coolstore-partner-web/src/main/resources/application-hd.properties b/coolstore-partner-web/src/main/resources/application-hd.properties index 20ec0e174..2d49248e5 100644 --- a/coolstore-partner-web/src/main/resources/application-hd.properties +++ b/coolstore-partner-web/src/main/resources/application-hd.properties @@ -1,22 +1,11 @@ #mysql config -default.datasource.url=jdbc:mysql://dingpushcoolcollege.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_hy?useSSL=false&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true -default.datasource.username=hsay -default.datasource.password=Z3J7xBbgouMD +default.datasource.url=jdbc:mysql://store-big1.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_9096?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true +default.datasource.username=coolstore +default.datasource.password=CSCErYcXniNYm7bT #redis -spring.redis.host=tstore-coolcollege.redis.rds.aliyuncs.com -spring.redis.port=6379 -spring.redis.password=Cx111111 -spring.redis.database=0 -spring.redis.timeout=2000ms -spring.redis.lettuce.pool.max-wait=100ms -spring.redis.lettuce.pool.max-active=1024 -spring.redis.lettuce.pool.max-idle=200 -spring.redis.lettuce.pool.min-idle=0 -spring.redis.lettuce.shutdown-timeout=100ms -redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/0 -redis.isv.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/2 +redis.host.uri=http://userInfo:Cx111111@store-coolcollege.redis.rds.aliyuncs.com:6379/0 #pagehelper pagehelper.helper-dialect=mysql @@ -37,31 +26,29 @@ mybatis.configuration.map-underscore-to-camel-case=true isv.domain=https://hdstore-isv.coolstore.cn/isv #rocketmq \u914D\u7F6E -rocketmq.accessKey=zK2oVEz4G1ts23d2 -rocketmq.secretKey=0UstLCS0mh2ASgBh -rocketmq.nameSrvAdder=http://rmq-cn-9lb38l1rx04.cn-hangzhou.rmq.aliyuncs.com:8080 +rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 +rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig +rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-internal.aliyuncs.com:8080 rocketmq.topic=simple_message #oss配置 -oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur -oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2 +oss.accessKeyId=LTAI5tS2khSZfYrTL5cerHbY +oss.accessKeySecret=YChLLev5KRZmgHCAkU7odkhGWk1aif oss.endpoint=oss-cn-hangzhou.aliyuncs.com -oss.bucket=cool-store-hsay -oss.file.dir=partner/171cddee76471740/ -oss.excelFile.dir=lineExcel/ +oss.bucket=coolstore-storage +oss.file.dir=eid/9ee7b8b48e2447f9a2075b5a46e94d08/ + -#企业corpId -corp.id=171cddee76471740 #cdn地址 -cdn.url=https://testhsaypic.coolstore.cn +cdn.url=https://oss-store.coolcollege.cn #TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 -trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 +trtc.sdkAppId=1600026212 +trtc.secretKey=e036b654c665f649f053a01ff6f5652a826980027be298d4d49949f6e26434a5 +trtc.video.callback.secretKey=ur4wq2iFbRI03Q35 -weixin.appId=wx997f2206e276e513 -weixin.appSecret=2ddea4374abeace05e83c948392c2952 +weixin.appId=wx7b16b308c9127a48 +weixin.appSecret=65217b4fe10d74b5785a5ab9475fcb24 weixin.index.url=pages/index/index signKey=d851f2a9ac90474abecdc2fbb148d4d7 @@ -82,7 +69,7 @@ recommended.channel.id=52400 cool.app.id=78836 coolstore.page.domain=https://store.coolstore.cn -xfsg.url=https://inf.xianfengsg.com/InfService +xfsg.url=https://inf-test.xianfengsg.com/InfService aliyun.sms.accessKeyId=LTAI5tAVZ3r9UtSpLGcmGoQn aliyun.sms.accessKeySecret=WIMjO4BjVg3YAHwmplq86yOyS2HMpa diff --git a/coolstore-partner-web/src/main/resources/application-local.properties b/coolstore-partner-web/src/main/resources/application-local.properties index 4b53830a7..6e325df06 100644 --- a/coolstore-partner-web/src/main/resources/application-local.properties +++ b/coolstore-partner-web/src/main/resources/application-local.properties @@ -39,8 +39,7 @@ oss.bucket=cool-store-hsay oss.file.dir=partner/171cddee76471740/ oss.excelFile.dir=lineExcel/ -#企业corpId -corp.id=171cddee76471740 + #cdn地址 cdn.url=https://testhsaypic.coolstore.cn diff --git a/coolstore-partner-web/src/main/resources/application-online.properties b/coolstore-partner-web/src/main/resources/application-online.properties index 7a1667c12..e6d42d645 100644 --- a/coolstore-partner-web/src/main/resources/application-online.properties +++ b/coolstore-partner-web/src/main/resources/application-online.properties @@ -5,18 +5,7 @@ default.datasource.username=coolstore default.datasource.password=CSCErYcXniNYm7bT #redis -spring.redis.host=store-coolcollege.redis.rds.aliyuncs.com -spring.redis.port=6379 -spring.redis.password=Cx111111 -spring.redis.database=0 -spring.redis.timeout=2000ms -spring.redis.lettuce.pool.max-wait=100ms -spring.redis.lettuce.pool.max-active=1024 -spring.redis.lettuce.pool.max-idle=200 -spring.redis.lettuce.pool.min-idle=0 -spring.redis.lettuce.shutdown-timeout=100ms redis.host.uri=http://userInfo:Cx111111@store-coolcollege.redis.rds.aliyuncs.com:6379/0 -redis.isv.host.uri=http://userInfo:Cx111111@store-coolcollege.redis.rds.aliyuncs.com:6379/2 #pagehelper pagehelper.helper-dialect=mysql @@ -34,47 +23,46 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -isv.domain=https://abstore-isv.coolstore.cn/isv +isv.domain=https://store-isv.coolstore.cn/isv #rocketmq \u914D\u7F6E -rocketmq.accessKey=zK2oVEz4G1ts23d2 -rocketmq.secretKey=0UstLCS0mh2ASgBh -rocketmq.nameSrvAdder=http://rmq-cn-9lb38l1rx04.cn-hangzhou.rmq.aliyuncs.com:8080 +rocketmq.accessKey=LTAI5t5ouXZuFgxJMbQea3b2 +rocketmq.secretKey=yuomDstRjSdihtN5zo8viDbWu8Z0ig +rocketmq.nameSrvAdder=http://MQ_INST_1947409023213164_BX5N7rwl.cn-hangzhou.mq-internal.aliyuncs.com:8080 rocketmq.topic=simple_message #oss配置 -oss.accessKeyId=LTAI5tRSXy2MrqaaBJ6gReur -oss.accessKeySecret=FFsl8d9batprJ0vXr0k4Y8ada40Wm2 +oss.accessKeyId=LTAI5tS2khSZfYrTL5cerHbY +oss.accessKeySecret=YChLLev5KRZmgHCAkU7odkhGWk1aif oss.endpoint=oss-cn-hangzhou.aliyuncs.com -oss.bucket=cool-store-hsay -oss.file.dir=partner/171cddee76471740/ -oss.excelFile.dir=lineExcel/ +oss.bucket=coolstore-storage +oss.file.dir=eid/9ee7b8b48e2447f9a2075b5a46e94d08/ + -#企业corpId -corp.id=171cddee76471740 #cdn地址 -cdn.url=https://testhsaypic.coolstore.cn +cdn.url=https://oss-store.coolcollege.cn #TRTC -trtc.sdkAppId=1400811820 -trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219 -trtc.video.callback.secretKey=1ECEAD34DBD84E838BF07FC7360EA4D8 +trtc.sdkAppId=1600026212 +trtc.secretKey=e036b654c665f649f053a01ff6f5652a826980027be298d4d49949f6e26434a5 +trtc.video.callback.secretKey=ur4wq2iFbRI03Q35 -weixin.appId=wx997f2206e276e513 -weixin.appSecret=2ddea4374abeace05e83c948392c2952 +weixin.appId=wx7b16b308c9127a48 +weixin.appSecret=65217b4fe10d74b5785a5ab9475fcb24 weixin.index.url=pages/index/index signKey=d851f2a9ac90474abecdc2fbb148d4d7 fixMobileOpenid=HSAY4AF322E #xxljob配置 #xxljob配置 -xxl.job.admin.addresses=http://10.7.53.224:10001/xxl-job-admin -xxl.job.executor.appname=${spring.application.name} -xxl.job.executor.ip= -xxl.job.executor.port=40001 -xxl.job.executor.logpath=logs/xxl-job/jobhandler -xxl.job.executor.logretentiondays=3 -xxl.job.accessToken=25365115eed84e9ba5e0040abb255a09 + +xxl.job.admin.addresses = http://10.7.53.217:10001/xxl-job-admin,http://10.6.49.25:10001/xxl-job-admin +xxl.job.executor.appname = ${spring.application.name} +xxl.job.executor.ip = +xxl.job.executor.port = 40001 +xxl.job.executor.logpath = logs/xxl-job/jobhandler +xxl.job.executor.logretentiondays = 30 +xxl.job.accessToken =25365115eed84e9ba5e0040abb255a09 exhibition.channel.id=52399 recommended.channel.id=52400 diff --git a/coolstore-partner-web/src/main/resources/application-test.properties b/coolstore-partner-web/src/main/resources/application-test.properties index c20cf6285..4b652bdef 100644 --- a/coolstore-partner-web/src/main/resources/application-test.properties +++ b/coolstore-partner-web/src/main/resources/application-test.properties @@ -5,18 +5,7 @@ default.datasource.username=coolstore default.datasource.password=CSCErYcXniNYm7bT #redis -spring.redis.host=tstore-coolcollege.redis.rds.aliyuncs.com -spring.redis.port=6379 -spring.redis.password=Cx111111 -spring.redis.database=0 -spring.redis.timeout=2000ms -spring.redis.lettuce.pool.max-wait=100ms -spring.redis.lettuce.pool.max-active=1024 -spring.redis.lettuce.pool.max-idle=200 -spring.redis.lettuce.pool.min-idle=0 -spring.redis.lettuce.shutdown-timeout=100ms redis.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/0 -redis.isv.host.uri=http://userInfo:Cx111111@tstore-coolcollege.redis.rds.aliyuncs.com:6379/2 #pagehelper pagehelper.helper-dialect=mysql @@ -50,8 +39,7 @@ oss.bucket=cool-store-hsay oss.file.dir=partner/171cddee76471740/ oss.excelFile.dir=lineExcel/ -#企业corpId -corp.id=171cddee76471740 + #cdn地址 cdn.url=https://testhsaypic.coolstore.cn diff --git a/coolstore-partner-web/src/main/resources/application.properties b/coolstore-partner-web/src/main/resources/application.properties index 736c1cae8..07a5ba65f 100644 --- a/coolstore-partner-web/src/main/resources/application.properties +++ b/coolstore-partner-web/src/main/resources/application.properties @@ -1,5 +1,5 @@ -spring.application.name=hsay-partner-web -spring.profiles.active=test +spring.application.name=xianfeng-web +spring.profiles.active=@profileActive@ server.port=40000 server.servlet.context-path=/xfsg diff --git a/coolstore-partner-web/src/main/resources/logback-spring.xml b/coolstore-partner-web/src/main/resources/logback-spring.xml index 104360a65..145a5f06c 100644 --- a/coolstore-partner-web/src/main/resources/logback-spring.xml +++ b/coolstore-partner-web/src/main/resources/logback-spring.xml @@ -2,17 +2,17 @@ - + - + - + - + - + @@ -43,13 +43,13 @@ - + - +