From 98aa5422cdebcb793439510f4ada630be48efbf5 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Sat, 25 Mar 2023 16:52:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zscat/mallplus/sms/mapper/SmsCouponHistoryMapper.java   | 2 ++
 .../main/resources/mapper/sms/SmsCouponHistoryMapper.xml    | 4 ++++
 .../mallplus/oms/service/impl/OmsOrderServiceImpl.java      | 6 ++++++
 .../mallplus/sms/service/ISmsCouponHistoryService.java      | 3 +++
 .../sms/service/impl/SmsCouponHistoryServiceImpl.java       | 5 +++++
 5 files changed, 20 insertions(+)

diff --git a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsCouponHistoryMapper.java b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsCouponHistoryMapper.java
index 661a395..dc073b0 100644
--- a/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsCouponHistoryMapper.java
+++ b/mallplus-mbg/src/main/java/com/zscat/mallplus/sms/mapper/SmsCouponHistoryMapper.java
@@ -20,4 +20,6 @@ public interface SmsCouponHistoryMapper extends BaseMapper<SmsCouponHistory> {
     List<SmsCouponHistoryDetail> getDetailList(Long memberId);
 
     int updateUseStatus(@Param("useStatus") int i, @Param("endTime") String tomorrow);
+
+    int updateUseStatuss(@Param("useStatus")int i, @Param("memberId") Long memberId,@Param("couponId") Long couponId);
 }
diff --git a/mallplus-mbg/src/main/resources/mapper/sms/SmsCouponHistoryMapper.xml b/mallplus-mbg/src/main/resources/mapper/sms/SmsCouponHistoryMapper.xml
index 59846bb..9fc0340 100644
--- a/mallplus-mbg/src/main/resources/mapper/sms/SmsCouponHistoryMapper.xml
+++ b/mallplus-mbg/src/main/resources/mapper/sms/SmsCouponHistoryMapper.xml
@@ -65,4 +65,8 @@
     <update id="updateUseStatus">
         update sms_coupon_history set use_status = #{useStatus} where end_time &lt;= #{endTime} and use_status = 0
     </update>
+
+    <update id="updateUseStatuss">
+        update sms_coupon_history set use_status = #{useStatus} where member_id = #{memberId} and coupon_id = #{couponId}
+    </update>
 </mapper>
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
index d8e7da1..ad231be 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
@@ -1412,6 +1412,12 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         history.setOrderStatus(OrderStatus.CLOSED.getValue());
         history.setNote("取消订单");
         orderOperateHistoryService.save(history);
+        //将优惠券置为未使用
+        Long couponId = order.getCouponId();
+        if(couponId != null){
+            //将优惠券置为未使用
+            couponHistoryService.updateUseStatuss(0,order.getMemberId(),couponId);
+        }
 
         return orderMapper.updateById(order) > 0;
     }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsCouponHistoryService.java b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsCouponHistoryService.java
index 47ca8e7..dfe0ffc 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsCouponHistoryService.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/ISmsCouponHistoryService.java
@@ -2,6 +2,7 @@ package com.zscat.mallplus.sms.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zscat.mallplus.sms.entity.SmsCouponHistory;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -14,4 +15,6 @@ import com.zscat.mallplus.sms.entity.SmsCouponHistory;
 public interface ISmsCouponHistoryService extends IService<SmsCouponHistory> {
 
     int updateUseStatus(int i, String tomorrow);
+
+    int updateUseStatuss(int i,  Long memberId,Long couponId);
 }
diff --git a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsCouponHistoryServiceImpl.java b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsCouponHistoryServiceImpl.java
index f62f81d..e3a453d 100644
--- a/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsCouponHistoryServiceImpl.java
+++ b/mallplus-portal/src/main/java/com/zscat/mallplus/sms/service/impl/SmsCouponHistoryServiceImpl.java
@@ -21,4 +21,9 @@ public class SmsCouponHistoryServiceImpl extends ServiceImpl<SmsCouponHistoryMap
     public int updateUseStatus(int i, String tomorrow) {
         return baseMapper.updateUseStatus(i,tomorrow);
     }
+
+    @Override
+    public int updateUseStatuss(int i, Long memberId,Long couponId) {
+        return baseMapper.updateUseStatuss(i,memberId,couponId);
+    }
 }