支付回调判断订单状态是否删除，修改订单逻辑删除状态

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -1309,6 +1309,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             JSONObject jsonObject = new JSONObject(map);
             redisUtil.set(ReceiptRdeisEnum.ORDER_NO.getValue() + sOrder.getOrderNo(), jsonObject.toString());
         }
+        if (sOrder.getIsDelete().equals(YesNoEnum.yes.getIndex())) {
+            sOrder.setIsDelete(YesNoEnum.no.getIndex());
+        }
         baseMapper.updateSOrder(sOrder);
         Long couponId = sOrder.getCouponId();
         SStore sStore = storeService.getById(sOrder.getStoreId());

share-system/src/main/resources/mapper/system/SOrderMapper.xml

@@ -259,7 +259,7 @@
             <if test="refundReason != null">refund_reason = #{refundReason},</if>
             <if test="refundReasonTime != null">refund_reason_time = #{refundReasonTime},</if>
             <if test="refundPrice != null">refund_price = #{refundPrice},</if>
-            <if test="isDelete != null">is_delete = #{isDelete},</if>
+            <if test="isDelete != null or isDelete==0 ">is_delete = #{isDelete},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = NOW(),</if>
             <if test="arrivalTime != null">arrival_time = #{arrivalTime},</if>