From 497f3fc562f8dfdaafb8961b8224b86f4ee197df Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 13 Aug 2024 16:01:20 +0800 Subject: [PATCH] fix --- .../com/iformall/controller/market/WxEnergyController.java | 1 - .../com/iformall/controller/market/WxFinanceController.java | 1 + .../main/java/com/iformall/domain/po/WxFinanceFinish.java | 3 ++- .../java/com/iformall/domain/vo/WxFinanceReceiveVo.java | 5 ++++- .../java/com/iformall/mapper/WxFinanceReceiveMapper.java | 4 ++++ .../com/iformall/service/impl/WxFinanceServiceImpl.java | 2 +- .../src/main/resources/mapper/WxFinanceReceiveMapper.xml | 6 ++++++ 7 files changed, 18 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java index 9cb6a67a8..f7c37ed50 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java @@ -276,7 +276,6 @@ public class WxEnergyController extends BaseController { @PostMapping("readingIsDel") public ResultData readingIsDel(@RequestBody WxEnergyMeterReading record) { record.updateTenantInfo(getTenantInfo()); - record.setIsDel(EnumYesOrNo.YES.getCode()); wxEnergyService.setReadingIsDel(record); return new ResultData(); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index 21819fea8..a2fbc97ba 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -440,6 +440,7 @@ public class WxFinanceController extends BaseController { WxFinanceReceive rq = new WxFinanceReceive(); rq.setCreateTimeBegin(finish.getStartDate()); rq.setCreateTimeEnd(finish.getEndDate()); + //正常和已红冲的都可以结账 rq.setFinishStatus(EnumYesOrNo.YES.getCode()); rq.setIsFinish(EnumYesOrNo.NO.getCode()); rq.updateTenantInfo(record); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceFinish.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceFinish.java index 3145700c8..db41c516c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceFinish.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceFinish.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumFinanceCashierType; +import com.iformall.enums.EnumFinanceFinishStatus; import com.iformall.enums.EnumFinanceReceiveStatus; import com.iformall.enums.EnumFinanceReceiveType; @@ -53,7 +54,7 @@ public class WxFinanceFinish extends TenantEntity { private String statusName; public String getStatusName() { if (null != status) { - return EnumFinanceReceiveStatus.getEnum(status).getMessage(); + return EnumFinanceFinishStatus.getEnum(status).getMessage(); } return null; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxFinanceReceiveVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxFinanceReceiveVo.java index c4ac558a9..1840b277d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxFinanceReceiveVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxFinanceReceiveVo.java @@ -145,6 +145,9 @@ public class WxFinanceReceiveVo implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "是否已删除", name = "isDel") private Integer isDel; + + @io.swagger.annotations.ApiModelProperty(value = "是否已结账完成", name = "isFinish") + private Integer isFinish; public void initByReceive(WxFinanceReceive receive,WxFinanceReceiveBill receiveBill) { @@ -164,7 +167,7 @@ public class WxFinanceReceiveVo implements Serializable { this.merchantId = receive.getMerchantId(); this.remark = receive.getRemark(); this.isPrint = receive.getIsPrint(); - + this.isFinish = receive.getIsFinish(); if (null != receiveBill) { this.rid = receiveBill.getId(); this.receiveId = receiveBill.getReceiveId(); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFinanceReceiveMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFinanceReceiveMapper.java index 5bd37a61d..5d592294c 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxFinanceReceiveMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxFinanceReceiveMapper.java @@ -14,6 +14,8 @@ public interface WxFinanceReceiveMapper extends CommonMapper findList(WxFinanceReceive wxBillRent); + Integer findCount(WxFinanceReceive wxBillRent); + WxFinanceReceive selectById(@Param("id")Long id,@Param("tenantId")String tenantId); void setIsDel(@Param("id")Long id,@Param("tenantId")String tenantId,@Param("isDel")Integer isDel); @@ -25,5 +27,7 @@ public interface WxFinanceReceiveMapper extends CommonMapper getReceivePayWaySum(WxFinanceReceive record); + + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index 28c7d7905..7e9191c52 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -1159,7 +1159,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { @Override public Integer getReceiveUnFinisedCount(WxFinanceReceive record) { - return null; + return wxFinanceReceiveMapper.findCount(record); } @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) diff --git a/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml b/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml index baac8ec2a..49c7903ec 100644 --- a/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml @@ -83,6 +83,12 @@ + +