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

Merge #97 into master from cc_20260414_store

Browse Source 
feat:bug处理

* cc_20260414_store: (6 commits squashed)

  - feat：省市区

  - feat：设备接口

  - feat：设备接口

  - feat：获取门店设备列表 get->post

  - feat：异常处理

  - feat:bug处理

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/97
This commit is contained in:
正新
2026-04-14 09:53:00 +00:00
parent 11ce6dc306
commit 9ad7fa0f5a
8 changed files with 267 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ package com.cool.store.controller.webb;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.annotation.Debounce;
import com.cool.store.dto.*;
import com.cool.store.dto.huoma.StoreXinFaDeviceDetail;
import com.cool.store.dto.region.BigRegionDTO;
import com.cool.store.dto.store.StoreUserPositionDTO;
import com.cool.store.dto.wallet.PaymentDTO;
@@ -31,6 +32,8 @@ import com.cool.store.response.bigdata.ApiResponse;
import com.cool.store.service.*;
import com.cool.store.service.privatesphere.PrivateSphereQrService;
import com.cool.store.service.wallet.WalletService;
import com.cool.store.service.xinfa.XinFaBusinessService;
import com.cool.store.service.xinfa.XinFaDeviceService;
import com.cool.store.utils.HttpHelper;
import com.cool.store.utils.poi.StringUtils;
import com.cool.store.service.close.CloseStoreService;
@@ -88,6 +91,8 @@ public class OpenApiController {
RegionService regionService;
@Resource
PrivateSphereQrService privateSphereQrService;
@Resource
XinFaBusinessService xinFaBusinessService;
@PostMapping("/statusRefresh")
public ApiResponse<Boolean> statusRefresh(@RequestBody StatusRefreshDTO statusRefreshDTO){
@@ -303,4 +308,11 @@ public class OpenApiController {
request.setClientIp(HttpHelper.getIpAddr(httpRequest));
return ApiResponse.success(privateSphereQrService.getPrivateSphereQr(request));
}
@ApiOperation("获取门店设备列表")
@PostMapping("/getDeviceByStoreNum")
public ApiResponse<List<StoreXinFaDeviceDetail>> getStoreXinFaDeviceDetail(@RequestBody StoreNumRequest request) {
return ApiResponse.success(xinFaBusinessService.getStoreXinFaDeviceDetail(request.getStoreNum()));
}
}