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

Merge branch 'master' into cc_20250523

Browse Source 
# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java
This commit is contained in:
shuo.wang
2025-05-27 13:56:09 +08:00
parent ad7c879a78 865cfdc857
commit 9a58b1f2a7
27 changed files with 333 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,4 +212,20 @@ public class DeskController {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.measurePendingList(pageNumber,pageSize,userInfo));
}
@ApiOperation("待处理-营业执照")
@GetMapping("/businessLicensePendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> businessLicensePendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.businessLicensePendingList(pageNumber,pageSize,userInfo));
}
@ApiOperation("待处理-食品许可证")
@GetMapping("/foodLicensePendingList")
public ResponseResult<PageInfo<PreparationCommonPendingVO>> foodLicensePendingList(@RequestParam(value = "pageNumber",required = true,defaultValue = "1")Integer pageNumber,
@RequestParam(value = "pageSize",required = true,defaultValue = "10")Integer pageSize) {
LoginUserInfo userInfo = CurrentUserHolder.getUser();
return ResponseResult.success(deskService.foodLicensePendingList(pageNumber,pageSize,userInfo));
}
}

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

@@ -190,5 +190,16 @@ public class LineInfoController {
public ResponseResult<Boolean> hasLineRegion(@RequestParam("lineId")Long lineId) {
return ResponseResult.success(lineService.hasRegionId(lineId));
}
@ApiOperation("获取ai模块是否展示，true展示false不展示")
@GetMapping("/getAiModule")
public ResponseResult<Boolean> getAiModule() {
return ResponseResult.success(lineService.getAiModule());
}
@ApiOperation("设置ai模块是否展示，true展示false不展示")
@GetMapping("/setAiModule")
public ResponseResult<Boolean> setAiModule(@RequestParam("flag") Boolean flag) {
return ResponseResult.success(lineService.setAiModule(flag));
}
}

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

@@ -2,19 +2,21 @@ package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.context.PartnerUserHolder;
import com.cool.store.request.LicenseListRequest;
import com.cool.store.request.license.BusinessLicenseRequest;
import com.cool.store.request.license.FoodLicenseRequest;
import com.cool.store.response.LicenseListResponse;
import com.cool.store.response.ResponseResult;
import com.cool.store.response.SubmitLicenseResponse;
import com.cool.store.service.ApplyLicenseService;
import com.cool.store.vo.PartnerUserInfoVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -60,4 +62,22 @@ public class PCApplyLicenseController {
LoginUserInfo user = CurrentUserHolder.getUser();
return ResponseResult.success(applyLicenseService.licenseExamine(shopId, status, result, user));
}
@ApiOperation("证照办理提交-营业执照")
@PostMapping("/submitBusinessLicense")
public ResponseResult submitBusinessLicense(@RequestBody @Validated BusinessLicenseRequest request) {
PartnerUserInfoVO user = PartnerUserHolder.getUser();
return ResponseResult.success(applyLicenseService.submitBusinessLicense(request,user));
}
@ApiOperation("证照办理提交-食品许可证")
@PostMapping("/submitFoodLicense")
public ResponseResult submitFoodLicense(@RequestBody FoodLicenseRequest request) {
PartnerUserInfoVO user = PartnerUserHolder.getUser();
return ResponseResult.success(applyLicenseService.submitFoodLicense(request,user));
}
}

51
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCBankController.java Normal file
View File

@@ -0,0 +1,51 @@
package com.cool.store.controller.webb;
import com.cool.store.entity.BankdocDO;
import com.cool.store.entity.BanktypeDO;
import com.cool.store.request.BankRequest;
import com.cool.store.request.BranchBankPageRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.BankService;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @author Fun Li 2023/8/10 14:20
* @version 1.0
*/
@RestController
@RequestMapping("/pc/bank")
@Api(tags = "PC银行信息")
@Slf4j
public class PCBankController {
@Autowired
private BankService bankService;
@ApiOperation("银行类型")
@GetMapping("/listBank")
public ResponseResult<List<BanktypeDO>> listBank() {
List<BanktypeDO> result = bankService.listBank();
return ResponseResult.success(result);
}
@ApiOperation("添加银行")
@PostMapping("/addBank")
public ResponseResult<Boolean> listBank(@RequestBody(required = true) BankRequest bankRequest) {
return ResponseResult.success( bankService.addBank(bankRequest.getName()));
}
@ApiOperation("支行列表查询")
@PostMapping("/listBranchBank")
public ResponseResult<PageInfo<BankdocDO>> listBranchBank(@RequestBody @Validated BranchBankPageRequest request) {
return ResponseResult.success(bankService.listBranchBank(request));
}
}

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

@@ -1,14 +1,13 @@
package com.cool.store.controller.webb;
import com.cool.store.request.BuildInformationRequest;
import com.cool.store.response.BuildInformationResponse;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.BuildInformationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -31,4 +30,16 @@ public class PCBuildInformationController {
return ResponseResult.success(buildInformationService.getBuildInformation(shopId));
}
@ApiOperation("提交/修改")
@PostMapping("/submitOrUpdate")
public ResponseResult<Integer> submitBuildInformation(@RequestBody @Validated BuildInformationRequest request) {
return ResponseResult.success(buildInformationService.submitOrUpdate(request));
}
@ApiOperation("获取加盟类型 1 - 个人加盟 2- 企业加盟")
@GetMapping("/getJoinType")
public ResponseResult<Integer> getJoinType(@RequestParam(value = "lineId", required = true) Long lineId) {
return ResponseResult.success(buildInformationService.getJoinType(lineId));
}
}

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

@@ -44,4 +44,12 @@ public class PCLinePayController {
return ResponseResult.success(linePayService.getAmount(lineId));
}
@ApiOperation("缴纳意向金/加盟费")
@PostMapping("/submitPayInfo")
public ResponseResult<Long> submitPayInfo(@RequestBody LinePaySubmitRequest request){
PartnerUserInfoVO partnerUser = PartnerUserHolder.getUser();
return ResponseResult.success(linePayService.submitPayInfo(request, partnerUser));
}
}

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

@@ -1,8 +1,14 @@
package com.cool.store.controller.webb;
import com.cool.store.dto.ocr.InvoiceDTO;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.enums.IDCardSideEnum;
import com.cool.store.exception.ServiceException;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.AliyunService;
import com.cool.store.vo.BusinessLicenseInfoVO;
import com.cool.store.vo.FoodLicenseVO;
import com.cool.store.vo.IdentityCardInfoVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -34,6 +40,37 @@ public class PCOcrController {
return ResponseResult.success(aliyunService.getRecognizeInvoiceWithOptions(imageUrl));
}
@GetMapping(path = "/getBusinessLicenseInfo")
@ApiOperation("根据营业证照解析获取数据")
public ResponseResult<BusinessLicenseInfoVO> getBusinessLicenseInfo(@RequestParam(value = "imageUrl")String imageUrl){
try {
BusinessLicenseInfoVO businessLicenseInfo = aliyunService.getBusinessLicenseInfo(imageUrl);
return ResponseResult.success(businessLicenseInfo);
} catch (Exception e) {
throw new ServiceException(ErrorCodeEnum.BUSINESS_LICENSE_PARSE_FAIL);
}
}
@GetMapping(path = "/getFoodBusinessLicense")
@ApiOperation("根据食营证照解析获取数据")
public ResponseResult<FoodLicenseVO> getFoodLicense(@RequestParam(value = "imageUrl")String imageUrl){
try {
FoodLicenseVO businessLicenseInfo = aliyunService.getFoodLicense(imageUrl);
return ResponseResult.success(businessLicenseInfo);
} catch (Exception e) {
throw new ServiceException(ErrorCodeEnum.FOOD_BUSINESS_LICENSE_PARSE_FAIL);
}
}
@GetMapping(path = "/getIdentityCardInfo")
@ApiOperation("根据身份证正面解析获取数据")
public ResponseResult<IdentityCardInfoVO> getIdentityCardInfo(@RequestParam(value = "faceImageUrl")String faceImageUrl,
@RequestParam("side") IDCardSideEnum sideEnum){
try {
IdentityCardInfoVO identityCardInfo = aliyunService.getIdentityCardInfo(faceImageUrl, sideEnum);
return ResponseResult.success(identityCardInfo);
} catch (Exception e) {
throw new ServiceException(ErrorCodeEnum.IDENTITY_CARD_PARSE_FAIL);
}
}
}

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

@@ -170,4 +170,10 @@ public class PCShopController {
return ApiResponse.success(openApiService.batchStatusRefreshYls(batchStatusRefreshDTO));
}
@ApiOperation("获取店铺所属品牌")
@GetMapping("/getFranchiseBrandName")
public ResponseResult<String> getFranchiseBrandName(@RequestParam(name = "shopId")Long shopId) {
return ResponseResult.success(shopService.getFranchiseBrandName(shopId));
}
}

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

@@ -80,6 +80,18 @@ public class LineController {
public ResponseResult<PageInfo<UserDTO>> getAllUser(@RequestBody GetUserDTO dto) {
return ResponseResult.success(userAuthMappingService.getAllUser(dto.getKeyword(),dto.getPageNum(),dto.getPageSize()));
}
@ApiOperation("获取ai模块是否展示，true展示false不展示")
@GetMapping("/getAiModule")
public ResponseResult<Boolean> getAiModule() {
return ResponseResult.success(lineService.getAiModule());
}
@ApiOperation("设置ai模块是否展示，true展示false不展示")
@GetMapping("/setAiModule")
public ResponseResult<Boolean> setAiModule(@RequestParam("flag") Boolean flag) {
return ResponseResult.success(lineService.setAiModule(flag));
}
}