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

nidapeng

2024-04-01 bd57081dc1bcd94e1e4043a9e0a7c6953d4bb9d4

 server/shop/src/main/java/com/doumee/api/business/UnionChangeController.java

@@ -6,7 +6,9 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.dto.CloseDTO;
import com.doumee.dao.business.dto.SaveUnionChangeDTO;
import com.doumee.dao.business.dto.SmsCheckDTO;
import com.doumee.dao.business.dto.UnionChangeBXDDTO;
import com.doumee.dao.business.model.UnionChange;
import com.doumee.service.business.UnionChangeService;
@@ -87,10 +89,8 @@
    @GetMapping("/{id}")
    @RequiresPermissions("business:unionchange:query")
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(unionChangeService.findById(id));
        return ApiResponse.success(unionChangeService.getDetail(id));
    }



    @PreventRepeat
    @ApiOperation("创建合并单")
@@ -102,19 +102,19 @@


    @ApiOperation("关闭合并单")
    @GetMapping("/close")
    @PostMapping("/close")
    @RequiresPermissions("business:unionchange:close")
    public ApiResponse close(@RequestParam Integer id) {
        unionChangeService.cancelMerge(id);
    public ApiResponse close(@RequestBody CloseDTO closeDTO) {
        unionChangeService.cancelMerge(closeDTO);
        return ApiResponse.success(null);
    }


    @ApiOperation("签署申请单")
    @GetMapping("/getSignLink")
    @PostMapping("/getSignLink")
    @RequiresPermissions("business:unionchange:query")
    public ApiResponse getSignLink(@RequestParam Integer id) {
        unionChangeService.getSignLink(id);
    public ApiResponse getSignLink(@RequestBody SmsCheckDTO smsCheckDTO) {
        unionChangeService.getSignLink(smsCheckDTO);
        return ApiResponse.success(null);
    }