diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java
index 4fdcf5c1..28a9f0ca 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java
@@ -251,6 +251,12 @@ public interface YxStoreOrderService  extends BaseService<YxStoreOrder>{
     */
     void download(List<YxStoreOrderDto> all, HttpServletResponse response) throws IOException;
 
+    /**
+     * 获取订单详情
+     * @param orderId
+     * @return
+     */
+    YxStoreOrderDto getOrderDetail(Long orderId);
 
     Map<String,Object> queryAll(List<String> ids);
 
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderDto.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderDto.java
index 50ff936b..df2aec14 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderDto.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderDto.java
@@ -35,6 +35,10 @@ public class YxStoreOrderDto implements Serializable {
 
     private List<StoreOrderCartInfoDto> cartInfoList;
 
+    /**
+     * 订单状态列表
+     */
+    private List<YxStoreOrderStatusDto> storeOrderStatusList;
 
     // 订单号
     private String orderId;
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
index c83e12cb..c8dd9266 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
@@ -33,6 +33,7 @@ import co.yixiang.enums.ShopCommonEnum;
 import co.yixiang.event.TemplateBean;
 import co.yixiang.event.TemplateEvent;
 import co.yixiang.event.TemplateListenEnum;
+import co.yixiang.exception.BadRequestException;
 import co.yixiang.exception.EntityExistException;
 import co.yixiang.exception.ErrorRequestException;
 import co.yixiang.modules.activity.domain.YxStoreCouponUser;
@@ -51,22 +52,13 @@ import co.yixiang.modules.cart.vo.YxStoreCartQueryVo;
 import co.yixiang.modules.order.domain.YxExpress;
 import co.yixiang.modules.order.domain.YxStoreOrder;
 import co.yixiang.modules.order.domain.YxStoreOrderCartInfo;
+import co.yixiang.modules.order.domain.YxStoreOrderStatus;
 import co.yixiang.modules.order.param.OrderParam;
 import co.yixiang.modules.order.service.YxExpressService;
 import co.yixiang.modules.order.service.YxStoreOrderCartInfoService;
 import co.yixiang.modules.order.service.YxStoreOrderService;
 import co.yixiang.modules.order.service.YxStoreOrderStatusService;
-import co.yixiang.modules.order.service.dto.CacheDto;
-import co.yixiang.modules.order.service.dto.CountDto;
-import co.yixiang.modules.order.service.dto.OrderCountDto;
-import co.yixiang.modules.order.service.dto.OrderTimeDataDto;
-import co.yixiang.modules.order.service.dto.OtherDto;
-import co.yixiang.modules.order.service.dto.PriceGroupDto;
-import co.yixiang.modules.order.service.dto.StatusDto;
-import co.yixiang.modules.order.service.dto.StoreOrderCartInfoDto;
-import co.yixiang.modules.order.service.dto.TemplateDto;
-import co.yixiang.modules.order.service.dto.YxStoreOrderDto;
-import co.yixiang.modules.order.service.dto.YxStoreOrderQueryCriteria;
+import co.yixiang.modules.order.service.dto.*;
 import co.yixiang.modules.order.service.mapper.StoreOrderMapper;
 import co.yixiang.modules.order.vo.ComputeVo;
 import co.yixiang.modules.order.vo.ConfirmOrderVo;
@@ -104,6 +96,7 @@ import co.yixiang.utils.OrderUtil;
 import co.yixiang.utils.RedisUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -2181,6 +2174,76 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
         }
         FileUtil.downloadExcel(list, response);
     }
+    /**
+     * 获取订单详情
+     * @param orderId
+     * @return
+     */
+    @Override
+    public YxStoreOrderDto getOrderDetail(Long orderId) {
+        YxStoreOrder yxStoreOrder = this.getById(orderId);
+        if(ObjectUtil.isEmpty(yxStoreOrder)){
+            throw new BadRequestException("订单详情不存在");
+        }
+        YxStoreOrderDto yxStoreOrderDto = generator.convert(yxStoreOrder, YxStoreOrderDto.class);
+        Integer _status = OrderUtil.orderStatus(yxStoreOrder.getPaid(),yxStoreOrder.getStatus(),
+                yxStoreOrder.getRefundStatus());
+
+        if(yxStoreOrder.getStoreId() > 0) {
+            String storeName = systemStoreService.getById(yxStoreOrder.getStoreId()).getName();
+            yxStoreOrderDto.setStoreName(storeName);
+        }
+
+        //订单状态
+        String orderStatusStr = OrderUtil.orderStatusStr(yxStoreOrder.getPaid()
+                ,yxStoreOrder.getStatus(),yxStoreOrder.getShippingType()
+                ,yxStoreOrder.getRefundStatus());
+
+        if(_status == 3){
+
+            String refundTime = DateUtil.formatDateTime(yxStoreOrder.getRefundReasonTime());
+            String str = "<b style='color:#f124c7'>申请退款</b><br/>"+
+                    "<span>退款原因："+yxStoreOrder.getRefundReasonWap()+"</span><br/>" +
+                    "<span>备注说明："+yxStoreOrder.getRefundReasonWapExplain()+"</span><br/>" +
+                    "<span>退款时间："+refundTime+"</span><br/>";
+            orderStatusStr = str;
+        }
+        yxStoreOrderDto.setStatusName(orderStatusStr);
+
+        yxStoreOrderDto.set_status(_status);
+
+        String payTypeName = OrderUtil.payTypeName(yxStoreOrder.getPayType()
+                ,yxStoreOrder.getPaid());
+        yxStoreOrderDto.setPayTypeName(payTypeName);
+
+        yxStoreOrderDto.setPinkName(this.orderType(yxStoreOrder.getId()
+                ,yxStoreOrder.getPinkId(),yxStoreOrder.getCombinationId()
+                ,yxStoreOrder.getSeckillId(),yxStoreOrder.getBargainId(),
+                yxStoreOrder.getShippingType()));
+
+        //添加订单状态
+        List<YxStoreOrderStatus> storeOrderStatuses = orderStatusService.list(new LambdaQueryWrapper<YxStoreOrderStatus>()
+        .eq(YxStoreOrderStatus::getOid,yxStoreOrder.getId()));
+        List<YxStoreOrderStatusDto> orderStatusDtos = generator.convert(storeOrderStatuses, YxStoreOrderStatusDto.class);
+        yxStoreOrderDto.setStoreOrderStatusList(orderStatusDtos);
+        //添加购物车详情
+        List<YxStoreOrderCartInfo> cartInfos = storeOrderCartInfoService.list(
+                new QueryWrapper<YxStoreOrderCartInfo>().eq("oid",yxStoreOrder.getId()));
+        List<StoreOrderCartInfoDto> cartInfoDTOS = new ArrayList<>();
+        for (YxStoreOrderCartInfo cartInfo : cartInfos) {
+            StoreOrderCartInfoDto cartInfoDTO = new StoreOrderCartInfoDto();
+            cartInfoDTO.setCartInfoMap(JSON.parseObject(cartInfo.getCartInfo()));
+
+            cartInfoDTOS.add(cartInfoDTO);
+        }
+        yxStoreOrderDto.setCartInfoList(cartInfoDTOS);
+        //添加用户信息
+        yxStoreOrderDto.setUserDTO(generator.convert(userService.getById(yxStoreOrder.getUid()), YxUserDto.class));
+        if(yxStoreOrderDto.getUserDTO()==null){
+            yxStoreOrderDto.setUserDTO(new YxUserDto());
+        }
+        return yxStoreOrderDto;
+    }
 
     @Override
     public Map<String, Object> queryAll(List<String> ids) {
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
index b835b070..eb3661e0 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
+++ b/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
@@ -126,6 +126,13 @@ public class StoreOrderController {
         return new ResponseEntity<>(yxStoreOrderService.queryAll(newCriteria, pageable), HttpStatus.OK);
     }
 
+    @ApiOperation(value = "根据订单id获取订单详情")
+    @GetMapping(value = "/getStoreOrderDetail")
+    @PreAuthorize("hasAnyRole('admin','YXSTOREORDER_ALL','YXSTOREORDER_SELECT','YXEXPRESS_SELECT')")
+    public ResponseEntity getYxStoreOrders(@PathVariable Long orderId) {
+        return new ResponseEntity<>(yxStoreOrderService.getOrderDetail(orderId), HttpStatus.OK);
+    }
+
 
     @ApiOperation(value = "发货")
     @PutMapping(value = "/yxStoreOrder")
diff --git a/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveGoodsServiceImpl.java b/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveGoodsServiceImpl.java
index ddfb8d51..faf96b53 100644
--- a/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveGoodsServiceImpl.java
+++ b/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveGoodsServiceImpl.java
@@ -102,6 +102,7 @@ public class YxWechatLiveGoodsServiceImpl extends BaseServiceImpl<YxWechatLiveGo
         YxWechatLiveGoods wechatLiveGoods = this.getById(resources.getGoodsId());
         try {
         WxMaService wxMaService = WxMaConfiguration.getWxMaService();
+            WxMaLiveInfo.Goods goods = generator.convert(resources, WxMaLiveInfo.Goods.class);
             if(ObjectUtil.isNotEmpty(wechatLiveGoods)){
                 /** 审核状态 0：未审核，1：审核中，2:审核通过，3审核失败 */
                 if(LiveGoodsEnum.IS_Audit_2.getValue().equals(wechatLiveGoods.getAuditStatus())){
@@ -109,9 +110,14 @@ public class YxWechatLiveGoodsServiceImpl extends BaseServiceImpl<YxWechatLiveGo
                     resources.setCoverImgUrl(uploadPhotoToWx(wxMaService,resources.getCoverImgeUrl()).getMediaId());
                 }else if(LiveGoodsEnum.IS_Audit_1.getValue().equals(wechatLiveGoods.getAuditStatus())){
                     throw new BadRequestException("商品审核中不允许修改");
+                }else if(LiveGoodsEnum.IS_Audit_3.getValue().equals(wechatLiveGoods.getAuditStatus())){
+                    resources.setCoverImgUrl(uploadPhotoToWx(wxMaService,resources.getCoverImgeUrl()).getMediaId());
+                    wxMaService.getLiveGoodsService().updateGoods(goods);
+                    wxMaService.getLiveGoodsService().auditGoods(goods.getGoodsId());
+                    return;
                 }
             }
-            WxMaLiveInfo.Goods goods = generator.convert(resources, WxMaLiveInfo.Goods.class);
+
             boolean wxMaLiveResult = wxMaService.getLiveGoodsService().updateGoods(goods);
             this.saveOrUpdate(resources);
         } catch (WxErrorException e) {
diff --git a/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveServiceImpl.java b/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveServiceImpl.java
index 09fa306f..de8e3e0b 100644
--- a/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveServiceImpl.java
+++ b/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveServiceImpl.java
@@ -125,6 +125,8 @@ public class YxWechatLiveServiceImpl extends BaseServiceImpl<YxWechatLiveMapper,
         });
         wechatLiveVo.setContent(liveDtos);
         wechatLiveVo.setTotalElements(page.getTotal());
+        wechatLiveVo.setPageNumber(page.getPageNum());
+        wechatLiveVo.setLastPage(page.getPages());
         return wechatLiveVo;
     }
     @Override
diff --git a/yshop-weixin/src/main/java/co/yixiang/modules/mp/vo/WechatLiveVo.java b/yshop-weixin/src/main/java/co/yixiang/modules/mp/vo/WechatLiveVo.java
index b5af62ac..a06901e0 100644
--- a/yshop-weixin/src/main/java/co/yixiang/modules/mp/vo/WechatLiveVo.java
+++ b/yshop-weixin/src/main/java/co/yixiang/modules/mp/vo/WechatLiveVo.java
@@ -11,4 +11,10 @@ public class WechatLiveVo {
     private List<YxWechatLiveDto> content;
 
     private Long totalElements;
+
+    private Integer pageNumber;
+
+    private Integer lastPage;
+
+
 }