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-07 09:19:05 +08:00
parent 8cbf1681db c451901924
commit b919960dfc
42 changed files with 1285 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,45 @@
package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.enums.OrderSysTypeEnum;
import com.cool.store.request.OrderSysInfoRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.OrderSysInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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: WangShuo
* @Date: 2025/04/06/17:39
* @Version 1.0
* @注释:
*/
@Api("pc订货信息&总部订货收款账户")
@RestController
@RequestMapping("/pc/orderInfo")
public class PCOrderSysInfoController {
@Resource
private OrderSysInfoService orderSysInfoService;
@PostMapping("/submitOrderInfo")
@ApiOperation("IT提交订货信息")
public ResponseResult<Integer> submitOrderInfo(@RequestBody @Validated OrderSysInfoRequest request){
request.setType(OrderSysTypeEnum.ORDER_SYS_TYPE_1.getType());
return ResponseResult.success(orderSysInfoService.updateByShopId(request, CurrentUserHolder.getUserId()));
}
@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()));
}
}

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

@@ -9,6 +9,7 @@ import com.cool.store.response.ResponseResult;
import com.cool.store.service.SignFranchiseService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -22,7 +23,7 @@ public class PCSignFranchiseController {
@ApiOperation("提交(更新)加盟合同签约")
@PostMapping("/submitOrUpdate")
public ResponseResult<Boolean> submitSignFranchise(@RequestBody AddSignFranchiseRequest request) {
public ResponseResult<Boolean> submitSignFranchise(@RequestBody @Validated AddSignFranchiseRequest request) {
LoginUserInfo user = CurrentUserHolder.getUser();
return signFranchiseService.submitSignFranchise(request,user);
}