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

Merge remote-tracking branch 'origin/cc_20250325_select' into cc_20250325_select

Browse Source
This commit is contained in:
苏竹红
2025-04-13 20:59:06 +08:00
parent aefc333d5b 8e871a0b8f
commit 61d687dd5c
33 changed files with 312 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ 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;
@@ -89,7 +90,7 @@ public class PCDecorationController {
}
@ApiOperation("提交三方验收签字")
@PostMapping("/submitThreeAcceptanceSign")
public ResponseResult<Boolean> submitThreeAcceptanceSign(@RequestBody ThreeAcceptanceRequest request){
public ResponseResult<Boolean> submitThreeAcceptanceSign(@RequestBody @Validated ThreeAcceptanceRequest request){
return ResponseResult.success(decorationService.pcSubmitAcceptanceSign(request));
}
@ApiOperation("查看三方验收签字")

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

@@ -1,6 +1,7 @@
package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.dto.XgjOrganizationDTO;
import com.cool.store.enums.OrderSysTypeEnum;
import com.cool.store.request.OrderSysInfoRequest;
import com.cool.store.response.ResponseResult;
@@ -12,6 +13,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* @Author: WangShuo
@@ -45,7 +47,7 @@ public class PCOrderSysInfoController {
@GetMapping("/getXgjOrganization")
@ApiOperation("获取新管家组织架构")
public ResponseResult<Object> getXgjOrganization(@RequestParam(value = "partnerId", required = true,defaultValue = "0") String partnerId) {
public ResponseResult<List<XgjOrganizationDTO>> getXgjOrganization(@RequestParam(value = "partnerId", required = true,defaultValue = "0") String partnerId) {
return ResponseResult.success(pushService.getXgjOrganization(partnerId));
}

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

@@ -3,6 +3,7 @@ package com.cool.store.controller.webb;
import com.cool.store.entity.WarehouseInfoDO;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.WarehouseInfoService;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
@@ -29,9 +30,9 @@ public class PCWarehouseInfoController {
@GetMapping("/getAllAndActive")
@ApiOperation(value = "获取正新鸡排仓库配置")
public ResponseResult<List<WarehouseInfoDO>> getAllAndActive(@RequestParam("keyword")String keyword ,
@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
@RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize) {
public ResponseResult<PageInfo<WarehouseInfoDO>> getAllAndActive(@RequestParam("keyword")String keyword ,
@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
@RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize) {
return ResponseResult.success(warehouseInfoService.getAllAndActive(keyword,pageNum,pageSize));
}
}

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

@@ -129,7 +129,7 @@ public class MiniShopController {
@ApiOperation("给bot的门店信息")
@GetMapping("/getShopNameAndCode")
public ResponseResult<ShopResponse> getShopNameAndCode(@RequestParam("shopId")Long shopId, @RequestParam("lineId")Long lineId) {
public ResponseResult<ShopResponse> getShopNameAndCode(@RequestParam(name = "shopId",required = false)Long shopId, @RequestParam("lineId")Long lineId) {
return ResponseResult.success(shopService.getShopNameAndCode(shopId,lineId));
}