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

Merge #103 into master from cc_20250415_fix

Browse Source 
feat:标准店

* cc_20250415_fix: (2 commits squashed)

  - feat:认款取消校验

  - feat:标准店

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/103
This commit is contained in:
正新
2026-04-17 08:50:38 +00:00
parent fd1584f3e0
commit 7102127358
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
coolstore-partner-model/src/main/java/com/cool/store/request/StoreMasterDTO.java
View File

@@ -110,6 +110,21 @@ public class StoreMasterDTO {
@ApiModelProperty("是否统管")
private Integer unifiedManagement;
/**
* 铺位位置描述
*/
private String locationDescCode;
/**
* 是否是AI店
*/
private Integer useStandardStore;
/**
* 店型名称
*/
private String storeTypeName;
@Data
public static class SignerInfo {
@ApiModelProperty("签约人1姓名")

10
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncMainSysServerImpl.java
View File

@@ -2,7 +2,9 @@ package com.cool.store.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.dao.*;
import com.cool.store.dao.order.StoreOrderDAO;
import com.cool.store.entity.*;
import com.cool.store.entity.order.StoreOrderDO;
import com.cool.store.enums.*;
import com.cool.store.enums.point.PaymentMethodEnum;
import com.cool.store.enums.wallet.YztStoreModel;
@@ -67,6 +69,8 @@ public class SyncMainSysServerImpl implements SyncMainSysServer {
addStore(shopId);
}
@Resource
StoreOrderDAO storeOrderDAO;
/**
* 添加门店
@@ -80,6 +84,10 @@ public class SyncMainSysServerImpl implements SyncMainSysServer {
log.info("门店不存在:{}", shopId);
return;
}
StoreOrderDO order = storeOrderDAO.getLatestOrderByShopId(shopId);
if (order!=null){
storeMasterDTO.setStoreTypeName(order.getStoreTypeName());
}
storeMasterDTO.setEnterpriseId(eid);
storeMasterDTO.setStoreId(shopInfo.getStoreId());
storeMasterDTO.setStoreStatus("not_open");
@@ -88,6 +96,7 @@ public class SyncMainSysServerImpl implements SyncMainSysServer {
storeMasterDTO.setJoinBrand(StringUtils.isNotEmpty(shopInfo.getFranchiseBrand())?Integer.valueOf(shopInfo.getFranchiseBrand()):null);
storeMasterDTO.setJoinModel(shopInfo.getJoinMode());
storeMasterDTO.setStoreType(shopInfo.getStoreType());
storeMasterDTO.setUseStandardStore(shopInfo.getUseStandardStore());
SignFranchiseDO signFranchiseDO = signFranchiseDAO.selectByShopId(shopId);
storeMasterDTO.setManageModel(signFranchiseDO.getBusinessModel());
@@ -158,6 +167,7 @@ public class SyncMainSysServerImpl implements SyncMainSysServer {
storeMasterDTO.setPointCode(info.getPointCode());
storeMasterDTO.setLongitude(info.getLongitude());
storeMasterDTO.setLatitude(info.getLatitude());
storeMasterDTO.setLocationDescCode(info.getLocationDescCode());
try {
if (StringUtils.isNotEmpty(pointDetail.getMonthRent())&&pointDetail.getPaymentMethod()!=null){
//获取支付方式