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

Merge branch 'master' into cc_20250623_desk

Browse Source
This commit is contained in:
shuo.wang
2025-06-26 14:30:46 +08:00
parent deaec48f66 1e8129aabc
commit 47a0eadff1
68 changed files with 4338 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java
View File

@@ -58,7 +58,7 @@ public class OpenApiValidateFilter implements Filter {
}
MDC.put(CommonConstants.REQUEST_ID, UUIDUtils.get32UUID());
//statusRefresh 放开不需要验签
if(uri.startsWith("/zxjp/open/v1/statusRefresh")){
if(uri.startsWith("/zxjp/open/v1/")){
filterChain.doFilter(servletRequest, response);
return;
}

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

@@ -0,0 +1,48 @@
package com.cool.store.controller.webb;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.context.PartnerUserHolder;
import com.cool.store.dto.pre.fry.*;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.PreFryRecordsService;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* @Author suzhuhong
* @Date 2025/6/23 20:36
* @Version 1.0
*/
@Slf4j
@Api(tags = "预炸-预炸记录-PC")
@RestController
@RequestMapping("/pc/pre/record/")
public class PCPreFryRecordsController {
@Resource
PreFryRecordsService preFryRecordsService;
@ApiOperation("预炸品管理记录")
@PostMapping("/queryByQueryDTO")
public ResponseResult<PageInfo<PreFryRecordsDTO>> queryByQueryDTO(@RequestBody @Validated PreFryRecordQueryDTO dto) {
log.info("预炸品管理记录：{}", JSONObject.toJSONString(dto));
return ResponseResult.success(preFryRecordsService.queryByQueryDTO(dto));
}
@ApiOperation("预炸记录详情列表")
@GetMapping("/queryById")
public ResponseResult<PreFryRecordsDetailDTO> queryById(@RequestParam(required = true, value = "id") Long id) {
log.info("预炸记录详情：{}", JSONObject.toJSONString(id));
return ResponseResult.success(preFryRecordsService.getById(id));
}
}

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

@@ -0,0 +1,83 @@
package com.cool.store.controller.webb;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.dto.pre.fry.PreFriedProductsBatchDTO;
import com.cool.store.dto.pre.fry.PreFriedProductsDTO;
import com.cool.store.dto.pre.fry.PreFriedProductsDetailDTO;
import com.cool.store.dto.pre.fry.PreFriedProductsQueryDTO;
import com.cool.store.request.AddPointDetailRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.PreFriedProductsService;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* @Author suzhuhong
* @Date 2025/6/21 13:19
* @Version 1.0
*/
@Slf4j
@Api(tags = "预炸")
@RestController
@RequestMapping("/pc/pre/fry/")
public class PreFryController {
@Resource
PreFriedProductsService preFriedProductsService;
@ApiOperation("新增预炸品")
@PostMapping("/add")
public ResponseResult<Long> createProduct(@RequestBody @Validated PreFriedProductsDTO dto) {
log.info("新增预炸品：{}", JSONObject.toJSONString(dto));
return ResponseResult.success(preFriedProductsService.createProduct( dto, CurrentUserHolder.getUser().getUserId()));
}
@ApiOperation("修改预炸品")
@PostMapping("/update")
public ResponseResult<Long> updateProduct(@RequestBody @Validated PreFriedProductsDTO dto) {
log.info("修改预炸品：{}", JSONObject.toJSONString(dto));
return ResponseResult.success(preFriedProductsService.updateProduct( dto, CurrentUserHolder.getUser().getUserId()));
}
@ApiOperation("批量删除预炸品")
@PostMapping("/batchDelete")
public ResponseResult<Integer> batchDelete(@RequestBody @Validated PreFriedProductsBatchDTO dto) {
log.info("批量删除预炸品：{}", JSONObject.toJSONString(dto));
return ResponseResult.success(preFriedProductsService.batchDelete( dto, CurrentUserHolder.getUser().getUserId()));
}
@ApiOperation("批量上下架商品")
@PostMapping("/batchUpdateStatus")
public ResponseResult<Integer> batchUpdateStatus(@RequestBody @Validated PreFriedProductsBatchDTO dto) {
log.info("批量删除预炸品：{}", JSONObject.toJSONString(dto));
return ResponseResult.success(preFriedProductsService.batchUpdateStatus( dto, CurrentUserHolder.getUser().getUserId()));
}
@ApiOperation("查询预炸品列表")
@PostMapping("/queryProducts")
public ResponseResult<PageInfo<PreFriedProductsDetailDTO>> queryProducts(@RequestBody @Validated PreFriedProductsQueryDTO dto) {
log.info("查询预炸品：{}", JSONObject.toJSONString(dto));
return ResponseResult.success(preFriedProductsService.queryProducts(dto));
}
@ApiOperation("查询预炸品详情")
@GetMapping("/queryById")
public ResponseResult<PreFriedProductsDetailDTO> queryById(@RequestParam(required = true, value = "productId") Long productId) {
log.info("查询预炸品：{}", JSONObject.toJSONString(productId));
return ResponseResult.success(preFriedProductsService.queryById(productId));
}
}

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

@@ -0,0 +1,61 @@
package com.cool.store.controller.webb;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.dto.pre.fry.*;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.PreFryQualificationApplyService;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2025/6/21 18:03
* @Version 1.0
*/
@Slf4j
@Api(tags = "预炸-申请")
@RestController
@RequestMapping("/pc/pre/apply/")
public class PreFryQualificationApplyController {
@Resource
PreFryQualificationApplyService preFryQualificationApplyService;
@ApiOperation("预炸资质申请管理列表")
@PostMapping("/queryApplyManagementList")
public ResponseResult<PageInfo<ApplyManagementDTO>> queryApplyManagementList(@RequestBody @Validated ApplyManagementQueryDTO dto) {
log.info("预炸资质申请管理列表：{}", JSONObject.toJSONString(dto));
return ResponseResult.success(preFryQualificationApplyService.queryApplyManagementList( dto));
}
@ApiOperation("根据申请ID获取审批记录列表")
@GetMapping("/getApprovalRecordById")
public ResponseResult<List<ApprovalRecordDTO>> getApprovalRecordById(@RequestParam(required = true, value = "id") Long id) {
log.info("根据申请ID获取审批记录列表：{}", JSONObject.toJSONString(id));
return ResponseResult.success(preFryQualificationApplyService.getApprovalRecordById(id));
}
@ApiOperation("预炸资质申请详情")
@GetMapping("/getApplyDetail")
public ResponseResult<ApplyDetailDTO> getApplyDetail(@RequestParam(required = true, value = "id") Long id) {
log.info("查询预炸品：{}", JSONObject.toJSONString(id));
return ResponseResult.success(preFryQualificationApplyService.getApplyDetail(id));
}
@ApiOperation("申请审批 取消资格")
@PostMapping("/audit")
public ResponseResult<Boolean> audit(@RequestBody @Validated ApplyAuditDTO dto) {
log.info("预炸资质申请管理列表：{}", JSONObject.toJSONString(dto));
return ResponseResult.success(preFryQualificationApplyService.audit(dto,CurrentUserHolder.getUser()));
}
}

43
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniPreFryController.java Normal file
View File

@@ -0,0 +1,43 @@
package com.cool.store.controller.webc;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.dto.pre.fry.PreFriedProductsDetailDTO;
import com.cool.store.dto.pre.fry.PreFriedProductsQueryDTO;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.PreFriedProductsService;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* @Author suzhuhong
* @Date 2025/6/21 13:38
* @Version 1.0
*/
@Slf4j
@Api(tags = "预炸-小程序端")
@RestController
@RequestMapping("/mini/pre/fry/")
public class MiniPreFryController {
@Resource
PreFriedProductsService preFriedProductsService;
@ApiOperation("查询预炸品列表")
@PostMapping("/queryProducts")
public ResponseResult<PageInfo<PreFriedProductsDetailDTO>> queryProducts(@RequestBody @Validated PreFriedProductsQueryDTO dto) {
log.info("查询预炸品：{}", JSONObject.toJSONString(dto));
return ResponseResult.success(preFriedProductsService.queryProducts(dto));
}
}

83
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniPreFryQualificationApplyController.java Normal file
View File

@@ -0,0 +1,83 @@
package com.cool.store.controller.webc;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.context.PartnerUserHolder;
import com.cool.store.dto.pre.fry.*;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.PreFryQualificationApplyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2025/6/21 18:11
* @Version 1.0
*/
@Slf4j
@Api(tags = "预炸-申请-小程序")
@RestController
@RequestMapping("/mini/pre/apply/")
public class MiniPreFryQualificationApplyController {
@Resource
PreFryQualificationApplyService preFryQualificationApplyService;
@ApiOperation("预炸资质申请提交")
@PostMapping("/submitApply")
public ResponseResult<Long> submitApply(@RequestBody @Validated ApplyDTO dto) {
log.info("预炸资质申请提交：{}", JSONObject.toJSONString(dto));
return ResponseResult.success(preFryQualificationApplyService.submitApply( dto, PartnerUserHolder.getUser()));
}
@ApiOperation("预炸资质申请重新提交")
@PostMapping("/reSubmitApply")
public ResponseResult<Long> reSubmitApply(@RequestBody @Validated ApplyDTO dto) {
log.info("预炸资质申请重新提交：{}", JSONObject.toJSONString(dto));
return ResponseResult.success(preFryQualificationApplyService.reSubmitApply( dto, PartnerUserHolder.getUser()));
}
@ApiOperation("预炸资质申请详情")
@GetMapping("/getApplyDetail")
public ResponseResult<ApplyDetailDTO> getApplyDetail(@RequestParam(required = true, value = "id") Long id) {
log.info("预炸资质申请详情：{}", JSONObject.toJSONString(id));
return ResponseResult.success(preFryQualificationApplyService.getApplyDetail(id));
}
@ApiOperation("根据门店编码和类型查询申请详情")
@GetMapping("/getByStoreCodeAndApplyType")
public ResponseResult<ApplyDTO> getByStoreCodeAndApplyType(@RequestParam(required = true, value = "storeCode") String storeCode,
@RequestParam(required = true, value = "applyType") Integer applyType) {
return ResponseResult.success(preFryQualificationApplyService.getByStoreCodeAndApplyType(storeCode,applyType));
}
@ApiOperation("根据申请ID获取审批记录列表")
@GetMapping("/getApprovalRecordById")
public ResponseResult<List<ApprovalRecordDTO>> getApprovalRecordById(@RequestParam(required = true, value = "id") Long id) {
log.info("根据申请ID获取审批记录列表：{}", JSONObject.toJSONString(id));
return ResponseResult.success(preFryQualificationApplyService.getApprovalRecordById(id));
}
@ApiOperation("获取门店最高优先级申请类型")
@GetMapping("/getMinApplyType")
public ResponseResult<Integer> getMinApplyType(@RequestParam(required = true, value = "storeCode") String storeCode) {
return ResponseResult.success(preFryQualificationApplyService.getMinApplyType(storeCode));
}
@ApiOperation("根据门店编码获取申请类型审批状态")
@GetMapping("/getListByStoreCode")
public ResponseResult<List<PreFryQualificationApplyDTO>> getListByStoreCode(@RequestParam(required = true, value = "storeCode") String storeCode) {
return ResponseResult.success(preFryQualificationApplyService.getListByStoreCode(storeCode));
}
}

63
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/PreFryRecordsController.java Normal file
View File

@@ -0,0 +1,63 @@
package com.cool.store.controller.webc;
import com.alibaba.fastjson.JSONObject;
import com.cool.store.context.PartnerUserHolder;
import com.cool.store.dto.pre.fry.*;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.PreFryRecordsService;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2025/6/23 19:00
* @Version 1.0
*/
@Slf4j
@Api(tags = "预炸-预炸记录")
@RestController
@RequestMapping("/mini/pre/record/")
public class PreFryRecordsController {
@Resource
PreFryRecordsService preFryRecordsService;
@ApiOperation("预炸记录-按日期查询是否有预炸记录")
@GetMapping("/queryByStoreCode")
public ResponseResult<List<DailyFryCountDTO>> queryByStoreCode(@RequestParam(required = true, value = "storeCode") String storeCode,
@RequestParam(required = true, value = "time") Long time) {
log.info("预炸记录-按日期查询是否有预炸记录：{}", JSONObject.toJSONString(storeCode));
return ResponseResult.success(preFryRecordsService.queryByStoreCode(storeCode,time));
}
@ApiOperation("预炸记录详情列表")
@GetMapping("/queryById")
public ResponseResult<PreFryRecordsDetailDTO> queryById(@RequestParam(required = true, value = "id") Long id) {
log.info("预炸记录详情：{}", JSONObject.toJSONString(id));
return ResponseResult.success(preFryRecordsService.getById(id));
}
@ApiOperation("预炸批量新增")
@PostMapping("/batchAdd")
public ResponseResult<Boolean> batchInsert(@RequestBody @Validated AddPreFryRecordsDTO dto) {
log.info("批量新增：{}", JSONObject.toJSONString(dto));
return ResponseResult.success(preFryRecordsService.batchInsert(dto, PartnerUserHolder.getUser()));
}
@ApiOperation("预炸列表 根据门店编码与日期查询")
@PostMapping("/ListByStoreCodeAndDate")
public ResponseResult<PageInfo<PreFryRecordsDetailDTO>> ListByStoreCodeAndDate(@RequestBody @Validated FryRecordsQueryDTO dto) {
log.info("预炸列表 根据门店编码与日期查询：{}", JSONObject.toJSONString(dto));
return ResponseResult.success(preFryRecordsService.ListByStoreCodeAndDate(dto));
}
}

2
coolstore-partner-web/src/main/resources/application-online.properties
View File

@@ -1,5 +1,5 @@
#mysql config
default.datasource.url=jdbc:mysql://store10-coolstore.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_10027?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
default.datasource.url=jdbc:mysql://zx-coolstore.mysql.rds.aliyuncs.com:3306/coolcollege_intelligent_10027?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
default.datasource.username=coolstore
default.datasource.password=CSCErYcXniNYm7bT