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

导出加字段

Browse Source
This commit is contained in:
shuo.wang
2025-04-29 19:23:31 +08:00
parent a1c50bfe98
commit fcc86e38f0
7 changed files with 148 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
coolstore-partner-common/src/main/java/com/cool/store/enums/SignTypeEnum.java
View File

@@ -8,23 +8,25 @@ import java.util.function.Function;
import java.util.stream.Collectors;
public enum SignTypeEnum {
TRANSFER(0,"转让","A104"),
NEW_SIGNING(1,"新签","A101"),
RENEWAL(2,"续签","A102"),
RELOCATION (3,"迁址","A103"),
NEW_SIGNING_INDUSTRIES(5,"新签同异业转化","A105"),
TRANSFER(0,"转让"),
NEW_SIGNING(1,"新签"),
RENEWAL(2,"续签"),
RELOCATION (3,"迁址"),
NEW_SIGNING_INDUSTRIES(5,"新签同异业转化"),
OLD_NEW_OPEN(6,"老店新开"),
DIRECT_SALES_TO_JOINING(7,"直营转加盟"),
;
private Integer code;
private String desc;
private String sap;
SignTypeEnum(Integer code, String desc,String sap) {
SignTypeEnum(Integer code, String desc) {
this.code = code;
this.desc = desc;
this.sap =sap;
}
public Integer getCode() {
@@ -43,14 +45,6 @@ public enum SignTypeEnum {
this.desc = desc;
}
public String getSap() {
return sap;
}
public void setSap(String sap) {
this.sap = sap;
}
protected static final Map<Integer, SignTypeEnum> map = Arrays.stream(values()).collect(
Collectors.toMap(SignTypeEnum::getCode, Function.identity()));
@@ -60,4 +54,15 @@ public enum SignTypeEnum {
}
return map.get(code);
}
public static String getDescByCode(Integer code) {
if(code == null) {
return null;
}
SignTypeEnum signTypeEnum = map.get(code);
if(signTypeEnum == null) {
return null;
}
return signTypeEnum.getDesc();
}
}

2
coolstore-partner-dao/src/main/resources/mapper/SignFranchiseMapper.xml
View File

@@ -18,7 +18,7 @@
limit 1
</select>
<select id="selectByShopIds" resultType="com.cool.store.entity.SignFranchiseDO">
select contract_code,shop_id,contract_start_time,contract_end_time,contract_amount,create_time,partnership_signatory_first,partnership_signatory_second
select contract_code,shop_id,sign_type,contract_start_time,contract_end_time,contract_amount,create_time,partnership_signatory_first,partnership_signatory_second
from xfsg_sign_franchise
where 1=1
<if test="list !=null and list.size >0">

74
coolstore-partner-model/src/main/java/com/cool/store/dto/ExportFinanceDTO.java
View File

@@ -4,8 +4,6 @@ import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import lombok.Data;
import java.util.Date;
/**
* @Author: WangShuo
* @Date: 2025/04/28/17:29
@@ -27,139 +25,143 @@ public class ExportFinanceDTO {
@ColumnWidth(20)
private String franchiseBrand;
@ExcelProperty(value = "加盟模式", order = 4)
@ExcelProperty(value = "签约类型", order = 4)
@ColumnWidth(20)
private String signType;
@ExcelProperty(value = "加盟模式", order = 5) // 调整了 order 值
@ColumnWidth(20)
private String joinMode;
@ExcelProperty(value = "加盟商姓名", order = 5)
@ExcelProperty(value = "加盟商姓名", order = 6) // 原先是 5，现在调整为 6
@ColumnWidth(20)
private String username;
@ExcelProperty(value = "加盟商手机号", order = 6)
@ExcelProperty(value = "加盟商手机号", order = 7) // 原先是 6，现在调整为 7
@ColumnWidth(20)
private String mobile;
@ExcelProperty(value = "所属大区", order = 7)
@ExcelProperty(value = "所属大区", order = 8) // 原先是 7，现在调整为 8
@ColumnWidth(20)
private String regionName;
@ExcelProperty(value = "督导", order = 8)
@ExcelProperty(value = "督导", order = 9) // 原先是 8，现在调整为 9
@ColumnWidth(20)
private String investmentManagerName;
@ExcelProperty(value = "签约人1姓名", order = 9)
@ExcelProperty(value = "签约人1姓名", order = 10) // 原先是 9，现在调整为 10
@ColumnWidth(20)
private String partnershipSignatoryFirst;
@ExcelProperty(value = "签约人1手机号", order = 10)
@ExcelProperty(value = "签约人1手机号", order = 11) // 原先是 10，现在调整为 11
@ColumnWidth(20)
private String partnershipSignatoryFirstMobile;
@ExcelProperty(value = "签约人1身份证号码", order = 11)
@ExcelProperty(value = "签约人1身份证号码", order = 12) // 原先是 11，现在调整为 12
@ColumnWidth(30)
private String partnershipSignatoryFirstIdCard;
@ExcelProperty(value = "签约人2姓名", order = 12)
@ExcelProperty(value = "签约人2姓名", order = 13) // 原先是 12，现在调整为 13
@ColumnWidth(20)
private String partnershipSignatorySecond;
@ExcelProperty(value = "签约人2手机号", order = 13)
@ExcelProperty(value = "签约人2手机号", order = 14) // 原先是 13，现在调整为 14
@ColumnWidth(20)
private String partnershipSignatorySecondMobile;
@ExcelProperty(value = "签约人2身份证号码", order = 14)
@ExcelProperty(value = "签约人2身份证号码", order = 15) // 原先是 14，现在调整为 15
@ColumnWidth(30)
private String partnershipSignatorySecondIdCard;
@ExcelProperty(value = "合同编号", order = 15)
@ExcelProperty(value = "合同编号", order = 16) // 原先是 15，现在调整为 16
@ColumnWidth(20)
private String contractCode;
@ExcelProperty(value = "签约时间", order = 16)
@ExcelProperty(value = "签约时间", order = 17) // 原先是 16，现在调整为 17
@ColumnWidth(20)
private String signTime;
@ExcelProperty(value = "第一年加盟开始日期", order = 17)
@ExcelProperty(value = "第一年加盟开始日期", order = 18) // 原先是 17，现在调整为 18
@ColumnWidth(30)
private String firstYearStartTime;
@ExcelProperty(value = "第一年管理费到期日期", order = 18)
@ExcelProperty(value = "第一年管理费到期日期", order = 19) // 原先是 18，现在调整为 19
@ColumnWidth(30)
private String firstYearEndTime;
@ExcelProperty(value = "加盟费（含税）", order = 19)
@ExcelProperty(value = "加盟费（含税）", order = 20) // 原先是 19，现在调整为 20
@ColumnWidth(20)
private String franchiseFee;
@ExcelProperty(value = "第一年度管理费（含税）", order = 20)
@ExcelProperty(value = "第一年度管理费（含税）", order = 21) // 原先是 20，现在调整为 21
@ColumnWidth(40)
private String firstYearManagementFee;
@ExcelProperty(value = "设计费（含税）", order = 21)
@ExcelProperty(value = "设计费（含税）", order = 22) // 原先是 21，现在调整为 22
@ColumnWidth(20)
private String performanceBond;
@ExcelProperty(value = "保证金（含税）", order = 22)
@ExcelProperty(value = "保证金（含税）", order = 23) // 原先是 22，现在调整为 23
@ColumnWidth(20)
private String loanMargin;
@ExcelProperty(value = "第一年度品牌使用费（含税）", order = 23)
@ExcelProperty(value = "第一年度品牌使用费（含税）", order = 24) // 原先是 23，现在调整为 24
@ColumnWidth(40)
private String firstYearFee;
@ExcelProperty(value = "合计缴费金额（含税）", order = 24)
@ExcelProperty(value = "合计缴费金额（含税）", order = 25) // 原先是 24，现在调整为 25
@ColumnWidth(30)
private String totalAmountContributions;
@ExcelProperty(value = "加盟费优惠原因", order = 25)
@ExcelProperty(value = "加盟费优惠原因", order = 26) // 原先是 25，现在调整为 26
@ColumnWidth(30)
private String discountReason;
@ExcelProperty(value = "合同金额", order = 26)
@ExcelProperty(value = "合同金额", order = 27) // 原先是 26，现在调整为 27
@ColumnWidth(20)
private String contractAmount;
@ExcelProperty(value = "缴款人", order = 27)
@ExcelProperty(value = "缴款人", order = 28) // 原先是 27，现在调整为 28
@ColumnWidth(20)
private String payUserName;
@ExcelProperty(value = "第1次缴纳时间", order = 28)
@ExcelProperty(value = "第1次缴纳时间", order = 29) // 原先是 28，现在调整为 29
@ColumnWidth(20)
private String firstPayTime;
@ExcelProperty(value = "第2次缴纳时间", order = 29)
@ExcelProperty(value = "第2次缴纳时间", order = 30)
@ColumnWidth(30)
private String secondPayTime;
@ExcelProperty(value = "第3次缴纳时间", order = 30)
@ExcelProperty(value = "第3次缴纳时间", order = 31)
@ColumnWidth(30)
private String thirdPayTime;
@ExcelProperty(value = "第4次缴纳时间", order = 31)
@ExcelProperty(value = "第4次缴纳时间", order = 32)
@ColumnWidth(30)
private String fourthPayTime;
@ExcelProperty(value = "店铺地址", order = 32)
@ExcelProperty(value = "店铺地址", order = 33)
@ColumnWidth(40)
private String shopAddress;
@ExcelProperty(value = "阶段状态-缴纳加盟费/保证金", order = 33)
@ExcelProperty(value = "阶段状态-缴纳加盟费/保证金", order = 34)
@ColumnWidth(40)
private String franchiseFeeStageStatus;
@ExcelProperty(value = "阶段状态-加盟合同签约", order = 34)
@ExcelProperty(value = "阶段状态-加盟合同签约", order = 35)
@ColumnWidth(30)
private String signFranchiseStageStatus;
@ExcelProperty(value = "阶段状态-建店资料收集", order = 35)
@ExcelProperty(value = "阶段状态-建店资料收集", order = 36)
@ColumnWidth(30)
private String buildInformationStatus;
@ExcelProperty(value = "当前进度", order = 36)
@ExcelProperty(value = "当前进度", order = 37)
@ColumnWidth(20)
private String currentProgress;
@ExcelProperty(value = "状态", order = 37)
@ExcelProperty(value = "状态", order = 38)
@ColumnWidth(15)
private String shopStatus;
}

75
coolstore-partner-model/src/main/java/com/cool/store/dto/ExportJoinShopDTO.java
View File

@@ -12,7 +12,6 @@ import lombok.Data;
*/
@Data
public class ExportJoinShopDTO {
@ExcelProperty(value = "门店编码", order = 1)
@ColumnWidth(20)
private String shopCode;
@@ -25,143 +24,147 @@ public class ExportJoinShopDTO {
@ColumnWidth(20)
private String storeType;
@ExcelProperty(value = "加盟模式", order = 4)
@ExcelProperty(value = "签约类型", order = 4)
@ColumnWidth(20)
private String signType;
@ExcelProperty(value = "加盟模式", order = 5)
@ColumnWidth(20)
private String joinMode;
@ExcelProperty(value = "加盟商姓名", order = 5)
@ExcelProperty(value = "加盟商姓名", order = 6)
@ColumnWidth(20)
private String username;
@ExcelProperty(value = "加盟商手机号", order = 6)
@ExcelProperty(value = "加盟商手机号", order = 7)
@ColumnWidth(20)
private String mobile;
@ExcelProperty(value = "所属大区", order = 7)
@ExcelProperty(value = "所属大区", order = 8)
@ColumnWidth(20)
private String regionName;
@ExcelProperty(value = "督导", order = 8)
@ExcelProperty(value = "督导", order = 9)
@ColumnWidth(20)
private String investmentManagerName;
@ExcelProperty(value = "签约人1姓名", order = 9)
@ExcelProperty(value = "签约人1姓名", order = 10)
@ColumnWidth(20)
private String partnershipSignatoryFirst;
@ExcelProperty(value = "签约人1手机号", order = 10)
@ExcelProperty(value = "签约人1手机号", order = 11)
@ColumnWidth(20)
private String partnershipSignatoryFirstMobile;
@ExcelProperty(value = "签约人1身份证号码", order = 11)
@ExcelProperty(value = "签约人1身份证号码", order = 12)
@ColumnWidth(30)
private String partnershipSignatoryFirstIdCard;
@ExcelProperty(value = "签约人2姓名", order = 12)
@ExcelProperty(value = "签约人2姓名", order = 13)
@ColumnWidth(20)
private String partnershipSignatorySecond;
@ExcelProperty(value = "签约人2手机号", order = 13)
@ExcelProperty(value = "签约人2手机号", order = 14)
@ColumnWidth(20)
private String partnershipSignatorySecondMobile;
@ExcelProperty(value = "签约人2身份证号码", order = 14)
@ExcelProperty(value = "签约人2身份证号码", order = 15)
@ColumnWidth(30)
private String partnershipSignatorySecondIdCard;
@ExcelProperty(value = "合同编号", order = 15)
@ExcelProperty(value = "合同编号", order = 16)
@ColumnWidth(20)
private String contractCode;
@ExcelProperty(value = "第一年加盟开始日期", order = 16)
@ExcelProperty(value = "第一年加盟开始日期", order = 17)
@ColumnWidth(30)
private String firstYearStartTime;
@ExcelProperty(value = "第一年管理费到期日期", order = 17)
@ExcelProperty(value = "第一年管理费到期日期", order = 18)
@ColumnWidth(30)
private String firstYearEndTime;
@ExcelProperty(value = "加盟费（含税）", order = 18)
@ExcelProperty(value = "加盟费（含税）", order = 19)
@ColumnWidth(20)
private String franchiseFee;
@ExcelProperty(value = "第一年度管理费（含税）", order = 19)
@ExcelProperty(value = "第一年度管理费（含税）", order = 20)
@ColumnWidth(40)
private String firstYearManagementFee;
@ExcelProperty(value = "设计费（含税）", order = 20)
@ExcelProperty(value = "设计费（含税）", order = 21)
@ColumnWidth(20)
private String performanceBond;
@ExcelProperty(value = "保证金（含税）", order = 21)
@ExcelProperty(value = "保证金（含税）", order = 22)
@ColumnWidth(20)
private String loanMargin;
@ExcelProperty(value = "第一年度品牌使用费（含税）", order = 22)
@ExcelProperty(value = "第一年度品牌使用费（含税）", order = 23)
@ColumnWidth(40)
private String firstYearFee;
@ExcelProperty(value = "合计缴费金额（含税）", order = 23)
@ExcelProperty(value = "合计缴费金额（含税）", order = 24)
@ColumnWidth(30)
private String totalAmountContributions;
@ExcelProperty(value = "加盟费优惠原因", order = 24)
@ExcelProperty(value = "加盟费优惠原因", order = 25)
@ColumnWidth(30)
private String discountReason;
@ExcelProperty(value = "店面租金", order = 25)
@ExcelProperty(value = "店面租金", order = 26)
@ColumnWidth(20)
private String monthRent;
@ExcelProperty(value = "省", order = 26)
@ExcelProperty(value = "省", order = 27)
@ColumnWidth(15)
private String province;
@ExcelProperty(value = "市", order = 27)
@ExcelProperty(value = "市", order = 28)
@ColumnWidth(15)
private String city;
@ExcelProperty(value = "区", order = 28)
@ExcelProperty(value = "区", order = 29)
@ColumnWidth(15)
private String district;
@ExcelProperty(value = "场地实际面积", order = 29)
@ExcelProperty(value = "场地实际面积", order = 30)
@ColumnWidth(15)
private String area;
@ExcelProperty(value = "报货物流仓库", order = 30)
@ExcelProperty(value = "报货物流仓库", order = 31)
@ColumnWidth(25)
private String declareGoodsLogisticsWarehouseName;
@ExcelProperty(value = "报货类型", order = 31)
@ExcelProperty(value = "报货类型", order = 32)
@ColumnWidth(20)
private String declareGoodsType;
@ExcelProperty(value = "云流水报货时间", order = 32)
@ExcelProperty(value = "云流水报货时间", order = 33)
@ColumnWidth(35)
private String ylsDeclareGoodsTime;
@ExcelProperty(value = "仓库配送时间", order = 33)
@ExcelProperty(value = "仓库配送时间", order = 34)
@ColumnWidth(35)
private String warehouseDeliveryTime;
@ExcelProperty(value = "收款公司", order = 34)
@ExcelProperty(value = "收款公司", order = 35)
@ColumnWidth(35)
private String receivingFirmName;
@ExcelProperty(value = "收款公司民生银行账号", order = 35)
@ExcelProperty(value = "收款公司民生银行账号", order = 36)
@ColumnWidth(35)
private String receivingMsBankAccount;
@ExcelProperty(value = "店铺地址", order = 36)
@ExcelProperty(value = "店铺地址", order = 37)
@ColumnWidth(40)
private String shopAddress;
@ExcelProperty(value = "阶段状态-建店资料收集", order = 37)
@ExcelProperty(value = "阶段状态-建店资料收集", order = 38)
@ColumnWidth(30)
private String buildInformationStatus;
@ExcelProperty(value = "建店资料完成时间", order = 38)
@ExcelProperty(value = "建店资料完成时间", order = 39)
@ColumnWidth(30)
private String buildInformationEndTime;
}

69
coolstore-partner-model/src/main/java/com/cool/store/dto/ExportProgressDTO.java
View File

@@ -12,7 +12,6 @@ import lombok.Data;
*/
@Data
public class ExportProgressDTO {
@ExcelProperty(value = "门店编码", order = 1)
@ColumnWidth(20)
private String shopCode;
@@ -29,131 +28,135 @@ public class ExportProgressDTO {
@ColumnWidth(20)
private String storeType;
@ExcelProperty(value = "所属品牌", order = 5)
@ExcelProperty(value = "签约类型", order = 5)
@ColumnWidth(20)
private String signType;
@ExcelProperty(value = "所属品牌", order = 6)
@ColumnWidth(20)
private String franchiseBrand;
@ExcelProperty(value = "加盟模式", order = 6)
@ExcelProperty(value = "加盟模式", order = 7)
@ColumnWidth(20)
private String joinMode;
@ExcelProperty(value = "加盟商姓名", order = 7)
@ExcelProperty(value = "加盟商姓名", order = 8)
@ColumnWidth(20)
private String username;
@ExcelProperty(value = "加盟商手机号", order = 8)
@ExcelProperty(value = "加盟商手机号", order = 9)
@ColumnWidth(20)
private String mobile;
@ExcelProperty(value = "所属大区", order = 9)
@ExcelProperty(value = "所属大区", order = 10)
@ColumnWidth(20)
private String regionName;
@ExcelProperty(value = "督导", order = 10)
@ExcelProperty(value = "督导", order = 11)
@ColumnWidth(20)
private String investmentManagerName;
@ExcelProperty(value = "火码POS账号状态", order = 11)
@ExcelProperty(value = "火码POS账号状态", order = 12)
@ColumnWidth(25)
private String posStatus;
@ExcelProperty(value = "云流水账号状态", order = 12)
@ExcelProperty(value = "云流水账号状态", order = 13)
@ColumnWidth(25)
private String ylsStatus;
@ExcelProperty(value = "营帐通开通状态", order = 13)
@ExcelProperty(value = "营帐通开通状态", order = 14)
@ColumnWidth(25)
private String yztStatus;
@ExcelProperty(value = "信发系统开通状态", order = 14)
@ExcelProperty(value = "信发系统开通状态", order = 15)
@ColumnWidth(25)
private String xfStatus;
@ExcelProperty(value = "新掌柜账号状态", order = 15)
@ExcelProperty(value = "新掌柜账号状态", order = 16)
@ColumnWidth(25)
private String xzgStatus;
@ExcelProperty(value = "美团团购账号状态", order = 16)
@ExcelProperty(value = "美团团购账号状态", order = 17)
@ColumnWidth(25)
private String mtgStatus;
@ExcelProperty(value = "抖音团购账号", order = 17)
@ExcelProperty(value = "抖音团购账号", order = 18)
@ColumnWidth(25)
private String dygStatus;
@ExcelProperty(value = "快手团购账号状态", order = 18)
@ExcelProperty(value = "快手团购账号状态", order = 19)
@ColumnWidth(25)
private String ksgStatus;
@ExcelProperty(value = "饿了么外卖账号状态", order = 19)
@ExcelProperty(value = "饿了么外卖账号状态", order = 20)
@ColumnWidth(25)
private String elmStatus;
@ExcelProperty(value = "美团外卖账号状态", order = 20)
@ExcelProperty(value = "美团外卖账号状态", order = 21)
@ColumnWidth(25)
private String mtwStatus;
@ExcelProperty(value = "京东外卖账号状态", order = 21)
@ExcelProperty(value = "京东外卖账号状态", order = 22)
@ColumnWidth(25)
private String jdwStatus;
@ExcelProperty(value = "选址", order = 22)
@ExcelProperty(value = "选址", order = 23)
@ColumnWidth(20)
private String addressStatus;
@ExcelProperty(value = "租赁合同", order = 23)
@ExcelProperty(value = "租赁合同", order = 24)
@ColumnWidth(20)
private String leaseStatus;
@ExcelProperty(value = "缴纳加盟费/保证金", order = 24)
@ExcelProperty(value = "缴纳加盟费/保证金", order = 25)
@ColumnWidth(25)
private String joinFeeStatus;
@ExcelProperty(value = "加盟合同签约", order = 25)
@ExcelProperty(value = "加盟合同签约", order = 26)
@ColumnWidth(20)
private String joinContractStatus;
@ExcelProperty(value = "营业执照", order = 26)
@ExcelProperty(value = "营业执照", order = 27)
@ColumnWidth(20)
private String businessLicenseStatus;
@ExcelProperty(value = "食品经营许可证", order = 27)
@ExcelProperty(value = "食品经营许可证", order = 28)
@ColumnWidth(20)
private String foodLicenseStatus;
@ExcelProperty(value = "建店资料收集", order = 28)
@ExcelProperty(value = "建店资料收集", order = 29)
@ColumnWidth(20)
private String buildStatus;
@ExcelProperty(value = "建店资料完成时间", order = 29)
@ExcelProperty(value = "建店资料完成时间", order = 30)
@ColumnWidth(25)
private String buildEndTime;
@ExcelProperty(value = "设计阶段", order = 30)
@ExcelProperty(value = "设计阶段", order = 31)
@ColumnWidth(20)
private String designStatus;
@ExcelProperty(value = "施工阶段", order = 31)
@ExcelProperty(value = "施工阶段", order = 32)
@ColumnWidth(20)
private String constructionStatus;
@ExcelProperty(value = "装修验收", order = 32)
@ExcelProperty(value = "装修验收", order = 33)
@ColumnWidth(20)
private String decorationStatus;
@ExcelProperty(value = "培训登记", order = 33)
@ExcelProperty(value = "培训登记", order = 34)
@ColumnWidth(15)
private String trainStatus;
@ExcelProperty(value = "开业运营方案", order = 34)
@ExcelProperty(value = "开业运营方案", order = 35)
@ColumnWidth(20)
private String openPlanStatus;
@ExcelProperty(value = "当前进度", order = 35)
@ExcelProperty(value = "当前进度", order = 36)
@ColumnWidth(30)
private String currentProgress;
@ExcelProperty(value = "状态", order = 36)
@ExcelProperty(value = "状态", order = 37)
@ColumnWidth(20)
private String shopStatus;
}

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

@@ -343,6 +343,7 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
dto.setSignTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getCreateTime()));
dto.setPartnershipSignatoryFirst(signFranchiseDO.getPartnershipSignatoryFirst());
dto.setPartnershipSignatorySecond(signFranchiseDO.getPartnershipSignatorySecond());
dto.setSignType(SignTypeEnum.getDescByCode(signFranchiseDO.getSignType()));
}
List<Date> payTime = payTimeMap.getOrDefault(response.getShopId(), new ArrayList<>());
for (int i = 0; i < payTime.size() && i <= 3; i++) {
@@ -481,6 +482,7 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
dto.setContractCode(signFranchiseDO.getContractCode());
dto.setPartnershipSignatoryFirst(signFranchiseDO.getPartnershipSignatoryFirst());
dto.setPartnershipSignatorySecond(signFranchiseDO.getPartnershipSignatorySecond());
dto.setSignType(SignTypeEnum.getDescByCode(signFranchiseDO.getSignType()));
}
ShopStageInfoDO buildStageInfoDO = buildStageMap.get(response.getShopId());
if (buildStageInfoDO != null) {
@@ -527,13 +529,21 @@ public class ExportRealizeServiceImpl implements ExportRealizeService {
}
cShopNameMap.put(buildInformationDO.getShopId(), cShopName);
}
List<SignFranchiseDO> signFranchises = signFranchiseMapper.selectByShopIds(shopIds);
Map<Long, SignFranchiseDO> signFranchiseMap = new HashMap<>();
if (signFranchises != null) {
signFranchiseMap = signFranchises.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, Function.identity()));
}
List<ShopAccountDO> shopAccountList = shopaccountDAO.getSpecificByShopIds(shopIds);
Map<Long, List<ShopAccountDO>> shopAccountMap = shopAccountList.stream().collect(Collectors.groupingBy(ShopAccountDO::getShopId, Collectors.toList()));
List<ShopStageInfoDO> shopSubStages = shopStageInfoDAO.getShopSubStages(shopIds);
Map<Long, List<ShopStageInfoDO>> shopSubStageMap = shopSubStages.stream().collect(Collectors.groupingBy(ShopStageInfoDO::getShopId, Collectors.toList()));
for (BranchShopResponse response : list) {
ExportProgressDTO dto = new ExportProgressDTO();
SignFranchiseDO signFranchiseDO = signFranchiseMap.get(response.getShopId());
if (signFranchiseDO != null) {
dto.setSignType(SignTypeEnum.getDescByCode(signFranchiseDO.getSignType()));
}
dto.setStoreType(StoreTypeEnum.getMessage(response.getStoreType()));
dto.setUsername(response.getUsername());
dto.setMobile(response.getMobile());

4
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ExportController.java
View File

@@ -47,12 +47,12 @@ public class ExportController {
return ResponseResult.success(exportService.exportProgressBase(request, CurrentUserHolder.getUser(), FileTypeEnum.EXPORT_FINANCE));
}
@PostMapping("/exportJoinShop")
@ApiOperation("开店导出")
@ApiOperation("加盟开店申请导出")
public ResponseResult exportJoinShop(@RequestBody BranchShopRequest request) {
return ResponseResult.success(exportService.exportProgressBase(request, CurrentUserHolder.getUser(), FileTypeEnum.EXPORT_JOIN_SHOP));
}
@PostMapping("/exportProgress")
@ApiOperation("进度导出")
@ApiOperation("进度确认导出")
public ResponseResult exportProgress(@RequestBody BranchShopRequest request) {
return ResponseResult.success(exportService.exportProgressBase(request, CurrentUserHolder.getUser(), FileTypeEnum.EXPORT_PROGRESS));
}