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

fix:

Browse Source
This commit is contained in:
guohb
2024-05-16 14:33:44 +08:00
parent 482d73ebd0
commit 0ae893dcfb
6 changed files with 106 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,15 +1,13 @@
package com.cool.store.service.impl;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.dao.EnterpriseUserDAO;
import com.cool.store.dao.RegionDao;
import com.cool.store.dao.ShopStageInfoDAO;
import com.cool.store.entity.*;
import com.cool.store.enums.AuditTypeEnum;
import com.cool.store.enums.MessageEnum;
import com.cool.store.enums.SMSMsgEnum;
import com.cool.store.enums.UserRoleEnum;
import com.cool.store.enums.*;
import com.cool.store.enums.point.ShopSubStageEnum;
import com.cool.store.enums.point.ShopSubStageStatusEnum;
import com.cool.store.mapper.*;
@@ -156,7 +154,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
submitLicenseResponse = SubmitLicenseResponse.from(storeInfoCode, submitLicenseResponse);
//给前端判断哪些是鲜丰数据不可修改
GetStoreInfoByCodeResponse.StoreDocument storeDocument = storeInfoCode.getData().getStoreDocument();
SubmitLicenseResponse.StoreDocument storeDocumentResponse = storeDocument.toStoreDocument();
SubmitLicenseResponse.StoreDocument storeDocumentResponse = toStoreDocument(storeDocument);
submitLicenseResponse.setStoreDocument(storeDocumentResponse);
return submitLicenseResponse;
}
@@ -165,6 +163,31 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService {
return submitLicenseResponse;
}
public SubmitLicenseResponse.StoreDocument toStoreDocument(GetStoreInfoByCodeResponse.StoreDocument storeDocument) {
SubmitLicenseResponse.StoreDocument submitLicenseResponse = new SubmitLicenseResponse.StoreDocument();
boolean storeBusinessValidPeriod = storeDocument.getStoreBusinessValidPeriod().equals("9");
submitLicenseResponse.setLicenseType(LicenseTypeEnum.matchName(storeDocument.getStoreBusinessType()).getCode());
submitLicenseResponse.setLicenseLegalPerson(storeDocument.getStoreDirector());
submitLicenseResponse.setIssueTime(DateUtil.parseDate(storeDocument.getStoreBusinessDate()));
submitLicenseResponse.setLicenseAddress(storeDocument.getStoreBusinessAdd());
submitLicenseResponse.setValidity(storeBusinessValidPeriod ? null : DateUtil.parseTime(storeDocument.getStoreBusinessValidPeriod()));
submitLicenseResponse.setValidityType(storeBusinessValidPeriod ? 0 : 1);
submitLicenseResponse.setOperator(storeDocument.getStoreDirector());
submitLicenseResponse.setFoodLicenseLegalPerson(storeDocument.getStoreFoodLicenseOperatorName());
submitLicenseResponse.setMainBusiness(storeDocument.getStoreFoodLicenseMainBusiness());
submitLicenseResponse.setBusinessProject(storeDocument.getStoreFoodLicenseBusinessScope());
submitLicenseResponse.setRemark(storeDocument.getStoreRemark());
submitLicenseResponse.setLicenseUrl(storeDocument.getStoreBusinessImg());
submitLicenseResponse.setLicenseName(storeDocument.getStoreBusinessName());
submitLicenseResponse.setSocialCreditCode(storeDocument.getStoreBusinessNumber());
submitLicenseResponse.setFoodLicenseUrl(storeDocument.getStoreFoodLicenseImg());
submitLicenseResponse.setBusinessPremises(storeDocument.getStoreFoodLicenseBusinessAddress());
submitLicenseResponse.setFoodLicenseCode(storeDocument.getStoreFoodLicense());
submitLicenseResponse.setFoodLicenseStartTime(DateUtil.parseDate(storeDocument.getStoreFoodLicenseBeginDate()));
submitLicenseResponse.setFoodLicenseEndTime(DateUtil.parseDate(storeDocument.getStoreFoodLicenseEndDate()));
return submitLicenseResponse;
}
@Override
public PageInfo<LicenseListResponse> licenseList(LicenseListRequest request, LoginUserInfo user) {
//当前用户角色

7
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java
View File

@@ -341,7 +341,8 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe
// ssdq
newStoreRequest.setSsdq(sysStoreAppRequest.getStoreDetail().getBigCode());
// ssxq
newStoreRequest.setSsxq(sysStoreAppRequest.getStoreDetail().getSmallCode());
RegionDO smallRegion = regionMapper.getByRegionId(Long.valueOf(sysStoreAppRequest.getStoreDetail().getSmallCode()));
newStoreRequest.setSsxq(smallRegion.getSynDingDeptId());
// sszq
newStoreRequest.setSszq(sysStoreAppRequest.getStoreDetail().getFightCode());
// start_time
@@ -398,8 +399,8 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe
newStoreRequest.setZxxdz(pointInfoDO.getAddress());
// zxxzyjzds
newStoreRequest.setZxxzyjzds(sysStoreAppRequest.getStoreDetail().getOfflineCompetitor());
// zymdbm
newStoreRequest.setZymdbm(pointInfoDO.getPointCode());
// // zymdbm
// newStoreRequest.setZymdbm(pointInfoDO.getPointCode());
// zzqms
newStoreRequest.setZzqms(sysStoreAppRequest.getStoreDetail().getFightName());
newStoreRequest.setZzsqlx(sysStoreAppRequest.getStoreDetail().getMainBusinessType());