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

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

Browse Source
This commit is contained in:
苏竹红
2025-04-08 15:23:26 +08:00
parent c08905399c d7869f39da
commit 4469c44ebb
43 changed files with 970 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,15 @@
package com.cool.store.service;
import com.cool.store.response.HomeTemplateResponse;
import com.cool.store.utils.HomeTemplateTypeEnum;
/**
* @Author: WangShuo
* @Date: 2025/04/08/09:41
* @Version 1.0
* @注释:
*/
public interface HomeTemplateService {
HomeTemplateResponse getHomeTemplateById(Long id);
}

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

@@ -0,0 +1,16 @@
package com.cool.store.service;
import com.cool.store.response.HomeTemplateResponse;
/**
* @Author: WangShuo
* @Date: 2025/04/08/10:44
* @Version 1.0
* @注释:
*/
public interface HomeTemplateUserMappingService {
HomeTemplateResponse getHomeTemplateByUserId(String userId);
Integer insertOrUpdateHomeTemplateUserMapping(HomeTemplateResponse homeTemplateResponse,String userId);
}

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

@@ -0,0 +1,20 @@
package com.cool.store.service;
import com.cool.store.enums.DownSystemTypeEnum;
import com.cool.store.request.ZxjpApiRequest;
/**
* @Author: WangShuo
* @Date: 2025/04/07/15:11
* @Version 1.0
* @注释:
*/
public interface SyncDataService {
/**
* @Auther: wangshuo
* @Date: 2025/4/7
* @description: 获取组合数据
*/
ZxjpApiRequest getData(Long shopId, DownSystemTypeEnum systemType);
}

12
coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
View File

@@ -120,6 +120,8 @@ public class BuildInformationServiceImpl implements BuildInformationService{
response.setAccountOpeningPermit(informationDO.getAccountOpeningPermit());
response.setSettlerInHandFrontPicture(informationDO.getSettlerInHandFrontPicture());
response.setSettlerInHandBackPicture(informationDO.getSettlerInHandBackPicture());
response.setCShopName(informationDO.getCShopName());
response.setSettlerBankBackPhotoUrl(informationDO.getSettlerBankBackPhotoUrl());
}
@Override
@@ -139,12 +141,12 @@ public class BuildInformationServiceImpl implements BuildInformationService{
map.put("partnerUsername",lineInfoDO.getUsername());
map.put("partnerMobile",lineInfoDO.getMobile());
map.put("storeName",shopInfoDO.getShopName());
List<EnterpriseUserDO> itList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.IT_EMPLOYEE, shopInfoDO.getRegionId());
List<String> itUsers = new ArrayList<>();
if (Objects.nonNull(itList)){
itUsers.addAll(itList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()));
List<EnterpriseUserDO> logisticsList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.LOGISTICS, shopInfoDO.getRegionId());
List<String> logistics = new ArrayList<>();
if (Objects.nonNull(logisticsList)){
logistics.addAll(logisticsList.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()));
}
commonService.sendQWMessage(itUsers,
commonService.sendQWMessage(logistics,
MessageEnum.MESSAGE_52,
map);
return buildInformationDAO.insertSelective(buildInformationDO);

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

@@ -539,11 +539,11 @@ public class DecorationServiceImpl implements DecorationService {
if (Objects.isNull(request) || request.getShopId() == null) {
throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
}
//必须是待提交状态才能提交
ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getByShopIdAndSubStage(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage());
if (shopStageInfo != null && !ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus().equals(shopStageInfo.getShopSubStageStatus())) {
throw new ServiceException(ErrorCodeEnum.STATUS_NOT_SUPPORT_SUMMIT);
}
// //必须是待提交状态才能提交
// ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getByShopIdAndSubStage(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage());
// if (shopStageInfo != null && !ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus().equals(shopStageInfo.getShopSubStageStatus())) {
// throw new ServiceException(ErrorCodeEnum.STATUS_NOT_SUPPORT_SUMMIT);
// }
DecorationDesignInfoDO decorationDesignInfoDO = request.toDecorationDesignInfoDO();
DecorationDesignInfoDO decoration = decorationDesignInfoDAO.getByShopId(request.getShopId());
if (Objects.nonNull(decoration)) {
@@ -551,14 +551,14 @@ public class DecorationServiceImpl implements DecorationService {
decorationDesignInfoDAO.updateByPrimaryKeySelective(decorationDesignInfoDO);
} else {
decorationDesignInfoDAO.insertSelective(decorationDesignInfoDO);
//更新装修设计状态
shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_905);
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId());
LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfo.getLineId());
Map<String, String> templateParam = new HashMap<>();
templateParam.put("shopName", shopInfo.getShopName());
commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.DESIGN_STAGE, templateParam);
}
//更新装修设计状态
shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_905);
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId());
LineInfoDO lineInfo = lineInfoMapper.getByLineId(shopInfo.getLineId());
Map<String, String> templateParam = new HashMap<>();
templateParam.put("shopName", shopInfo.getShopName());
commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.DESIGN_STAGE, templateParam);
return Boolean.TRUE;
}

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

@@ -0,0 +1,50 @@
package com.cool.store.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.dao.HomeTemplateDAO;
import com.cool.store.dto.HomeTemplateDTO;
import com.cool.store.entity.HomeTemplateDO;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.response.HomeTemplateResponse;
import com.cool.store.service.HomeTemplateService;
import com.cool.store.utils.HomeTemplateTypeEnum;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Objects;
/**
* @Author: WangShuo
* @Date: 2025/04/08/09:41
* @Version 1.0
* @注释:
*/
@Service
@Slf4j
public class HomeTemplateServiceImpl implements HomeTemplateService {
@Resource
private HomeTemplateDAO homeTemplateDAO;
@Override
public HomeTemplateResponse getHomeTemplateById(Long id) {
HomeTemplateDO homeTemplateById = homeTemplateDAO.getHomeTemplateById(id);
if (homeTemplateById != null){
ObjectMapper objectMapper = new ObjectMapper();
// 将 JSON 字符串解析为 HomeTemplateResponse 对象
try {
HomeTemplateResponse componentsJson = new HomeTemplateResponse();
HomeTemplateDTO miniOpenComponentsJson = objectMapper.readValue(homeTemplateById.getMiniOpenComponentsJson(), HomeTemplateDTO.class);
componentsJson.setMiniOpenSourceHomeTemplate(miniOpenComponentsJson);
return componentsJson;
} catch (JsonProcessingException e) {
log.info("JSON解析失败:{}", JSONObject.toJSONString(e.getMessage()));
throw new ServiceException(ErrorCodeEnum.GET_HOME_TEMPLATE_ERROR);
}
}
return null;
}
}

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

@@ -0,0 +1,102 @@
package com.cool.store.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.dao.HomeTemplateDAO;
import com.cool.store.dao.HomeTemplateUserMappingDAO;
import com.cool.store.entity.HomeTemplateDO;
import com.cool.store.entity.HomeTemplateUserMappingDO;
import com.cool.store.response.HomeTemplateResponse;
import com.cool.store.service.HomeTemplateService;
import com.cool.store.service.HomeTemplateUserMappingService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Date;
/**
* @Author: WangShuo
* @Date: 2025/04/08/10:44
* @Version 1.0
* @注释:
*/
@Service
public class HomeTemplateUserMappingServiceImpl implements HomeTemplateUserMappingService {
@Resource
private HomeTemplateUserMappingDAO homeTemplateUserMappingDAO;
@Resource
private HomeTemplateService homeTemplateService;
@Resource
private HomeTemplateDAO homeTemplateDAO;
@Override
public HomeTemplateResponse getHomeTemplateByUserId(String userId) {
HomeTemplateUserMappingDO homeTemplateRoleMappingById = homeTemplateUserMappingDAO.getHomeTemplateRoleMappingByUserId(userId);
if (homeTemplateRoleMappingById == null){
//使用默认模板 id =1
return homeTemplateService.getHomeTemplateById(1L);
}else{
return homeTemplateService.getHomeTemplateById(homeTemplateRoleMappingById.getTemplateId());
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public Integer insertOrUpdateHomeTemplateUserMapping(HomeTemplateResponse homeTemplateResponse, String userId) {
HomeTemplateUserMappingDO homeTemplateRoleMappingByUserId = homeTemplateUserMappingDAO.getHomeTemplateRoleMappingByUserId(userId);
if (homeTemplateRoleMappingByUserId == null){
//获取默认模板 id =1
HomeTemplateDO homeTemplate = homeTemplateDAO.getHomeTemplateById(1L);
HomeTemplateDO homeTemplateDO = new HomeTemplateDO();
homeTemplateDO.setTemplateName(homeTemplate.getTemplateName());
homeTemplateDO.setTemplateDescription(homeTemplate.getTemplateDescription());
String jsonString = JSONObject.toJSONString(homeTemplateResponse.getMiniOpenSourceHomeTemplate());
homeTemplateDO.setMiniOpenComponentsJson(jsonString);
homeTemplateDO.setIsDefault(false);
homeTemplateDO.setDeleted(0);
homeTemplateDO.setCreateId(userId);
homeTemplateDO.setCreateTime(new Date());
Long tempId = homeTemplateDAO.insertSelective(homeTemplateDO);
homeTemplateRoleMappingByUserId = new HomeTemplateUserMappingDO();
homeTemplateRoleMappingByUserId.setTemplateId(tempId);
homeTemplateRoleMappingByUserId.setUserId(userId);
homeTemplateRoleMappingByUserId.setCreateId(userId);
homeTemplateRoleMappingByUserId.setCreateTime(new Date());
return homeTemplateUserMappingDAO.insertSelective(homeTemplateRoleMappingByUserId);
}else{
HomeTemplateDO homeTemplateById = homeTemplateDAO.getHomeTemplateById(homeTemplateRoleMappingByUserId.getTemplateId());
if (homeTemplateById == null){
//如果模板不存在，则新建
HomeTemplateDO homeTemplate = homeTemplateDAO.getHomeTemplateById(1L);
HomeTemplateDO homeTemplateDO = new HomeTemplateDO();
homeTemplateDO.setTemplateName(homeTemplate.getTemplateName());
homeTemplateDO.setTemplateDescription(homeTemplate.getTemplateDescription());
String jsonString = JSONObject.toJSONString(homeTemplateResponse.getMiniOpenSourceHomeTemplate());
homeTemplateDO.setMiniOpenComponentsJson(jsonString);
homeTemplateDO.setIsDefault(false);
homeTemplateDO.setDeleted(0);
homeTemplateDO.setCreateId(userId);
homeTemplateDO.setCreateTime(new Date());
Long tempId = homeTemplateDAO.insertSelective(homeTemplateDO);
homeTemplateRoleMappingByUserId.setTemplateId(tempId);
homeTemplateRoleMappingByUserId.setUpdateId(userId);
homeTemplateRoleMappingByUserId.setUpdateTime(new Date());
}else{
homeTemplateById.setMiniOpenComponentsJson(JSONObject.toJSONString(homeTemplateResponse.getMiniOpenSourceHomeTemplate()));
homeTemplateById.setUpdateId(userId);
homeTemplateById.setUpdateTime(new Date());
homeTemplateDAO.updateByPrimaryKeySelective(homeTemplateById);
}
return homeTemplateUserMappingDAO.updateByPrimaryKeySelective(homeTemplateRoleMappingByUserId);
}
}
}

5
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java
View File

@@ -17,6 +17,7 @@ import com.cool.store.service.OrderSysInfoService;
import com.cool.store.service.UserAuthMappingService;
import com.cool.store.utils.poi.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.*;
@@ -48,7 +49,10 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService {
@Override
@Transactional(rollbackFor = Exception.class)
public Integer updateByShopId(OrderSysInfoRequest request, String userId) {
OrderSysInfoDO orderSysInfoDO = orderSysInfoDAO.selectByShopId(request.getShopId());
if (request.getType().equals(OrderSysTypeEnum.ORDER_SYS_TYPE_1.getType())) {
orderSysInfoDO.setXgjVicePresident(request.getXgjVicePresident());
@@ -86,6 +90,7 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService {
}
}
if (request.getType().equals(OrderSysTypeEnum.ORDER_SYS_TYPE_2.getType())) {
shopInfoDAO.updateShopCode(request.getShopCode(),request.getShopId());
orderSysInfoDO.setReceivingFirmName(request.getReceivingFirmName());
orderSysInfoDO.setReceivingMsBankAccount(request.getReceivingMsBankAccount());
orderSysInfoDO.setReceivingMsBankBranch(request.getReceivingMsBankBranch());

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
View File

@@ -209,7 +209,6 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
shopInfoDO.setRegionId(request.getRegionId());
shopInfoDO.setShopName(request.getShopName());
shopInfoDO.setDetailAddress(request.getDetailAddress());
shopInfoDO.setShopCode(request.getShopCode());
shopInfoDO.setJoinMode(request.getJoinMode());
shopInfoDO.setFranchiseBrand(request.getFranchiseBrand());
shopInfoDO.setUpdateTime(new Date());

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

@@ -0,0 +1,194 @@
package com.cool.store.service.impl;
import com.cool.store.dao.*;
import com.cool.store.entity.*;
import com.cool.store.enums.DownSystemTypeEnum;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.FranchiseBrandEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.mapper.ApplyLicenseMapper;
import com.cool.store.mapper.SignFranchiseMapper;
import com.cool.store.request.ZxjpApiRequest;
import com.cool.store.service.SyncDataService;
import com.cool.store.utils.poi.constant.Constants;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* @Author: WangShuo
* @Date: 2025/04/07/15:12
* @Version 1.0
* @注释:
*/
@Service
public class SyncDataServiceImpl implements SyncDataService {
@Resource
private ShopInfoDAO shopInfoDAO;
@Resource
private LineInfoDAO lineInfoDAO;
@Resource
private SignFranchiseMapper signFranchiseMapper;
@Resource
private HyPartnerUserInfoDAO hyPartnerUserInfoDAO;
@Resource
private OrderSysInfoDAO orderSysInfoDAO;
@Resource
private BuildInformationDAO buildInformationDAO;
@Resource
private AcceptanceInfoDAO acceptanceInfoDAO;
@Resource
private ApplyLicenseMapper applyLicenseMapper;
@Resource
private QualificationsInfoDAO qualificationsInfoDAO;
@Resource
private PointInfoDAO pointInfoDAO;
@Resource
private EnterpriseUserDAO enterpriseUserDAO;
@Override
public ZxjpApiRequest getData(Long shopId, DownSystemTypeEnum systemType) {
ZxjpApiRequest request = new ZxjpApiRequest();
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId);
if (shopInfo == null) {
throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST);
}
Long lineId = shopInfo.getLineId();
LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(lineId);
if (lineInfoDO == null) {
throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST);
}
HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(shopInfo.getPartnerId());
if (hyPartnerUserInfoDO == null) {
throw new ServiceException(ErrorCodeEnum.PARTNER_USER_NOT_EXIST);
}
//加盟合同
SignFranchiseDO signFranchiseDO = signFranchiseMapper.selectByShopId(shopId);
//加盟商所有门店的门店编码
List<String> shopCodeList = shopInfoDAO.getShopCodeList(lineId);
//订货信息 & 总部订货收款账户
OrderSysInfoDO orderSysInfoDO = orderSysInfoDAO.selectByShopId(shopId);
//建店资料
BuildInformationDO buildInformationDO = buildInformationDAO.selectOneByShopId(shopId);
//铺位
PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(shopInfo.getPointId());
//营业执照
LicenseTransactDO licenseTransactDO = applyLicenseMapper.selectByShopId(shopId);
//验收信息
AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoDAO.selectByShopId(shopId);
//资质信息
QualificationsInfoDO qualificationsInfoDO = qualificationsInfoDAO.getByLineId(lineId);
//督导
String investmentManager = enterpriseUserDAO.getUserName(shopInfo.getInvestmentManager());
if (signFranchiseDO != null) {
List<String> partnershipSignatory = new ArrayList<>();
partnershipSignatory.add(signFranchiseDO.getPartnershipSignatoryFirst());
partnershipSignatory.add(signFranchiseDO.getPartnershipSignatorySecond());
request.setPartnershipSignatory(partnershipSignatory);
request.setBusinessModel(signFranchiseDO.getBusinessModel());
}
request.setPartnerMobile(lineInfoDO.getMobile());
if (qualificationsInfoDO != null) {
request.setPartnerIdCardNo(qualificationsInfoDO.getIdCardNo());
request.setLegalName(qualificationsInfoDO.getLegalName());
request.setLegalIdCardFront(qualificationsInfoDO.getLegalIdCardFront());
request.setLegalIdCardBack(qualificationsInfoDO.getLegalIdCardBack());
request.setLegalMobile(qualificationsInfoDO.getLegalMobile());
}
request.setShopCode(shopInfo.getShopCode());
request.setShopCodeList(shopCodeList);
request.setCrmAccount(lineInfoDO.getMobile());
request.setDownstreamSystemPassword(hyPartnerUserInfoDO.getDownstreamSystemPassword());
request.setDownstreamSystemSalt(hyPartnerUserInfoDO.getDownstreamSystemSalting());
request.setCrmAccount(lineInfoDO.getMobile());
request.setFxyAccount(lineInfoDO.getMobile());
request.setXzjAccount(shopInfo.getShopCode());
request.setYlsAccount(shopInfo.getShopCode());
request.setWqfAccount(shopInfo.getShopCode());
if (systemType.equals(DownSystemTypeEnum.XGJ)) {
//todo
}
if (systemType.equals(DownSystemTypeEnum.POS)) {
if (buildInformationDO != null) {
String brand = FranchiseBrandEnum.getDescByCode(shopInfo.getFranchiseBrand());
request.setDownstreamSystemShopName(brand + "(" + buildInformationDO + ")");
}
}
if (orderSysInfoDO != null) {
request.setXgjRegionId(orderSysInfoDO.getXgjRegionId());
request.setXgjVicePresident(orderSysInfoDO.getXgjVicePresident());
request.setAddresseeName(orderSysInfoDO.getAddresseeName());
request.setAddresseeMobile(orderSysInfoDO.getAddresseeMobile());
request.setAddresseeProvince(orderSysInfoDO.getAddresseeProvince());
request.setAddresseeCity(orderSysInfoDO.getAddresseeCity());
request.setAddresseeDistrict(orderSysInfoDO.getAddresseeDistrict());
request.setAddresseeAddress(orderSysInfoDO.getAddresseeAddress());
request.setDeclareGoodsLogisticsWarehouse(orderSysInfoDO.getDeclareGoodsLogisticsWarehouse());
request.setDeclareGoodsDate(orderSysInfoDO.getDeclareGoodsDate());
request.setWarehouseDeliveryDate(orderSysInfoDO.getWarehouseDeliveryDate());
request.setReceivingFirmName(orderSysInfoDO.getReceivingFirmName());
request.setReceivingMSBankAccount(orderSysInfoDO.getReceivingMsBankAccount());
request.setReceivingMSBankBranch(orderSysInfoDO.getReceivingMsBankBranch());
request.setBankUnionPayAccount(orderSysInfoDO.getBankUnionPayAccount());
}
request.setShopSupervisorUserName(investmentManager);
request.setJoinMode(shopInfo.getJoinMode());
if (acceptanceInfoDO != null) {
if (acceptanceInfoDO.getShopDoorwayPhoto() != null) {
List<String> doorwayPhoto = Arrays.stream(acceptanceInfoDO.getShopDoorwayPhoto().split(","))
.collect(Collectors.toList());
request.setShopDoorwayPhoto(doorwayPhoto);
}
if (acceptanceInfoDO.getShopInteriorPhoto() != null) {
List<String> interiorPhoto = Arrays.stream(acceptanceInfoDO.getShopInteriorPhoto().split(","))
.collect(Collectors.toList());
request.setShopInteriorPhoto(interiorPhoto);
}
request.setShopLocationScreenshots(acceptanceInfoDO.getShopLocationScreenshots());
request.setVerificationMobile(acceptanceInfoDO.getVerificationMobile());
request.setKsAccount(acceptanceInfoDO.getKsAccount());
}
if (buildInformationDO!=null){
request.setBusinessHours(buildInformationDO.getBusinessHours());
request.setShopContactName(buildInformationDO.getShopContactName());
request.setBusinessMobile(buildInformationDO.getBusinessMobile());
request.setSettlerName(buildInformationDO.getSettlerName());
request.setSettlerBankPhotoUrl(buildInformationDO.getSettlerBankPhotoUrl());
request.setSettlerBankBackPhotoUrl(buildInformationDO.getSettlerBankBackPhotoUrl());
request.setSettlerBankBranchName(buildInformationDO.getSettlerBankName());
request.setSettlerBankNumber(buildInformationDO.getSettlerBankNumber());
request.setSettlerBankMobile(buildInformationDO.getSettlerBankMobile());
request.setSettlerIdCardFront(buildInformationDO.getSettlerIdCardFront());
request.setSettlerIdCardReverse(buildInformationDO.getSettlerIdCardReverse());
request.setSettlerInHandBackPicture(buildInformationDO.getSettlerInHandBackPicture());
request.setSettlerInHandFrontPicture(buildInformationDO.getSettlerInHandFrontPicture());
request.setSettlerIdCardNo(buildInformationDO.getSettlerIdCardNo());
}
if (licenseTransactDO != null){
request.setCreditUrl(licenseTransactDO.getCreditUrl());
//二证合一标识；0否 1 是
if (Objects.equals(licenseTransactDO.getTwoCertificatesOne(), Constants.ONE_INTEGER)){
request.setFoodBusinessLicenseUrl(licenseTransactDO.getCreditUrl());
}else {
request.setFoodBusinessLicenseUrl(licenseTransactDO.getFoodBusinessLicenseUrl());
}
}
if (pointInfo!=null){
request.setShopProvinceCityDistrict(pointInfo.getProvince()+pointInfo.getCity()+pointInfo.getDistrict());
request.setShopLongitude(pointInfo.getLongitude());
request.setShopLatitude(pointInfo.getLatitude());
request.setShopAddress(pointInfo.getAddress());
request.setShopProvince(pointInfo.getProvince());
request.setShopCity(pointInfo.getCity());
}
return request;
}
}

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/TallyBookServiceImpl.java
View File

@@ -50,8 +50,10 @@ public class TallyBookServiceImpl implements TallyBookService {
tallyBookDO.setId(request.getId());
tallyBookDO.setStatus(TallyBookStatusEnum.IS_SUBMIT.getCode());;
tallyBookDO.setUpdateUser(user.getPartnerId());
tallyBookDO.setUpdateTime(new Date());tallyBookDAO.updateByPrimaryKeySelective(tallyBookDO);
tallyBookDO.setTotal(request.getTotal());
tallyBookDO.setUpdateTime(new Date());
tallyBookDO.setOperatorName(request.getOperatorName());
tallyBookDAO.updateByPrimaryKeySelective(tallyBookDO);
tallyBookDetailDAO.batchDeleteByTallyBookId(request.getId());
List<TallyBookDetailDO> tallyBookDetailDOList = request.toTallyBookDetailDOList(request.getId());
tallyBookDetailDAO.batchInsert(tallyBookDetailDOList);