suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
zhangchenbiao
2024-04-28 17:55:12 +08:00
parent 71a68b3a59 6cd311bf01
commit 121415c339
31 changed files with 595 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
coolstore-partner-service/src/main/java/com/cool/store/service/CoolStoreStartFlowService.java
View File

@@ -25,19 +25,7 @@ public interface CoolStoreStartFlowService {
* @return
*/
ResponseResult franchiseAgreement(FranchiseAgreementRequest request,Integer type);
/**
* @Auther: wangshuo
* @Date: 2024/4/25
* @description:项目列表
*/
ResponseResult getProjectList(String shopCode);
/**
* @Auther: wangshuo
* @Date: 2024/4/25
* @description:项目详情
* @Param projectId:项目主键,clientCode:客户编号,pCode:项目编号
*/
ResponseResult getStoreDetail(Long projectId,String clientCode,String pCode);
/**
* @Auther: wangshuo
* @Date: 2024/4/25

26
coolstore-partner-service/src/main/java/com/cool/store/service/DecorationService.java Normal file
View File

@@ -0,0 +1,26 @@
package com.cool.store.service;
import com.cool.store.vo.DesignInfoVo;
import java.util.List;
/**
* @Auther: WangShuo
* @Date: 2024/04/28/下午4:45
* @Version 1.0
* @注释:
*/
public interface DecorationService {
/**
* @Auther: wangshuo
* @Date: 2024/4/28
* @description:获取装修阶段子阶段信息
*/
List<DesignInfoVo> decorations();
/**
* @Auther: wangshuo
* @Date: 2024/4/28
* @description:设计阶段信息
*/
List<DesignInfoVo> DesignInfo(String shopCode);
}

3
coolstore-partner-service/src/main/java/com/cool/store/service/OpenAcceptanceInfoService.java
View File

@@ -2,6 +2,7 @@ package com.cool.store.service;
import com.cool.store.request.OpenAcceptanceRequest;
import com.cool.store.request.ShopAcceptanceRequest;
import com.cool.store.request.ShopStageAcceptanceRequest;
import com.cool.store.vo.OpenAcceptanceInfoListVO;
import com.cool.store.vo.ShopAcceptanceVO;
import com.github.pagehelper.PageInfo;
@@ -31,4 +32,6 @@ public interface OpenAcceptanceInfoService {
* @param shopAcceptanceRequest
*/
void acceptance(ShopAcceptanceRequest shopAcceptanceRequest, String userId);
void acceptanceOne(ShopStageAcceptanceRequest shopStageAcceptanceRequest);
}

23
coolstore-partner-service/src/main/java/com/cool/store/service/YlfService.java Normal file
View File

@@ -0,0 +1,23 @@
package com.cool.store.service;
import com.cool.store.dto.decoration.DecorationDTO;
/**
* @Author suzhuhong
* @Date 2024/4/28 14:26
* @Version 1.0
*/
public interface YlfService {
/**
*
*/
DecorationDTO getDecoration(Long id) ;
/**
* @Auther: wangshuo
* @Date: 2024/4/25
* @description:项目列表
*/
String getProjectList(String shopCode);
}

18
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
View File

@@ -100,15 +100,15 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
List<ShopAuditInfoDO> listByShopIdAndType = shopAuditInfoMapper.getListByShopIdAndType(shopId, AuditTypeEnum.LICENSE_APPROVAL.getCode());
List<String> userIds = listByShopIdAndType.stream().map(ShopAuditInfoDO::getSubmittedUserId).collect(Collectors.toList());
List<EnterpriseUserDO> userInfoByUserIds = new ArrayList<>();
if (CollectionUtils.isNotEmpty(userIds)){
userInfoByUserIds = userMapper.getUserInfoByUserIds(userIds);
Map<String, String> userAvatarMap = userInfoByUserIds.stream()
.filter(item -> StringUtil.isNotBlank(item.getUserId()) && StringUtil.isNotBlank(item.getAvatar()))
.collect(Collectors.toMap(k -> k.getUserId(), v -> v.getAvatar()));
listByShopIdAndType.stream().forEach( item -> {
item.setAvatar(userAvatarMap.get(item.getSubmittedUserId()));
});
}
// if (CollectionUtils.isNotEmpty(userIds)){
// userInfoByUserIds = userMapper.getUserInfoByUserIds(userIds);
// Map<String, String> userAvatarMap = userInfoByUserIds.stream()
// .filter(item -> StringUtil.isNotBlank(item.getUserId()) && StringUtil.isNotBlank(item.getAvatar()))
// .collect(Collectors.toMap(k -> k.getUserId(), v -> v.getAvatar()));
// listByShopIdAndType.stream().forEach( item -> {
// item.setAvatar(userAvatarMap.get(item.getSubmittedUserId()));
// });
// }
submitLicenseResponse.setProcessRecords(listByShopIdAndType);
return submitLicenseResponse;
}

49
coolstore-partner-service/src/main/java/com/cool/store/service/impl/CoolStoreStartFlowServiceImpl.java
View File

@@ -57,7 +57,6 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService
}
}
@Override
public ResponseResult franchiseAgreement(FranchiseAgreementRequest request, Integer type) {
log.info("newStore param:{}", JSONObject.toJSONString(request));
@@ -81,53 +80,6 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService
}
}
@Override
public ResponseResult getProjectList(String shopCode) {
log.info("getProjectList param:{}", shopCode);
if (Objects.isNull(shopCode)) {
throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
}
String url = String.format(Constants.GET_PROJECT_LIST, shopCode);
log.info("CoolStoreStartFlowServiceImpl#getOrder, url:{}", url);
try {
JSONObject jsonObject = httpRestTemplateService.getForObject(url, JSONObject.class, new HashMap<>());
log.info("CoolStoreStartFlowServiceImpl#getOrder,jsonObject:{}", jsonObject.toJSONString());
if (jsonObject.get("status").equals(Constants.SUCCESS)) {
return new ResponseResult(200, jsonObject.get("data").toString(), jsonObject.get("msg").toString());
} else {
return new ResponseResult(500, jsonObject.get("msg").toString());
}
} catch (Exception e) {
log.info("调用鲜丰服务异常,getProjectList error:{}", e);
throw new ServiceException(ErrorCodeEnum.XFSG_SERVICE_ERROR);
}
}
@Override
public ResponseResult getStoreDetail(Long projectId, String clientCode, String pCode) {
log.info("getStoreList projectId:{},clientCode:{},pCode:{}", projectId, clientCode, pCode);
if (Objects.isNull(projectId) && Objects.isNull(clientCode) && Objects.isNull(pCode)) {
throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
}
HashMap requestMap = new HashMap();
requestMap.put("projectId", projectId);
requestMap.put("clientCode", clientCode);
requestMap.put("pCode", pCode);
try {
JSONObject jsonObject = httpRestTemplateService.getForObject(Constants.GET_PROJECT_DETAIL, JSONObject.class, requestMap);
log.info("FirstOrderServiceImp#getStoreDetail, jsonObject:{}", jsonObject.toJSONString());
if (jsonObject.get("status").equals(Constants.SUCCESS)) {
return new ResponseResult(200, jsonObject.get("data").toString(), jsonObject.get("msg").toString());
} else {
return new ResponseResult(500, jsonObject.get("msg").toString());
}
} catch (Exception e) {
log.info("调用鲜丰服务异常,getProjectList error:{}", e);
throw new ServiceException(ErrorCodeEnum.XFSG_SERVICE_ERROR);
}
}
@Override
public Boolean getFirstOrder(String shopCode) {
@@ -156,4 +108,5 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService
requestMap.put("timestamp", timestamp);
requestMap.put("signature", signature);
}
}

38
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationServiceImpl.java Normal file
View File

@@ -0,0 +1,38 @@
package com.cool.store.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.dto.decoration.DecorationDTO;
import com.cool.store.service.DecorationService;
import com.cool.store.service.YlfService;
import com.cool.store.vo.DesignInfoVo;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
/**
* @Auther: WangShuo
* @Date: 2024/04/28/下午4:46
* @Version 1.0
* @注释:
*/
@Service
public class DecorationServiceImpl implements DecorationService {
@Resource
private YlfService ylfService;
@Override
public List<DesignInfoVo> decorations() {
return Collections.emptyList();
}
@Override
public List<DesignInfoVo> DesignInfo(String shopCode) {
String projectId = ylfService.getProjectList(shopCode);
return Collections.emptyList();
}
}

18
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAcceptanceInfoServiceImpl.java
View File

@@ -13,6 +13,7 @@ import com.cool.store.enums.point.ShopSubStageFieldEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.request.OpenAcceptanceRequest;
import com.cool.store.request.ShopAcceptanceRequest;
import com.cool.store.request.ShopStageAcceptanceRequest;
import com.cool.store.service.OpenAcceptanceInfoService;
import com.cool.store.service.RegionService;
import com.cool.store.utils.CoolDateUtils;
@@ -141,4 +142,21 @@ public class OpenAcceptanceInfoServiceImpl implements OpenAcceptanceInfoService
shopInfoDO.setPlanOpenTime(shopAcceptanceRequest.getPlanOpenTime());
shopInfoDAO.updateShopInfo(shopInfoDO);
}
@Override
public void acceptanceOne(ShopStageAcceptanceRequest shopStageAcceptanceRequest) {
OpenAcceptanceInfoDO openAcceptanceInfoDO = openAcceptanceInfoDAO.selectOne(OpenAcceptanceInfoDO.builder().shopId(shopStageAcceptanceRequest.getShopId()).build());
if (openAcceptanceInfoDO == null) {
throw new ServiceException("该店铺不存在");
}
if (openAcceptanceInfoDO.getAcceptanceStatus() != null && openAcceptanceInfoDO.getAcceptanceStatus() == 1) {
throw new ServiceException("该店铺已验收完成，不能再次验收");
}
ShopSubStageFieldEnum shopSubStageFieldEnum = ShopSubStageFieldEnum.getByShopSubStage(shopStageAcceptanceRequest.getShopSubStage());
if (shopSubStageFieldEnum != null) {
ReflectUtil.setFieldValue(openAcceptanceInfoDO, shopSubStageFieldEnum.getFiled(), shopStageAcceptanceRequest.getResult());
}
openAcceptanceInfoDAO.updateByPrimaryKeySelective(openAcceptanceInfoDO);
}
}

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java
View File

@@ -198,7 +198,7 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus())) {
// ShopInfoDO shopInfo = shopService.getShopInfo(shopId);
// String shopCode = shopInfo.getShopCode();
// Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode);
//Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode);
Boolean firstOrder =Boolean.TRUE;
log.info("saveOrder,flag:{}", firstOrder);
if (firstOrder) {

90
coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java Normal file
View File

@@ -0,0 +1,90 @@
package com.cool.store.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.dto.decoration.DecorationDTO;
import com.cool.store.dto.decoration.ProjectDTO;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.mq.util.HttpRestTemplateService;
import com.cool.store.service.YlfService;
import com.cool.store.utils.poi.constant.Constants;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
/**
* @Author suzhuhong
* @Date 2024/4/28 14:26
* @Version 1.0
*/
@Service
@Slf4j
public class YlfServiceImpl implements YlfService {
static String url = "https://hzly.cloudcubic.net/ajaxHandle/synchronization/JCallBackSynchronizationHandler.ashx?action=app&controller=GetProjectDetails&projectid=";
@Resource
private HttpRestTemplateService httpRestTemplateService;
@Override
public DecorationDTO getDecoration(Long id) {
String detailUrl = String.format("%s%d", url, id);
try {
String forObject = httpRestTemplateService.getForObject(detailUrl, String.class, new HashMap<>());
Integer status = (Integer) JSONObject.parseObject(forObject, JSONObject.class).get("status");
if (status != 200) {
log.info("获取云立方装修公司信息失败,id:{}", id);
throw new ServiceException(ErrorCodeEnum.YLF_ERROR);
}
Object data = JSONObject.parseObject(forObject, JSONObject.class).get("data");
if (data == null) {
return null;
}
List<DecorationDTO> list = (List<DecorationDTO>) ((JSONObject) JSONObject.parseObject(forObject, JSONObject.class).get("data")).get("rows");
if (CollectionUtils.isNotEmpty(list)) {
return list.get(0);
}
} catch (Exception e) {
throw new ServiceException(ErrorCodeEnum.YLF_ERROR);
}
return null;
}
@Override
public String getProjectList(String shopCode) {
log.info("getProjectList param:{}", shopCode);
if (Objects.isNull(shopCode)) {
throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
}
String url = String.format(Constants.GET_PROJECT_LIST, shopCode);
log.info("CoolStoreStartFlowServiceImpl#getOrder, url:{}", url);
try {
String jsonString = httpRestTemplateService.getForObject(url, String.class, new HashMap<>());
JSONObject jsonObject = JSONObject.parseObject(jsonString);
log.info("CoolStoreStartFlowServiceImpl#getOrder,jsonObject:{}", jsonObject);
if (jsonObject.get("status").equals(Constants.SUCCESS)) {
if (jsonObject.get("data").toString() == null) {
return null;
}
List<ProjectDTO> projectDTOS = (List<ProjectDTO>) ((JSONObject) JSONObject.parseObject(jsonString, JSONObject.class).get("data")).get("rows");
return ((ProjectDTO)projectDTOS.get(0)).getProjectId();
} else {
log.info("获取云立方装修公司信息失败,shopCode:{}", shopCode);
throw new ServiceException(ErrorCodeEnum.YLF_ERROR);
}
} catch (Exception e) {
log.info("调用云立方获取项目列表异常,getProjectList error:{}", e);
throw new ServiceException(ErrorCodeEnum.XFSG_SERVICE_ERROR);
}
}
}