Merge remote-tracking branch 'origin/test' into test

src/main/java/com/chaozhanggui/system/cashierservice/constant/TableConstant.java

@@ -1,7 +1,5 @@
 package com.chaozhanggui.system.cashierservice.constant;
 
-import io.netty.handler.codec.http2.Http2FrameStreamEvent;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
 import java.util.Objects;

src/main/java/com/chaozhanggui/system/cashierservice/dao/TbActivateOutRecordMapper.java

@@ -68,5 +68,13 @@ public interface TbActivateOutRecordMapper {
      */
     int deleteById(Integer id);
 
+    /**
+     * 根据订单id 将数据状态变为
+     * @param orderId 订单Id
+     * @param status 状态
+     * @return
+     */
+    int updateByOrderIdAndStatus(@Param("orderId")Integer orderId,@Param("status")String status);
+
 }
 

src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java

@@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.chaozhanggui.system.cashierservice.constant.TableConstant;
 import com.chaozhanggui.system.cashierservice.dao.*;
 import com.chaozhanggui.system.cashierservice.entity.Enum.OrderUseTypeEnum;
 import com.chaozhanggui.system.cashierservice.entity.*;

src/main/resources/mapper/TbActivateOutRecordMapper.xml

@@ -164,6 +164,13 @@
         where id = #{id}
     </update>
 
+    <update id="updateByOrderIdAndStatus">
+        update tb_activate_out_record
+        set
+            status = 'closed'
+        where order_id = #{orderId}
+    </update>
+
     <update id="updateRefNum">
         update tb_activate_out_record
         set ref_num = ref_num + #{refNum}