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

Merge #119 into master from cc_20260508_open_store_req

Browse Source 
门店新开店需求7&主数据需求2

* cc_20260508_open_store_req: (4 commits squashed)

  - fix:未开业门店试营业日期

  - fix:开业日期报备不同步门店状态

  - fix:修改门店开业日期判断条件修改

  - Merge branch 'master' into cc_20260508_open_store_req
    
    # Conflicts:
    #	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java

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

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/119
This commit is contained in:
王非凡
2026-05-10 13:44:42 +00:00
committed by 正新
parent a42a109b6c
commit 162674c0b2
10 changed files with 277 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,10 @@
package com.cool.store.service;
import com.cool.store.request.storeopen.StoreDailyNonOpenMissingRequest;
import com.cool.store.request.storeopen.StoreMonthRevenueRequest;
import com.cool.store.request.storeopen.StoreRecipeDailySalesRequest;
import com.cool.store.request.storeopen.StoreRecipesRequest;
import com.cool.store.response.storeopen.StoreDailyNonOpenMissingResponse;
import com.cool.store.response.storeopen.StoreMonthRevenueResponse;
import com.cool.store.response.storeopen.StoreRecipeDailySalesResponse;
import com.cool.store.response.storeopen.StoreRecipesResponse;
@@ -40,4 +42,12 @@ public interface ThirdStoreOpenDataService {
* @return 菜品种类列表
*/
List<StoreRecipesResponse> getRecipes(StoreRecipesRequest request);
/**
* 查询门店未开通缺失日表数据
*
* @param request 请求参数
* @return 缺失日表数据列表
*/
List<StoreDailyNonOpenMissingResponse> getDailyNonOpenMissing(StoreDailyNonOpenMissingRequest request);
}

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

@@ -1151,7 +1151,7 @@ public class ShopServiceImpl implements ShopService {
//更新门店为开业状态 且使用开业日期
StoreDO store = storeDao.getByStoreNum(shopInfo.getShopCode());
if (store!=null){
storeDao.updateStoreStatus(store.getStoreId(),"open",request.getOpenDate());
storeDao.updateStoreOpenDate(store.getStoreId(), request.getOpenDate());
}
return Boolean.TRUE;
}

9
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ThirdStoreOpenDataServiceImpl.java
View File

@@ -6,10 +6,12 @@ import com.cool.store.exception.ServiceException;
import com.cool.store.request.storeopen.StoreMonthRevenueRequest;
import com.cool.store.request.storeopen.StoreRecipeDailySalesRequest;
import com.cool.store.request.storeopen.StoreRecipesRequest;
import com.cool.store.request.storeopen.StoreDailyNonOpenMissingRequest;
import com.cool.store.response.storeopen.StoreMonthRevenueResponse;
import com.cool.store.response.storeopen.StoreOpenApiResponse;
import com.cool.store.response.storeopen.StoreRecipeDailySalesResponse;
import com.cool.store.response.storeopen.StoreRecipesResponse;
import com.cool.store.response.storeopen.StoreDailyNonOpenMissingResponse;
import com.cool.store.service.ThirdStoreOpenDataService;
import com.cool.store.utils.StoreOpenSigner;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -74,6 +76,13 @@ public class ThirdStoreOpenDataServiceImpl implements ThirdStoreOpenDataService
return executeApiCall(url, path, request, StoreRecipesResponse.class);
}
@Override
public List<StoreDailyNonOpenMissingResponse> getDailyNonOpenMissing(StoreDailyNonOpenMissingRequest request) {
String path = "/open/v1/store/dailyNonOpenMissing";
String url = apiUrl + path;
return executeApiCall(url, path, request, StoreDailyNonOpenMissingResponse.class);
}
private <T> List<T> executeApiCall(String url, String path, Object request, Class<T> responseType) {
logRequest(url, request);