From 6361abcaf84eebb07393e397071487cbd3012870 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Tue, 14 Feb 2023 14:38:31 +0800 Subject: [PATCH] fix car pay --- .../market/WxCarPayOrderController.java | 57 +++++++++++++++++++ .../com/iformall/domain/po/WxCarPayOrder.java | 5 ++ .../iformall/mapper/WxCarPayOrderMapper.java | 2 + .../service/park/pay/WxParkPayService.java | 2 + .../park/pay/WxParkPayServiceImpl.java | 5 ++ .../resources/mapper/WxCarPayOrderMapper.xml | 14 +++++ 6 files changed, 85 insertions(+) create mode 100644 mallinkAdmin/src/main/java/com/iformall/controller/market/WxCarPayOrderController.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCarPayOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCarPayOrderController.java new file mode 100644 index 000000000..a2b33a105 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCarPayOrderController.java @@ -0,0 +1,57 @@ +package com.iformall.controller.market; + +import com.github.pagehelper.PageInfo; +import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.ErrorCode; +import com.iformall.common.Result; +import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.WxActivity; +import com.iformall.domain.po.WxCarPayOrder; +import com.iformall.enums.EnumActivityStatus; +import com.iformall.exception.MallinkException; +import com.iformall.service.WxActivityService; +import com.iformall.service.park.pay.WxParkPayService; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("wxCarPayOrder") +@Api(description = "停车支付订单") +public class WxCarPayOrderController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private WxParkPayService wxParkPayService; + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxCarPayOrder wxCarPayOrder, Integer pageNum, Integer pageSize) { + if (null == wxCarPayOrder) wxCarPayOrder = new WxCarPayOrder(); + wxCarPayOrder.updateTenantInfo(getTenantInfo()); + wxCarPayOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC); + final PageInfo page = wxParkPayService.listPayOrderAsPage(wxCarPayOrder, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("总和") + @GetMapping("sum") + public ResultData sum(@ModelAttribute WxCarPayOrder wxCarPayOrder) { + if (null == wxCarPayOrder) wxCarPayOrder = new WxCarPayOrder(); + wxCarPayOrder.updateTenantInfo(getTenantInfo()); + Integer total = wxParkPayService.sumCarPayOrder(wxCarPayOrder); + return new ResultData(total); + } + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayOrder.java index 4d14876ce..e519c692e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCarPayOrder.java @@ -52,4 +52,9 @@ public class WxCarPayOrder extends TenantEntity { @TableField(exist = false) private Integer notifyCountLimit; + + @TableField(exist = false) + private Date begin; + @TableField(exist = false) + private Date end; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCarPayOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCarPayOrderMapper.java index dc7f51a6a..6e023097d 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCarPayOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCarPayOrderMapper.java @@ -15,4 +15,6 @@ public interface WxCarPayOrderMapper extends CommonMapper { WxCarPayOrder findOneByParkOderNo(@Param("parkOrderNo")String parkOrderNo,@Param("tenantId")String tenantId); + Integer sum(WxCarPayOrder wxCarPayOrder); + } diff --git a/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayService.java b/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayService.java index 8e8697c07..51cdde919 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayService.java @@ -24,5 +24,7 @@ public interface WxParkPayService { Integer fee,Date paidTime,String transcationId,String merchantAccount,Long merchantId,String merchantName) throws Exception; public WxCarPayOrder detailWxCarPayOrder(Long id,String tenantId); + + public Integer sumCarPayOrder(WxCarPayOrder record); } diff --git a/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayServiceImpl.java index f4dbc8b3d..80bdee198 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/park/pay/WxParkPayServiceImpl.java @@ -248,4 +248,9 @@ public class WxParkPayServiceImpl implements WxParkPayService { return wxCarPayOrderMapper.selectById(id, tenantId); } + @Override + public Integer sumCarPayOrder(WxCarPayOrder record) { + return wxCarPayOrderMapper.sum(record); + } + } diff --git a/mallinkService/src/main/resources/mapper/WxCarPayOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCarPayOrderMapper.xml index b95331070..43c17e640 100644 --- a/mallinkService/src/main/resources/mapper/WxCarPayOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarPayOrderMapper.xml @@ -95,6 +95,14 @@ and `car_vendor` <= #{carVendor} + + and `create_time` >= #{begin} + + + + and `create_time` <= #{end} + + and id in @@ -120,5 +128,11 @@ from wx_car_pay_order where tenant_id = #{tenantId} and `park_order_no` = #{parkOrderNo} + +