From a83731da161cc075200689d7f078ffa23111265c Mon Sep 17 00:00:00 2001 From: limqhz <540344226@qq.com> Date: Wed, 28 Feb 2024 23:28:33 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A7=A3=E5=86=B3=E5=87=BA=E5=9C=BA?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=B2=A1=E6=9C=89=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E5=86=8D=E6=AC=A1?= =?UTF-8?q?=E5=85=A5=E5=9C=BA=E9=97=AE=E9=A2=98=202=E3=80=81=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E5=9B=9E=E8=B0=83=E9=80=80=E6=AC=BE=E6=9C=AA=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=95=B0=E6=8D=AE=E5=BA=93=E6=80=BB=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E9=87=91=E9=A2=9D=203=E3=80=81=E8=A7=A3=E5=86=B3=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=94=A8=E6=88=B7=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=85=B3?= =?UTF-8?q?=E8=81=94=E6=9F=A5=E8=AF=A2=E8=84=9A=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entity/src/main/java/com/sv/entity/Barcode.java | 3 +++ .../java/com/ydd/oms/task/ClearPersonTask.java | 16 ++++++++++++++++ .../main/java/com/sv/mapper/BarcodeMapper.java | 5 +++++ .../com/sv/service/api/MemberRefundService.java | 4 +++- .../mybatis/mapper/sv/BarcodeMapper.xml | 7 +++++++ .../mybatis/mapper/sv/BarcodeOrderTimeMapper.xml | 2 +- 6 files changed, 35 insertions(+), 2 deletions(-) diff --git a/entity/src/main/java/com/sv/entity/Barcode.java b/entity/src/main/java/com/sv/entity/Barcode.java index 2ebf70d..653b1ca 100644 --- a/entity/src/main/java/com/sv/entity/Barcode.java +++ b/entity/src/main/java/com/sv/entity/Barcode.java @@ -12,6 +12,9 @@ public class Barcode { */ private String orderSn; + /** + * 0 - 未使用 1 - 已使用 + */ private Integer status; private Integer memberId; diff --git a/oms/src/main/java/com/ydd/oms/task/ClearPersonTask.java b/oms/src/main/java/com/ydd/oms/task/ClearPersonTask.java index 8c65b43..b097b18 100644 --- a/oms/src/main/java/com/ydd/oms/task/ClearPersonTask.java +++ b/oms/src/main/java/com/ydd/oms/task/ClearPersonTask.java @@ -1,7 +1,9 @@ package com.ydd.oms.task; import com.enums.StayEnum; +import com.sv.entity.Barcode; import com.sv.entity.MemberEnterStatus; +import com.sv.mapper.BarcodeMapper; import com.sv.mapper.MemberEnterStatusMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,6 +27,8 @@ public class ClearPersonTask { @Resource MemberEnterStatusMapper memberEnterStatusMapper; + @Resource + BarcodeMapper barcodeMapper; @Scheduled(cron = "0 0 1 * * ?") public void clearMember(){ @@ -40,6 +44,18 @@ public class ClearPersonTask { memberEnterStatusMapper.updateByPrimaryKey(memberEnterStatus); } } + List noUseOutBarcode = barcodeMapper.findNoUseOutBarcode(); + if (noUseOutBarcode != null && noUseOutBarcode.size() > 0) { + logger.info("有" + noUseOutBarcode.size() + "出场二维码没有使用！！！"); + Date date = new Date(); + for (Barcode barcode : noUseOutBarcode) { + barcode.setStatus(1); + barcode.setModifiedId(1); + barcode.setModifiedTime(date); + logger.info("用户：" + barcode.getMemberId() + ",又未使用的出场二维码"); + barcodeMapper.updateByPrimaryKeySelective(barcode); + } + } } } diff --git a/service/src/main/java/com/sv/mapper/BarcodeMapper.java b/service/src/main/java/com/sv/mapper/BarcodeMapper.java index e0eca16..58838ec 100644 --- a/service/src/main/java/com/sv/mapper/BarcodeMapper.java +++ b/service/src/main/java/com/sv/mapper/BarcodeMapper.java @@ -4,6 +4,8 @@ import com.sv.annotation.NoPlatform; import com.sv.entity.Barcode; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface BarcodeMapper { int deleteByPrimaryKey(Integer id); @@ -29,4 +31,7 @@ public interface BarcodeMapper { @NoPlatform Barcode checkIsUsed(@Param("barcode") String barcode); + + @NoPlatform + List findNoUseOutBarcode(); } diff --git a/service/src/main/java/com/sv/service/api/MemberRefundService.java b/service/src/main/java/com/sv/service/api/MemberRefundService.java index ea6b63d..e2b8cd9 100644 --- a/service/src/main/java/com/sv/service/api/MemberRefundService.java +++ b/service/src/main/java/com/sv/service/api/MemberRefundService.java @@ -189,7 +189,9 @@ public class MemberRefundService extends BaseServiceImpl { if (barcodeOrderTime != null) { if (barcodeOrderTime.getOrderSn() != null && barcodeOrderTime.getOrderSn().equals(memberRefund.getOrderSn())) { - barcodeOrderTime.setSumPayMoney(barcodeOrderTime.getSumPayMoney() == null ? 0 : barcodeOrderTime.getSumPayMoney() + memberRefund.getMoney().intValue()); + barcodeOrderTime.setSumPayMoney( + (barcodeOrderTime.getSumPayMoney() == null ? 0 : barcodeOrderTime.getSumPayMoney()) + + memberRefund.getMoney().intValue()); barcodeOrderTime.setPayMoney(0); barcodeOrderTime.setModifiedTime(new Date()); barcodeOrderTimeMapper.updateByPrimaryKey(barcodeOrderTime); diff --git a/service/src/main/resources/mybatis/mapper/sv/BarcodeMapper.xml b/service/src/main/resources/mybatis/mapper/sv/BarcodeMapper.xml index 8b03ed3..eb0e813 100644 --- a/service/src/main/resources/mybatis/mapper/sv/BarcodeMapper.xml +++ b/service/src/main/resources/mybatis/mapper/sv/BarcodeMapper.xml @@ -194,4 +194,11 @@ where barcode = #{barcode,jdbcType=VARCHAR} + + diff --git a/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml b/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml index 95cf23a..d200248 100644 --- a/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml +++ b/service/src/main/resources/mybatis/mapper/sv/BarcodeOrderTimeMapper.xml @@ -341,7 +341,7 @@ sum((select IFNULL(sum(ot.price),0) from sv_order ot where ot.member_id = t.member_id and (ot.order_sn = t.order_sn or ot.order_sn = t.order_add_sn) ) - IFNULL(t.sum_pay_money,0)) orderSumMoney - from sv_barcode_order_time t + from sv_barcode_order_time t LEFT JOIN sv_member m on t.member_id = m.id where 1=1 AND (t.status = 1 or t.paying = #{state})