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

Merge branch 'cc_20250422' into 'master'

Browse Source 
Cc 20250422

See merge request hangzhou/java/custom_zxjp!65
This commit is contained in:
苏竹红
2025-04-22 13:56:01 +00:00
parent d39ee0f628 d0cef8a4a8
commit c75523cd80
17 changed files with 67 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-dao/src/main/java/com/cool/store/mapper/SignFranchiseMapper.java
View File

@@ -14,4 +14,5 @@ public interface SignFranchiseMapper extends Mapper<SignFranchiseDO> {
@Param("shopId") Long shopId);
List<SignFranchiseDO> selectByShopIds( @Param("list")List<Long> shopIds);
Integer dateHandle();
}

3
coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
View File

@@ -28,6 +28,7 @@
<result column="shop_status" jdbcType="TINYINT" property="shopStatus"/>
<result column="create_user_id" jdbcType="VARCHAR" property="createUserId"/>
<result column="update_user_id" jdbcType="VARCHAR" property="updateUserId"/>
<result column="store_type" jdbcType="TINYINT" property="storeType"/>
</resultMap>
<sql id="allColumn">
@@ -35,7 +36,7 @@
, region_id, line_id, partner_id, point_id, shop_name,
shop_code, store_num, shop_manager_user_id, supervisor_user_id,
plan_open_time, cur_progress, shop_type, shop_stage, deleted, create_time, update_time,
join_mode,detail_address,franchise_brand,development_manager,want_shop_area_id,investment_manager,shop_status,create_user_id,update_user_id
join_mode,detail_address,franchise_brand,development_manager,want_shop_area_id,investment_manager,shop_status,create_user_id,update_user_id,store_type
</sql>
<insert id="batchAddShop" useGeneratedKeys="true" keyProperty="id" keyColumn="id">

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

@@ -6,6 +6,10 @@
set audit_id = #{auditId}
where shop_id = #{shopId}
</update>
<update id="dateHandle">
update xfsg_sign_franchise
set sign_type = 1
</update>
<select id="selectByShopId" resultType="com.cool.store.entity.SignFranchiseDO">
select *
from xfsg_sign_franchise

3
coolstore-partner-model/src/main/java/com/cool/store/entity/ShopInfoDO.java
View File

@@ -129,5 +129,6 @@ public class ShopInfoDO {
@Column(name = "shop_status")
private Integer shopStatus;
@Column(name = "store_type")
private Integer storeType;
}

12
coolstore-partner-model/src/main/java/com/cool/store/request/AddSignFranchiseRequest.java
View File

@@ -21,17 +21,21 @@ public class AddSignFranchiseRequest {
private Long regionId;
@NotBlank(message = "加盟签约店铺名称不能为空")
private String shopName;
@NotBlank(message = "门店地址不能为空")
private String detailAddress;
@ApiModelProperty("加盟品牌")
@NotBlank(message = "加盟品牌不能为空")
private String franchiseBrand;
@ApiModelProperty("【门店类型】：0-无展示门店、1-餐厅店、2-普通门店'")
@NotNull(message = "门店类型不能为空")
private Integer storeType;
@ApiModelProperty("经营模式（0 无 1直营 2加盟）")
@NotNull(message = "经营模式不能为空")
private Integer businessModel;
@ApiModelProperty("加盟模式（1-加盟部加盟店、2-加盟公司、3-自有加盟、4-强加盟）")
@@ -41,7 +45,7 @@ public class AddSignFranchiseRequest {
/**
* SignTypeEnum
*/
@ApiModelProperty("签约类型,0.转让　1.新签　2.续签　3.迁址　5.新签同异业转化")
@ApiModelProperty("签约类型,0.转让　1.新签　2.续签　3.迁址　5.新签同异业转化，6-老店新开 7-直营转加盟")
private Integer signType;
@ApiModelProperty("品牌使用费比例")
@@ -80,8 +84,10 @@ public class AddSignFranchiseRequest {
private String mobile;
@ApiModelProperty("合同编码")
@NotBlank(message = "合同编码不能为空")
private String contractCode;
@ApiModelProperty("合同金额")
@NotBlank(message = "合同金额不能为空")
private String contractAmount;
@ApiModelProperty("合伙签约人1")
@NotBlank(message = "合伙签约人1不能为空")

4
coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopDetailRequest.java
View File

@@ -34,4 +34,8 @@ public class BranchShopDetailRequest {
private String shopCode;
@ApiModelProperty("门店名称")
private String shopName;
@ApiModelProperty("店铺类型：0-无展示门店、1-餐厅店、2-普通门店")
@NotNull(message = "门店类型不能为空")
private Integer storeType;
}

3
coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java
View File

@@ -213,7 +213,8 @@ public class ZxjpApiRequest {
@ApiModelProperty(value = "银行银联号")
private String bankUnionPayAccount;
@ApiModelProperty("店铺类型：0-无展示门店、1-餐厅店、2-普通门店")
private Integer storeType;

3
coolstore-partner-model/src/main/java/com/cool/store/response/AddSignFranchiseResponse.java
View File

@@ -25,6 +25,9 @@ public class AddSignFranchiseResponse {
/**
* SignTypeEnum
*/
@ApiModelProperty("【门店类型】：0-无展示门店、1-餐厅店、2-普通门店'")
private Integer storeType;
@ApiModelProperty("签约类型,0.转让　1.新签　2.续签　3.迁址　5.新签同异业转化")
private Integer signType;

3
coolstore-partner-model/src/main/java/com/cool/store/response/BranchShopDetailResponse.java
View File

@@ -69,4 +69,7 @@ public class BranchShopDetailResponse {
@ApiModelProperty("铺位id")
private Long pointId;
@ApiModelProperty("店铺类型：0-无展示门店、1-餐厅店、2-普通门店")
private Integer storeType;
}

5
coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java
View File

@@ -48,6 +48,11 @@ public class FranchiseFeeResponse {
private LinePay linePayDO;
@ApiModelProperty("铺位租金")
private String monthRent;
@ApiModelProperty("铺位面积")
private String pointArea;
@Data
public static class LinePay{
@ApiModelProperty("")

1
coolstore-partner-service/src/main/java/com/cool/store/service/SignFranchiseService.java
View File

@@ -24,4 +24,5 @@ public interface SignFranchiseService {
*/
Boolean rePay(Long shopId);
Integer dateHandle();
}

13
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java
View File

@@ -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;
}

3
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java
View File

@@ -363,7 +363,8 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
if (Objects.isNull(platformBuildDO)) {
BeanUtils.copyProperties(informationDO, platformBuildResponse);
AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoDAO.selectByShopId(shopId);
platformBuildResponse.setStorePositioningUrl(acceptanceInfoDO.getShopLocationScreenshots());
if(Objects.nonNull(acceptanceInfoDO)){
platformBuildResponse.setStorePositioningUrl(acceptanceInfoDO.getShopLocationScreenshots());}
return platformBuildResponse;
}
BeanUtils.copyProperties(platformBuildDO, platformBuildResponse);

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
View File

@@ -380,6 +380,7 @@ public class ShopServiceImpl implements ShopService {
response.setShopName(shopInfo.getShopName());
response.setJoinMode(shopInfo.getJoinMode());
response.setShopCode(shopInfo.getShopCode());
response.setStoreType(shopInfo.getStoreType());
response.setShopStatus(shopInfo.getShopStatus());
response.setFranchiseBrand(shopInfo.getFranchiseBrand());
if (CollectionUtils.isNotEmpty(shopContractActualCompletionTime)) {
@@ -410,6 +411,7 @@ public class ShopServiceImpl implements ShopService {
shopInfo.setRegionId(request.getRegionId());
shopInfo.setJoinMode(request.getJoinMode());
shopInfo.setFranchiseBrand(request.getFranchiseBrand());
shopInfo.setStoreType(request.getStoreType());
return shopInfoDAO.updateShopInfo(shopInfo);
}

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

@@ -212,6 +212,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
shopInfoDO.setJoinMode(request.getJoinMode());
shopInfoDO.setFranchiseBrand(request.getFranchiseBrand());
shopInfoDO.setUpdateTime(new Date());
shopInfoDO.setStoreType(request.getStoreType());
shopInfoMapper.updateByPrimaryKeySelective(shopInfoDO);
OrderSysInfoDO orderSysInfoDO = orderSysInfoDAO.selectByShopId(request.getShopId());
if (Objects.isNull(orderSysInfoDO)){
@@ -282,6 +283,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
addSignFranchiseResponse.setDetailAddress(shopInfoDO.getDetailAddress());
addSignFranchiseResponse.setStoreType(shopInfoDO.getStoreType());
if (Objects.nonNull(signFranchiseDO)) {
addSignFranchiseResponse.setId(signFranchiseDO.getId());
addSignFranchiseResponse.setShopId(signFranchiseDO.getShopId());
@@ -394,6 +396,11 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
return true;
}
@Override
public Integer dateHandle() {
return signFranchiseMapper.dateHandle();
}
private int timeUtils(Date time, String type) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(time);

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java
View File

@@ -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());

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

@@ -40,4 +40,10 @@ public class PCSignFranchiseController {
return ResponseResult.success(signFranchiseService.rePay(shopId));
}
@ApiOperation("数据处理，全部设置为新签")
@GetMapping("/dateHandle")
public ResponseResult<Integer> dateHandle() {
return ResponseResult.success(signFranchiseService.dateHandle());
}
}