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

jiangping

2024-12-27 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9

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

@@ -6,9 +6,11 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.dto.*;
import com.doumee.dao.business.model.InsuranceApply;
import com.doumee.dao.business.model.UnionApply;
import com.doumee.service.business.InsuranceApplyService;
import com.doumee.service.business.UnionApplyService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -31,6 +33,8 @@

    @Autowired
    private UnionApplyService unionApplyService;
    @Autowired
    private InsuranceApplyService insuranceApplyService;

    @PreventRepeat
    @ApiOperation("新建")
@@ -113,6 +117,15 @@
        return ApiResponse.success(null);
    }

    @ApiOperation("合并单复审")
    @PostMapping("/reexamineCheck")
    @RequiresPermissions("business:unionapply:cancel")
    public ApiResponse reexamineCheck(@RequestBody UnionApply unionApply) {
        unionApplyService.reexamineCheck(unionApply);
        return ApiResponse.success(null);
    }


    @PreventRepeat
    @ApiOperation("上传投保单")
    @PostMapping("/uploadToubaodan")
@@ -132,11 +145,20 @@

    @ApiOperation("上传保险单")
    @PostMapping("/uploadBXD")
    @RequiresPermissions("business:unionchange:uploadBXD")
    @RequiresPermissions("business:unionapply:uploadBXD")
    public ApiResponse uploadBXD(@RequestBody UnionApplyBXDDTO unionApplyBXDDTO) {
        unionApplyService.uploadBXD(unionApplyBXDDTO);
        insuranceApplyService.updateApplyCurrentFee(null,unionApplyBXDDTO.getId());
        unionApplyService.updateUnionApplyCurrentFee(unionApplyBXDDTO.getId());
        return ApiResponse.success(null);
    }


    @ApiOperation("测试合并单实际金额")
    @GetMapping("/testFee")
    public ApiResponse testFee(Integer id) {
        unionApplyService.updateUnionApplyCurrentFee(id);
        return ApiResponse.success(null);
    }

}