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

jiaosong

2023-11-07 5e1cfd9032785dbe6438c830acad294d346f2734

 server/platform/src/main/java/com/doumee/api/business/WxBillController.java

@@ -3,10 +3,14 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.WxBill;
import com.doumee.dao.business.model.WxBillDetail;
import com.doumee.service.business.WxBillService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -16,6 +20,8 @@

import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;

/**
@@ -36,6 +42,20 @@
    @RequiresPermissions("business:wxbill:create")
    public ApiResponse create(@RequestBody WxBill wxBill) {
        return ApiResponse.success(wxBillService.create(wxBill));
    }
    @PreventRepeat
    @ApiOperation("手动同步微信某天账单信息")
    @PostMapping("/syncWxBill")
    @RequiresPermissions("business:wxbill:create")
    public ApiResponse syncWxBill(@RequestBody WxBill wxBill) {
        if( wxBill.getCreateDate() == null){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Calendar calendar = Calendar.getInstance();
        calendar.setTime( wxBill.getCreateDate());
        calendar.set(Calendar.HOUR_OF_DAY,9);
        wxBillService.getWxBill(calendar.getTime());
        return ApiResponse.success(null);
    }

    @ApiOperation("根据ID删除")
@@ -67,7 +87,7 @@
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @ApiOperation("微信对账汇总_分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:wxbill:query")
    public ApiResponse<PageData<WxBill>> findPage (@RequestBody PageWrap<WxBill> pageWrap) {
@@ -81,6 +101,14 @@
        ExcelExporter.build(WxBill.class).export(wxBillService.findPage(pageWrap).getRecords(), "WxBillController", response);
    }

    @ApiOperation("微信对账明细_查询")
    @PostMapping("/getTotalBillDetail")
    @RequiresPermissions("business:wxbilldetail:query")
    public ApiResponse<List<WxBill>> getTotalBill (@RequestBody WxBill  param) {
        return ApiResponse.success(wxBillService.getTotalBill(param));
    }


    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @RequiresPermissions("business:wxbill:query")