Merge remote-tracking branch 'origin/master-v4' into master-v4

cloudroam

2024-10-23 b4aa242d1b818a8ad3a285166caedb699bbcb460

 src/main/java/com/mzl/flower/web/v2/wallet/WalletController.java

@@ -5,22 +5,21 @@
import com.mzl.flower.base.BaseController;
import com.mzl.flower.base.R;
import com.mzl.flower.base.ReturnDataDTO;
import com.mzl.flower.config.exception.ValidationException;
import com.mzl.flower.dto.request.wallet.QueryWalletDTO;
import com.mzl.flower.dto.response.supplier.SupplierDTO;
import com.mzl.flower.entity.wallet.WalletBillRecordDO;
import com.mzl.flower.service.supplier.SupplierService;
import com.mzl.flower.service.wallet.WalletService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.*;
import com.mzl.flower.entity.wallet.WalletDO;

import javax.validation.constraints.Min;
import javax.validation.constraints.Max;
import javax.validation.constraints.Positive;

import org.springframework.web.bind.annotation.RestController;

/**
* @author @TaoJie
@@ -29,6 +28,12 @@
@RestController
@RequestMapping("/v2/wallet")
public class WalletController extends BaseController {

    @Autowired
    private WalletService walletService;

    @Autowired
    private SupplierService supplierService;

    @PostMapping("")
    public ResponseEntity<ReturnDataDTO> create() {
@@ -41,8 +46,10 @@
    }

    @DeleteMapping("/{id}")
    public ResponseEntity<ReturnDataDTO> delete(@PathVariable @Positive(message = "{id.positive}") Integer id) {
    public ResponseEntity<ReturnDataDTO> delete(@PathVariable  Integer id) {

        return returnData(R.SUCCESS.getCode(), null);

    }

    @GetMapping("/{id}")
@@ -50,14 +57,22 @@
        return null;
    }

    @GetMapping("/supplier")
    @ApiOperation(value = "获取供应商钱包", notes = "获取供应商钱包")
    public WalletDO getWalletBySupplierId() {
        // 判断供应商是否存在
        final SupplierDTO currentSupplier = supplierService.getCurrentSupplier();
        if(null==currentSupplier){
            throw new ValidationException("供应商不能为空");
        }

        return walletService.getBySupplierId();
    }

    @GetMapping("/page")
    public ResponseEntity<ReturnDataDTO<Page<WalletDO>>> page(
            @RequestParam(name = "page", required = false, defaultValue = "0")
            @Min(value = 0, message = "{page.number.min}") Integer page,
            @RequestParam(name = "count", required = false, defaultValue = "10")
            @Min(value = 1, message = "{page.count.min}")
            @Max(value = 30, message = "{page.count.max}") Integer count
    public ResponseEntity<ReturnDataDTO<Page<WalletDO>>> page(@RequestBody QueryWalletDTO dto
    ) {

        return null;
    }