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

Merge branch 'cc_20250513_fix' into 'master'

Browse Source 
Cc 20250513 fix

See merge request hangzhou/java/custom_zxjp!77
This commit is contained in:
苏竹红
2025-05-13 03:56:01 +00:00
parent 3e8a2d272e 1867bbbde5
commit 20d5a68f13
3 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-common/src/main/java/com/cool/store/enums/JoinModeEnum.java
View File

@@ -10,7 +10,8 @@ public enum JoinModeEnum {
FRANCHISE_DEPARTMENT(1,"加盟部加盟店"),
FRANCHISE_COMPANIES(2,"加盟公司加盟店"),
OWN_STORE(3,"加盟公司自有店"),
STRONG_FRANCHISE(4,"强加盟");
STRONG_FRANCHISE(4,"强加盟")
;
private int code;
private String desc;
private JoinModeEnum(int code, String desc) {

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

@@ -77,13 +77,10 @@ public class BuildInformationServiceImpl implements BuildInformationService {
response.setShopId(shopId);
response.setShopName(shopInfo.getShopName());
response.setShopCode(shopInfo.getShopCode());
PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(shopInfo.getPointId());
if (Objects.nonNull(pointInfo)) {
response.setProvince(pointInfo.getProvince());
response.setDistrict(pointInfo.getDistrict());
response.setCity(pointInfo.getCity());
response.setTownship(pointInfo.getTownship());
}
response.setProvince(shopInfo.getProvince());
response.setDistrict(shopInfo.getDistrict());
response.setCity(shopInfo.getCity());
response.setTownship(shopInfo.getDetailAddress());
BuildInformationDO informationDO = buildInformationDAO.selectOneByShopId(shopId);
if (Objects.nonNull(informationDO)) {
extracted(response, informationDO);
@@ -112,31 +109,33 @@ public class BuildInformationServiceImpl implements BuildInformationService {
}
response.setDeclareGoodsType(orderSysInfoDO.getDeclareGoodsType());
}
if (StringUtils.isBlank(response.getXgjVicePresident())){
if (StringUtils.isBlank(response.getXgjVicePresident())) {
EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.VICE_PRESIDENT_IN_CHARGE, shopInfo.getRegionId());
if (Objects.nonNull(user)){
if (Objects.nonNull(user)) {
response.setXgjVicePresident(user.getName());
}
}
//根据映射关系默认带出新管家组织
if (StringUtils.isBlank(response.getXgjRegionName())){
if (StringUtils.isBlank(response.getXgjRegionName())) {
Integer joinMode = shopInfo.getJoinMode() == 3 ? CommonConstants.ONE : CommonConstants.ZERO;
BigRegionDO bigRegionDO = bigRegionDAO.queryOrgInfoByBigRegionAndJoinMode(shopInfo.getRegionId(), joinMode);
if (Objects.nonNull(bigRegionDO)){
if (Objects.nonNull(bigRegionDO)) {
response.setXgjRegionId(bigRegionDO.getOrgId());
response.setXgjRegionName(bigRegionDO.getOrgName());
}
}
if (Objects.nonNull(pointInfo)) {
if (StringUtils.isBlank(response.getAddresseeProvince())){
response.setAddresseeProvince(pointInfo.getProvince());}
if (StringUtils.isBlank(response.getAddresseeCity())){
response.setAddresseeCity(pointInfo.getCity());}
if (StringUtils.isBlank(response.getAddresseeDistrict())){
response.setAddresseeDistrict(pointInfo.getDistrict());}
if (StringUtils.isBlank(response.getAddresseeProvince())) {
response.setAddresseeProvince(shopInfo.getProvince());
}
if (StringUtils.isBlank(response.getAddresseeCity())) {
response.setAddresseeCity(shopInfo.getCity());
}
if (StringUtils.isBlank(response.getAddresseeDistrict())) {
response.setAddresseeDistrict(shopInfo.getDistrict());
}
if (StringUtils.isBlank(response.getAddresseeAddress())) {
response.setAddresseeAddress(shopInfo.getDetailAddress());
}
if (StringUtils.isBlank(response.getAddresseeAddress())){
response.setAddresseeAddress(shopInfo.getDetailAddress());}
return response;

17
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
View File

@@ -40,6 +40,7 @@ import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.text.MessageFormat;
import java.text.ParseException;
@@ -317,10 +318,10 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
if (ObjectUtils.isNotEmpty(franchiseFeeDTO)) {
dto.setFirstYearStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearStartTime()));
dto.setFirstYearEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearEndTime()));
String total = (new BigInteger(franchiseFeeDTO.getPerformanceBond()).add(new BigInteger(franchiseFeeDTO.getFirstYearFee()))
.add(new BigInteger(franchiseFeeDTO.getFirstYearManagementFee()))
.add(new BigInteger(franchiseFeeDTO.getYearFranchiseFee()))
.add(new BigInteger(franchiseFeeDTO.getLoanMargin())).toString());
String total = (new BigDecimal(franchiseFeeDTO.getPerformanceBond()).add(new BigDecimal(franchiseFeeDTO.getFirstYearFee()))
.add(new BigDecimal(franchiseFeeDTO.getFirstYearManagementFee()))
.add(new BigDecimal(franchiseFeeDTO.getYearFranchiseFee()))
.add(new BigDecimal(franchiseFeeDTO.getLoanMargin())).toString());
dto.setTotalAmountContributions(total);
dto.setFranchiseFee(franchiseFeeDTO.getYearFranchiseFee());
dto.setLoanMargin(franchiseFeeDTO.getLoanMargin());
@@ -460,10 +461,10 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
if (ObjectUtils.isNotEmpty(franchiseFeeDTO)) {
dto.setFirstYearStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearStartTime()));
dto.setFirstYearEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearEndTime()));
String total = (new BigInteger(franchiseFeeDTO.getPerformanceBond()).add(new BigInteger(franchiseFeeDTO.getFirstYearFee()))
.add(new BigInteger(franchiseFeeDTO.getFirstYearManagementFee()))
.add(new BigInteger(franchiseFeeDTO.getYearFranchiseFee()))
.add(new BigInteger(franchiseFeeDTO.getLoanMargin())).toString());
String total = (new BigDecimal(franchiseFeeDTO.getPerformanceBond()).add(new BigDecimal(franchiseFeeDTO.getFirstYearFee()))
.add(new BigDecimal(franchiseFeeDTO.getFirstYearManagementFee()))
.add(new BigDecimal(franchiseFeeDTO.getYearFranchiseFee()))
.add(new BigDecimal(franchiseFeeDTO.getLoanMargin())).toString());
dto.setTotalAmountContributions(total);
dto.setFranchiseFee(franchiseFeeDTO.getYearFranchiseFee());
dto.setLoanMargin(franchiseFeeDTO.getLoanMargin());