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,6 +3,8 @@
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;
@@ -18,6 +20,7 @@

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

@@ -45,8 +48,14 @@
    @PostMapping("/syncWxBill")
    @RequiresPermissions("business:wxbill:create")
    public ApiResponse syncWxBill(@RequestBody WxBill wxBill) {
        wxBillService.getWxBill(wxBill.getCreateDate());
        return ApiResponse.success(wxBillService.create(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删除")