diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java index 916f5fa05..81c2bb8e4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java @@ -213,7 +213,8 @@ public class ZxjpApiRequest { @ApiModelProperty(value = "银行银联号") private String bankUnionPayAccount; - + @ApiModelProperty("店铺类型:0-无展示门店、1-餐厅店、2-普通门店") + private Integer storeType; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java index acd950052..a344eb80d 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java @@ -48,6 +48,11 @@ public class FranchiseFeeResponse { private LinePay linePayDO; + @ApiModelProperty("铺位租金") + private String monthRent; + @ApiModelProperty("铺位面积") + private String pointArea; + @Data public static class LinePay{ @ApiModelProperty("") diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java index 1030327f3..e1e5d0856 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java @@ -2,6 +2,8 @@ package com.cool.store.service.impl; import com.alibaba.fastjson.JSONObject; import com.cool.store.context.LoginUserInfo; +import com.cool.store.dao.PointDetailInfoDAO; +import com.cool.store.dao.PointInfoDAO; import com.cool.store.dao.ShopStageInfoDAO; import com.cool.store.entity.*; import com.cool.store.enums.*; @@ -28,6 +30,10 @@ import java.util.stream.Collectors; @Slf4j public class FranchiseFeeServiceImpl implements FranchiseFeeService { + @Resource + private PointInfoDAO pointInfoDAO; + @Resource + private PointDetailInfoDAO pointDetailInfoDAO; @Resource FranchiseFeeMapper franchiseFeeMapper; @@ -112,6 +118,13 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { } resp.setLinePayDO(linePayResult); } + ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId); + if (shopInfoDO.getPointId() != null ){ + PointInfoDO pointInfoDO = pointInfoDAO.getPointInfoById(shopInfoDO.getPointId()); + PointDetailInfoDO pointDetailInfoDO = pointDetailInfoDAO.getPointDetailInfoByPointId(shopInfoDO.getPointId()); + resp.setPointArea(pointInfoDO.getPointArea()); + resp.setMonthRent(pointDetailInfoDO.getMonthRent()); + } return resp; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java index 3c819649b..7a426ba5c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java @@ -102,6 +102,7 @@ public class SyncDataServiceImpl implements SyncDataService { request.setPartnerIdCardNo(qualificationsInfoDO.getIdCardNo()); request.setShopAddress(shopInfo.getDetailAddress()); + request.setStoreType(shopInfo.getStoreType()); if (signFranchiseDO != null) { List partnershipSignatory = new ArrayList<>(); partnershipSignatory.add(signFranchiseDO.getPartnershipSignatoryFirst());