门店类型同步接口优化
This commit is contained in:
@@ -213,7 +213,8 @@ public class ZxjpApiRequest {
|
||||
@ApiModelProperty(value = "银行银联号")
|
||||
private String bankUnionPayAccount;
|
||||
|
||||
|
||||
@ApiModelProperty("店铺类型:0-无展示门店、1-餐厅店、2-普通门店")
|
||||
private Integer storeType;
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -48,6 +48,11 @@ public class FranchiseFeeResponse {
|
||||
|
||||
private LinePay linePayDO;
|
||||
|
||||
@ApiModelProperty("铺位租金")
|
||||
private String monthRent;
|
||||
@ApiModelProperty("铺位面积")
|
||||
private String pointArea;
|
||||
|
||||
@Data
|
||||
public static class LinePay{
|
||||
@ApiModelProperty("")
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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<String> partnershipSignatory = new ArrayList<>();
|
||||
partnershipSignatory.add(signFranchiseDO.getPartnershipSignatoryFirst());
|
||||
|
||||
Reference in New Issue
Block a user