diff --git a/crmeb-admin/src/main/resources/application.yml b/crmeb-admin/src/main/resources/application.yml
index f6bcaaa..dcc1500 100644
--- a/crmeb-admin/src/main/resources/application.yml
+++ b/crmeb-admin/src/main/resources/application.yml
@@ -10,7 +10,7 @@ crmeb:
   imagePath: /Users/stivepeim/Documents/ZBKJ/CODEMANGER/BIZ-CODE/JavaSingel/2.0.5/CRMEB_JAVA_SY_V2.0.5-20240517/single_java/
   demoSite: true # 是否演示站点 所有手机号码都会掩码
   activityStyleCachedTime: 10 #活动边框缓存周期 秒为单位，生产环境适当5-10分钟即可
-  imageHost: https://h5-wechat-mall.oss-cn-shanghai.aliyuncs.com/
+  imageHost: https://wechat-mall-dev.oss-cn-shanghai.aliyuncs.com/
   ignored: #安全路径白名单
     - swagger-ui/
     - swagger-resources/**
diff --git a/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProduct.java b/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProduct.java
index 5aec7e8..4918607 100644
--- a/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProduct.java
+++ b/crmeb-common/src/main/java/com/zbkj/common/model/product/StoreProduct.java
@@ -51,7 +51,7 @@ public class StoreProduct implements Serializable {
     private String storeName;
 
     @ApiModelProperty(value = "商品简介")
-    private String storeInfo ;
+    private String storeInfo ="";
 
     @ApiModelProperty(value = "关键字")
     private String keyword;
diff --git a/crmeb-service/src/main/java/com/zbkj/service/dao/XsbuyDao.java b/crmeb-service/src/main/java/com/zbkj/service/dao/XsbuyDao.java
index 96df245..acddfc1 100644
--- a/crmeb-service/src/main/java/com/zbkj/service/dao/XsbuyDao.java
+++ b/crmeb-service/src/main/java/com/zbkj/service/dao/XsbuyDao.java
@@ -12,7 +12,4 @@ public interface XsbuyDao {
     List<XsSkuInfo> selectListNew(@Param("content") String content,@Param("pageIndex") long l,@Param("pageSize") Long pageSize);
 
 
-
-
-
 }
diff --git a/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java b/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java
index 5b6aada..7482c05 100644
--- a/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java
+++ b/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java
@@ -44,6 +44,7 @@ import com.zbkj.common.utils.RedisUtil;
 import com.zbkj.common.vo.*;
 import com.zbkj.service.delete.OrderUtils;
 import com.zbkj.service.service.*;
+import com.zbkj.service.util.RedisLockUtil;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -103,7 +104,8 @@ public class OrderServiceImpl implements OrderService {
 
     @Autowired
     private StoreProductReplyService storeProductReplyService;
-
+    @Autowired
+    private RedisLockUtil redisLock;
     @Autowired
     private RedisUtil redisUtil;
 
@@ -332,6 +334,11 @@ public class OrderServiceImpl implements OrderService {
      */
     @Override
     public Boolean refundApply(OrderRefundApplyRequest request) {
+        boolean lock =
+                redisLock.lock(Constants.ORDER_LOCK + request.getUni(),30);
+        if (!lock) {
+            throw new CrmebException("系统繁忙，请稍后再试");
+        }
         StoreOrder storeOrderPram = new StoreOrder();
         storeOrderPram.setOrderId(request.getUni());
         storeOrderPram.setIsDel(false);
@@ -349,8 +356,10 @@ public class OrderServiceImpl implements OrderService {
         if (existStoreOrder.getRefundStatus() == 3) {
             throw new CrmebException("订单退款中");
         }
-
+        existStoreOrder.setAfterSalesType("退货退款");
+        existStoreOrder.setAfterSalesStatus("待商家处理");
         existStoreOrder.setRefundStatus(1);
+        existStoreOrder.setRefundRequestStatus(3);
         existStoreOrder.setRefundReasonTime(CrmebDateUtil.nowDateTime());
         existStoreOrder.setRefundReasonWap(request.getText());
         existStoreOrder.setRefundReasonWapExplain(request.getExplain());
diff --git a/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java b/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java
index bbd241e..d00ed14 100644
--- a/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java
+++ b/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java
@@ -46,6 +46,7 @@ import com.zbkj.service.dao.StoreOrderDao;
 import com.zbkj.service.dao.StoreProductAttrValueDao;
 import com.zbkj.service.delete.OrderUtils;
 import com.zbkj.service.service.*;
+import com.zbkj.service.util.RedisLockUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -79,7 +80,8 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderDao, StoreOrder
 
     @Resource
     private StoreOrderDao dao;
-
+    @Autowired
+    private RedisLockUtil redisLock;
     @Autowired
     private SystemStoreService systemStoreService;
     @Autowired
@@ -559,6 +561,11 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderDao, StoreOrder
      */
     @Override
     public boolean refund(StoreOrderRefundRequest request) {
+        boolean lock =
+                redisLock.lock(Constants.ORDER_LOCK + request.getOrderNo(),30);
+        if (!lock) {
+            throw new CrmebException("系统繁忙，请稍后再试");
+        }
         StoreOrder storeOrder = getInfoException(request.getOrderNo());
         if (!storeOrder.getPaid()) {
             throw new CrmebException("未支付无法退款");
@@ -572,6 +579,8 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderDao, StoreOrder
             }
         }
         request.setOrderId(storeOrder.getId());
+        storeOrder.setRefundRequestStatus(1);
+        storeOrder.setAfterSalesStatus("退款中");
         //用户
         User user = userService.getById(storeOrder.getUid());
 
diff --git a/crmeb-service/src/main/resources/mapper/XsSkuInfoMapper.xml b/crmeb-service/src/main/resources/mapper/store/XsSkuInfoMapper.xml
similarity index 90%
rename from crmeb-service/src/main/resources/mapper/XsSkuInfoMapper.xml
rename to crmeb-service/src/main/resources/mapper/store/XsSkuInfoMapper.xml
index 7cf74cd..6ba4b76 100644
--- a/crmeb-service/src/main/resources/mapper/XsSkuInfoMapper.xml
+++ b/crmeb-service/src/main/resources/mapper/store/XsSkuInfoMapper.xml
@@ -6,7 +6,7 @@
         <result property="skuNo" column="sku_no"/>
         <result property="skuName" column="sku_name"/>
     </resultMap>
-    <select id="selectListNew" resultMap="BaseMap">
+    <select id="selectListNew" resultType="com.zbkj.service.pojo.XsSkuInfo">
         select good_code sku_no,good_name sku_name,brand_code,brand_name,category_name,category_code from m_xsbuy_cn.xs_goods where is_show=1
         <if test="content !=null and content !=''">
             and LOWER(good_code) =LOWER(#{content}  )
@@ -14,4 +14,5 @@
         ORDER BY id limit 20
     </select>
 
+
 </mapper>