Merge branch 'master' into cc_20250211_v2.6

This commit is contained in:
shuo.wang
2025-02-19 13:44:17 +08:00
5 changed files with 180 additions and 128 deletions

View File

@@ -1,6 +1,7 @@
package com.cool.store.controller.webc;
import com.cool.store.request.LinesRequest;
import com.cool.store.request.UpdatePartnerNameRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.LinePayService;
import com.cool.store.service.LineService;
@@ -14,6 +15,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -62,6 +64,11 @@ public class LineController {
public ResponseResult<IntendProcessTotalVO> getIntendProcessTotal(@RequestParam("lineId")Long lineId) {
return ResponseResult.success(lineService.getIntendProcessTotal(lineId));
}
@ApiOperation("修改加盟商名称")
@PostMapping("/updatePartnerName")
public ResponseResult<Integer> updatePartnerName(@RequestBody @Validated UpdatePartnerNameRequest request) {
return ResponseResult.success(lineService.updatePartnerName(request.getUsername(),request.getLineId()));
}