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-17 16:47:18 +08:00
parent f57cbfa78f 32a45dc2af
commit 887fd9b1a9
23 changed files with 363 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,8 +3,13 @@ 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.enums.point.ShopSubStageEnum;
import com.cool.store.enums.point.ShopSubStageStatusEnum;
import com.cool.store.request.AuditRequest;
import com.cool.store.request.OrderSysInfoRequest;
import com.cool.store.response.AuditInfoResponse;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.OperationLogService;
import com.cool.store.service.OrderSysInfoService;
import com.cool.store.service.PushService;
import io.swagger.annotations.Api;
@@ -13,6 +18,8 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
@@ -30,19 +37,21 @@ public class PCOrderSysInfoController {
private OrderSysInfoService orderSysInfoService;
@Resource
private PushService pushService;
@Resource
private OperationLogService operationLogService;
@PostMapping("/submitOrderInfo")
@ApiOperation("物流提交订货信息")
public ResponseResult<Integer> submitOrderInfo(@RequestBody @Validated OrderSysInfoRequest request){
request.setType(OrderSysTypeEnum.ORDER_SYS_TYPE_1.getType());
return ResponseResult.success(orderSysInfoService.updateByShopId(request, CurrentUserHolder.getUserId()));
return ResponseResult.success(orderSysInfoService.updateByShopId(request, CurrentUserHolder.getUser()));
}
@PostMapping("/submitReceiving")
@ApiOperation("财务提交总部订货收款账户")
public ResponseResult<Integer> submitReceiving(@RequestBody @Validated OrderSysInfoRequest request){
request.setType(OrderSysTypeEnum.ORDER_SYS_TYPE_2.getType());
return ResponseResult.success(orderSysInfoService.updateByShopId(request, CurrentUserHolder.getUserId()));
return ResponseResult.success(orderSysInfoService.updateByShopId(request, CurrentUserHolder.getUser()));
}
@GetMapping("/getXgjOrganization")
@@ -51,4 +60,16 @@ public class PCOrderSysInfoController {
return ResponseResult.success(pushService.getXgjOrganization(parentId));
}
@PostMapping("/audit")
@ApiOperation("审核")
public ResponseResult<Integer> audit(@RequestBody @Validated AuditRequest request){
return ResponseResult.success(orderSysInfoService.audit(request, CurrentUserHolder.getUser()));
}
@GetMapping("/auditInfo")
@ApiOperation("获取审批流")
public ResponseResult<List<AuditInfoResponse>> auditInfo(@RequestParam("shopId") Long shopId){
return ResponseResult.success(operationLogService.getAuditInfo(shopId, Collections.singletonList(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage())));
}
}