diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java
index 641c3b1c3..55884a48e 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/GbOrderServiceImpl.java
@@ -85,6 +85,9 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
         boolean update = shopConfigService.update(shopConfig, query().eq(ShopConfig::getId, shopId));
         if (update && status == 0) {
             shopDownRefund(shopId);
+            GbWare upWare = new GbWare();
+            upWare.setOnlineStatus(SystemConstants.OneZero.ZERO);
+            wareService.update(upWare, query().eq(GbWare::getShopId, shopId));
         }
         return update;
     }
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
index c0b1c8938..7b305cc65 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
@@ -857,11 +857,11 @@ public class PayServiceImpl implements PayService {
         CzgResult<CzgRefundResp> refund = refund(shopId, new CzgRefundReq(refPayOrderNo, refundReason, refundAmount.multiply(MONEY_RATE).longValue(),
                 payment.getOrderNo(), ""));
         OrderPayment uOrderPayment = new OrderPayment();
-        uOrderPayment.setTradeNumber(refund.getData().getRefundOrderId());
         uOrderPayment.setRespJson(JSONObject.toJSONString(refund.getData()));
         if (refund.getCode() != 200 || refund.getData() == null || !"SUCCESS".equals(refund.getData().getState())) {
             uOrderPayment.setPayStatus(PayTypeConstants.PayStatus.FAIL);
         } else {
+            uOrderPayment.setTradeNumber(refund.getData().getRefundOrderId());
             uOrderPayment.setPayStatus(PayTypeConstants.PayStatus.SUCCESS);
             uOrderPayment.setPayTime(LocalDateTimeUtil.parse(refund.getData().getRefundTime(), "yyyy-MM-dd HH:mm:ss"));
         }
diff --git a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
index aba352c54..2390392b2 100644
--- a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
+++ b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
@@ -20,11 +20,13 @@
         <if test="param.groupOrderNo != null">
             AND detail.group_order_no = #{param.groupOrderNo}
         </if>
-        <if test='param.status == "退款"'>
-            AND (detail.STATUS = '退款中' or detail.STATUS = '已退款')
-        </if>
-        <if test='param.status != "退款"'>
-            AND detail.STATUS = #{param.status}
+        <if test="param.status != null">
+            <if test="param.status == '退款'">
+                AND (detail.STATUS = '退款中' or detail.STATUS = '已退款')
+            </if>
+            <if test="param.status != '退款'">
+                AND detail.STATUS = #{param.status}
+            </if>
         </if>
         <if test="param.userId != null">
             AND detail.user_id = #{param.userId}