提交 参加的商铺列表

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinStatusConst.java

@@ -57,17 +57,18 @@ public class GoblinStatusConst {
         ORDER_LOG_STATUS_29(29, "退款拒绝"),
 
 
-        ORDER_BACK_STATUS_0(0, "商家发起退款"),
+        ORDER_BACK_STATUS_0(0, "商家发起退款(退款中)"),
         ORDER_BACK_STATUS_1(1, "退款申请(用户发送退款请求)"),
         ORDER_BACK_STATUS_2(2, "退款成功(商家同意退款)"),
         ORDER_BACK_STATUS_3(3, "退款拒绝(商家拒绝退款)"),
         ORDER_BACK_STATUS_4(4, "退货申请(用户发起退货请求)"),
-        ORDER_BACK_STATUS_5(5, "5-退货拒绝(商家拒绝退货)"),
+        ORDER_BACK_STATUS_5(5, "退货拒绝(商家拒绝退货)"),
         ORDER_BACK_STATUS_6(6, "退货审核通过等待用户填写物流"),
-        ORDER_BACK_STATUS_7(7, "待收货"),
+        ORDER_BACK_STATUS_7(7, "待收货(退货中)"),
         ORDER_BACK_STATUS_8(8, "退货完成"),
         ORDER_BACK_STATUS_9(9, "退款拒绝"),
         ORDER_BACK_STATUS_10(10, "退款失败"),
+        ORDER_BACK_STATUS_11(11, "取消退款"),
         ;
 
         private final int value;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinBackOrderSkuVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 订单退单退款表
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-12-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class GoblinBackOrderSkuVo implements Serializable,Cloneable {
+
+    @ApiModelProperty(value = "orderSkuId")
+    private String orderSkuId;
+    @ApiModelProperty(value = "spuId")
+    private String spuId;
+    @ApiModelProperty(value = "spu名称")
+    private String spuName;
+    @ApiModelProperty(value = "spu图")
+    private String spuPic;
+    @ApiModelProperty(value = "SkuId")
+    private String skuId;
+    @ApiModelProperty(value = "Sku图")
+    private String skuPic;
+    @ApiModelProperty(value = "Sku名称")
+    private String skuName;
+    @ApiModelProperty(value = "Sku款式")
+    private String skuSpecs;
+
+
+    @ApiModelProperty(value = "创建时间")
+    private String createdAt;
+
+    private static final GoblinBackOrderSkuVo obj = new GoblinBackOrderSkuVo();
+
+    public static GoblinBackOrderSkuVo getNew() {
+        try {
+            return (GoblinBackOrderSkuVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new GoblinBackOrderSkuVo();
+    }
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinBackOrderVo.java

 package com.liquidnet.service.goblin.dto.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -35,8 +33,8 @@ public class GoblinBackOrderVo implements Serializable,Cloneable {
     private String storeId;
     @ApiModelProperty(value = "用户id")
     private String userId;
-    @ApiModelProperty(value = "退货的单品ID多个用,分开  退款的时候不需要，因为退款只能整单退1001-1,1002-3 表示单品id为1001 的单品退货1件 单品id为1002的单品退货3件")
-    private String skuIdNums;
+    @ApiModelProperty(value = "退款sku")
+    private List<GoblinBackOrderSkuVo> backOrderSkuVos;
     @ApiModelProperty(value = "类型[1-退款|2-退货]")
     private Integer type;
     @ApiModelProperty(value = "退款／退货原因[1-不想买了|2-收货人信息有误|3-未按指定时间发货|4-其他|5-不想买了|6-商品质量问题|7-收到商品与描述不符|8-商铺发起|9-系统自动申请]")

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinOrderSkuVo.java

@@ -30,6 +30,8 @@ public class GoblinOrderSkuVo implements Serializable, Cloneable {
     private String orderId;
     @ApiModelProperty(value = "商品id")
     private String spuId;
+    @ApiModelProperty(value = "商品名称")
+    private String spuName;
     @ApiModelProperty(value = "款式id")
     private String skuId;
     @ApiModelProperty(value = "数量")

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreBackOrderListVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@ApiModel
+@Data
+public class GoblinStoreBackOrderListVo implements Cloneable {
+    @ApiModelProperty(value = "退款订单id")
+    private String backOrderId;
+    @ApiModelProperty(value = "订单号")
+    private String backCode;
+    @ApiModelProperty(value = "下单时间")
+    private String orderCode;
+    @ApiModelProperty(value = "下单方式")
+    private String type;
+    @ApiModelProperty(value = " 收货人姓名")
+    private String status;
+    @ApiModelProperty(value = " 收货人联系方式")
+    private String realBackPrice;
+    @ApiModelProperty(value = " 收货人地址")
+    private String createdAt;
+    @ApiModelProperty(value = "退款sku")
+    private List<GoblinBackOrderSkuVo> backOrderSkuVos;
+
+
+
+    private static final GoblinStoreBackOrderListVo obj = new GoblinStoreBackOrderListVo();
+
+    public static GoblinStoreBackOrderListVo getNew() {
+        try {
+            return (GoblinStoreBackOrderListVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinStoreBackOrderListVo();
+        }
+    }
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreOrderVo.java

 package com.liquidnet.service.goblin.dto.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.liquidnet.commons.lang.util.DateUtil;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/manage/IGoblinStoreBackOrderService.java

+package com.liquidnet.service.goblin.service.manage;
+
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.vo.GoblinStoreBackOrderListVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinStoreOrderListVo;
+import com.liquidnet.service.goblin.param.RefundCallbackParam;
+
+import java.math.BigDecimal;
+
+public interface IGoblinStoreBackOrderService {
+    ResponseDto<PageInfo<GoblinStoreBackOrderListVo>> orderBackList(Integer page,
+                                                                    String orderBackCode,
+                                                                    Integer type,
+                                                                    String cst,
+                                                                    String cet,
+                                                                    String orderCode,
+                                                                    String spuName,
+                                                                    Integer status);
+
+    ResponseDto<GoblinStoreBackOrderListVo> orderDetails(String backOrderId);
+
+}

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/dto/GoblinZhengzaiStoreListDto.java

@@ -6,6 +6,7 @@ import lombok.Data;
 public class GoblinZhengzaiStoreListDto {
     String storeId;
     String storeName;
+    String showTime;
     Integer spuCount;
     Integer skuCount;
 }

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinOrderSku.java

@@ -40,6 +40,11 @@ public class GoblinOrderSku implements Serializable,Cloneable {
      */
     private String spuId;
 
+    /**
+     * 商品名称
+     */
+    private String spuName;
+
     /**
      * 款式id
      */

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinSelfMarketingMapper.xml

@@ -5,6 +5,7 @@
     <resultMap id="goblinZhengzaiStoreListDtoResult" type="com.liquidnet.service.goblin.dto.GoblinZhengzaiStoreListDto">
         <result column="store_id" property="storeId"/>
         <result column="store_name" property="storeName"/>
+        <result column="show_time" property="showTime"/>
         <result column="spu_count" property="spuCount"/>
         <result column="sku_count" property="skuCount"/>
     </resultMap>
@@ -25,7 +26,7 @@
 
 
     <select id="getZhengzaiStoreList" resultMap="goblinZhengzaiStoreListDtoResult">
-select b.store_id,c.store_name,IFNull(count(d.spu_id),0) as 'spu_count',IFNull(count(d.sku_id),0) as 'sku_count' from goblin_self_marketing as a
+select b.store_id,c.store_name,b,show_time,IFNull(count(d.spu_id),0) as 'spu_count',IFNull(count(d.sku_id),0) as 'sku_count' from goblin_self_marketing as a
 inner join goblin_marketing_zhengzai_relation as b on a.self_market_id = b.self_market_id
 inner join goblin_store_info as c on c.store_id= b.store_id
 left join goblin_marketing_zhengzai as d on d.self_market_id = b.self_market_id

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreBackOrderController.java

+package com.liquidnet.service.goblin.controller.manage;
+
+import com.github.pagehelper.PageInfo;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.vo.GoblinStoreBackOrderListVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinStoreOrderListVo;
+import com.liquidnet.service.goblin.param.RefundCallbackParam;
+import com.liquidnet.service.goblin.service.manage.IGoblinStoreBackOrderService;
+import com.liquidnet.service.goblin.service.manage.IGoblinStoreOrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.math.BigDecimal;
+
+@ApiSupport(order = 149101)
+@Api(tags = "店铺-订单")
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("store/orderBack")
+public class GoblinStoreBackOrderController {
+    @Autowired
+    IGoblinStoreBackOrderService goblinStoreBackOrderService;
+
+    @ApiOperation(value = "订单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "page", value = "页数"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "orderBackCode", value = "订单退款编号"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "type", value = "退款类型[0-全部|1-退款|2-退货|3-退款退货]"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "cst", value = "申请起始时间"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "cet", value = "申请终止时间"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "orderCode", value = "订单编号"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "spuName", value = "商品名称"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "status", value = "订单状态[1-待处理|2-已退款|9-已拒绝|11-已取消|0-退款中|7-退货中]"),
+    })
+    @GetMapping(value = "list")
+    public ResponseDto<PageInfo<GoblinStoreBackOrderListVo>> orderBackList(@RequestParam(value = "page", required = true) @Valid Integer page,
+                                                                           @RequestParam(value = "orderBackCode", required = false) String orderBackCode,
+                                                                           @RequestParam(value = "type", required = false) Integer type,
+                                                                           @RequestParam(value = "cst", required = false) String cst,
+                                                                           @RequestParam(value = "cet", required = false) String cet,
+                                                                           @RequestParam(value = "orderCode", required = false) String orderCode,
+                                                                           @RequestParam(value = "spuName", required = false) String spuName,
+                                                                           @RequestParam(value = "status", required = false) Integer status) {
+
+        return goblinStoreBackOrderService.orderBackList(page, orderBackCode, type, cst, cet, orderCode, spuName, status);
+    }
+
+    @ApiOperation(value = "退款订单详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "backOrderId", value = "订单id"),
+    })
+    @GetMapping(value = "details")
+    public ResponseDto<GoblinStoreBackOrderListVo> orderList(@RequestParam(value = "backOrderId", required = true) @Valid String backOrderId) {
+        return goblinStoreBackOrderService.orderDetails(backOrderId);
+    }
+}

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderServiceImpl.java

@@ -199,6 +199,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
         for (GoblinOrderSkuParam skuParam : storeParam.getGoblinOrderSkuParamArrayList()) {
             String pre = GoblinStatusConst.MarketPreStatus.getPre(skuParam.getSkuId());
             GoblinGoodsSkuInfoVo skuVo = redisUtils.getGoodsSkuInfoVo(skuParam.getSkuId());
+            GoblinGoodsInfoVo spuVo = redisUtils.getGoodsInfoVo(skuParam.getSpuId());
             skuName = skuName.concat(skuVo.getName()).concat(",");
             if (pre != null && pre.contains(GoblinStatusConst.MarketPreStatus.MARKET_PRE_PURCHASE.getValue())) {
                 writeOffCode = "EMPTY";
@@ -231,6 +232,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             orderSku.setOrderId(orderId);
             orderSku.setStatus(GoblinStatusConst.Status.ORDER_STATUS_0.getValue());
             orderSku.setSpuId(skuParam.getSpuId());
+            orderSku.setSpuName(spuVo.getName());
             orderSku.setSkuId(skuParam.getSkuId());
             orderSku.setNum(skuParam.getNumber());
             orderSku.setSkuPrice(priceBase);

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreBackOrderServiceImpl.java

+package com.liquidnet.service.goblin.service.impl.manage;
+
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.commons.lang.util.*;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.base.SqlMapping;
+import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.goblin.constant.GoblinStatusConst;
+import com.liquidnet.service.goblin.dto.vo.*;
+import com.liquidnet.service.goblin.entity.GoblinBackOrder;
+import com.liquidnet.service.goblin.entity.GoblinBackOrderLog;
+import com.liquidnet.service.goblin.entity.GoblinOrderOperationLog;
+import com.liquidnet.service.goblin.param.RefundCallbackParam;
+import com.liquidnet.service.goblin.service.manage.IGoblinStoreBackOrderService;
+import com.liquidnet.service.goblin.service.manage.IGoblinStoreOrderService;
+import com.liquidnet.service.goblin.util.GoblinMongoUtils;
+import com.liquidnet.service.goblin.util.GoblinRedisUtils;
+import com.liquidnet.service.goblin.util.ObjectUtil;
+import com.liquidnet.service.goblin.util.QueueUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.MultiValueMap;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+
+@Service
+@Slf4j
+public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderService {
+
+    @Autowired
+    GoblinRedisUtils redisUtils;
+    @Autowired
+    GoblinMongoUtils mongoUtils;
+    @Autowired
+    QueueUtils queueUtils;
+    @Value("${liquidnet.service.order.url-pay.goblinRefundUrl}")
+    private String synUrl;
+    @Value("${liquidnet.service.dragon.urls.refundApply}")
+    private String refundApply;
+
+    @Override
+    public ResponseDto<PageInfo<GoblinStoreBackOrderListVo>> orderBackList(Integer page, String orderBackCode, Integer type, String cst, String cet, String orderCode, String spuName, Integer status) {
+        List<GoblinStoreBackOrderListVo> listVos = ObjectUtil.goblinStoreBackOrderListVoArrayList();
+        String uid = CurrentUtil.getCurrentUid();
+        GoblinStoreInfoVo storeInfoVo = redisUtils.getStoreInfoVoByUid(uid);
+        if (storeInfoVo == null) {
+            return ResponseDto.failure("无法查看");
+        }
+        HashMap<String, Object> map = mongoUtils.storeBackOrderList(storeInfoVo.getStoreId(), page, orderBackCode,type, cst, cet, orderCode, spuName, status);
+        long total = (long) map.get("total");
+        List<GoblinBackOrderVo> voList = (List<GoblinBackOrderVo>) map.get("data");
+        for (GoblinBackOrderVo item : voList) {
+            GoblinStoreBackOrderListVo vo = GoblinStoreBackOrderListVo.getNew();
+            vo.setCreatedAt(item.getCreatedAt());
+            vo.setBackOrderId(item.getBackOrderId());
+            vo.setBackCode(item.getBackCode());
+            vo.setBackOrderSkuVos(item.getBackOrderSkuVos());
+            vo.setOrderCode(item.getOrderCode());
+            vo.setRealBackPrice(item.getBackOrderId());
+            vo.setStatus(item.getBackOrderId());
+            vo.setType(item.getBackOrderId());
+            listVos.add(vo);
+        }
+        PageInfo<GoblinStoreBackOrderListVo> pageInfo = new PageInfo(listVos);
+        pageInfo.setTotal(total);
+        return ResponseDto.success(pageInfo);
+    }
+
+    @Override
+    public ResponseDto<GoblinStoreBackOrderListVo> orderDetails(String backOrderId) {
+        String uid = CurrentUtil.getCurrentUid();
+        GoblinStoreInfoVo storeInfoVo = redisUtils.getStoreInfoVoByUid(uid);
+        if (storeInfoVo == null) {
+            return ResponseDto.failure("无法查看");
+        }
+        GoblinBackOrderVo orderVo = redisUtils.getBackOrderVo(backOrderId);
+        GoblinStoreBackOrderListVo vo = GoblinStoreBackOrderListVo.getNew();
+        vo.setCreatedAt(orderVo.getCreatedAt());
+        vo.setBackOrderId(orderVo.getBackOrderId());
+        vo.setBackCode(orderVo.getBackCode());
+        vo.setBackOrderSkuVos(orderVo.getBackOrderSkuVos());
+        vo.setOrderCode(orderVo.getOrderCode());
+        vo.setRealBackPrice(orderVo.getBackOrderId());
+        vo.setStatus(orderVo.getBackOrderId());
+        vo.setType(orderVo.getBackOrderId());
+        return ResponseDto.success(vo);
+    }
+}

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreOrderServiceImpl.java

@@ -355,6 +355,14 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         GoblinBackOrderVo backOrderVo = GoblinBackOrderVo.getNew();
         BeanUtils.copyProperties(goblinBackOrder, backOrderVo);
         backOrderVo.setCreatedAt(nowStr);
+        GoblinBackOrderSkuVo backOrderSkuVo = GoblinBackOrderSkuVo.getNew();
+        backOrderSkuVo.setOrderSkuId(orderSkuId);
+        backOrderSkuVo.setSpuId(orderSkuVo.getSpuId());
+        backOrderSkuVo.setSpuName(orderSkuVo.getSpuName());
+        backOrderSkuVo.setSkuId(orderSkuVo.getSkuId());
+        backOrderSkuVo.setSkuName(orderSkuVo.getSkuName());
+        backOrderSkuVo.setSkuSpecs(orderSkuVo.getSkuSpecs());
+        backOrderSkuVo.setCreatedAt(nowStr);
         //添加日志
         GoblinBackOrderLog backOrderLog = initBackLog(orderId, uid, now);
         backOrderLog.setStatus(GoblinStatusConst.Status.ORDER_LOG_STATUS_22.getValue());
@@ -426,7 +434,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
             sqls.add(SqlMapping.get("goblin_order.store.refundSkuPrice"));
             sqls.add(SqlMapping.get("goblin_order.store.refundBackOrder"));
             String orderId = backOrderVo.getOrderId();
-            String[] orderSkuIds = backOrderVo.getSkuIdNums().split(",");
+            List<GoblinBackOrderSkuVo> backOrderSkuVos = backOrderVo.getBackOrderSkuVos();
             BigDecimal price = refundCallbackParam.getRefundPrice();
             GoblinStoreOrderVo orderVo = redisUtils.getGoblinOrder(orderId);
             orderVo.setPriceRefund(orderVo.getPriceRefund().add(price));
@@ -434,8 +442,8 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
                 orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_6.getValue());
             }
             backOrderVo.setStatus(GoblinStatusConst.Status.ORDER_BACK_STATUS_2.getValue());
-            for (String orderSkuId : orderSkuIds) {
-                GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(orderSkuId);
+            for (GoblinBackOrderSkuVo backOrderSkuVo : backOrderSkuVos) {
+                GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(backOrderSkuVo.getOrderSkuId());
                 orderSkuVo.setPriceRefund(orderSkuVo.getPriceRefund().add(price));
                 if (orderSkuVo.getPriceRefund().compareTo(orderSkuVo.getSkuPriceActual()) == 0) {
                     orderSkuVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_6.getValue());
@@ -446,11 +454,11 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
                     }
                     redisUtils.incrSkuStock(pre, skuId, orderSkuVo.getNum());
                 }
-                redisUtils.setGoblinOrderSku(orderSkuId, orderSkuVo);
-                mongoUtils.updateGoblinOrderSkuVo(orderSkuId, orderSkuVo);
+                redisUtils.setGoblinOrderSku(backOrderSkuVo.getOrderSkuId(), orderSkuVo);
+                mongoUtils.updateGoblinOrderSkuVo(backOrderSkuVo.getOrderSkuId(), orderSkuVo);
                 sqlsOrderSku.add(new Object[]{
                         orderSkuVo.getPriceRefund(), orderSkuVo.getStatus(), now,
-                        orderSkuId, now, now
+                        backOrderSkuVo.getOrderSkuId(), now, now
                 });
                 GoblinOrderLogVo logVo = GoblinOrderLogVo.getNew();
                 logVo.setOrderId(orderVo.getOrderId());
@@ -463,8 +471,8 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
                 }
                 logVo.setStoreId(orderVo.getStoreId());
                 logVo.setSpuId(orderSkuVo.getSpuId());
-                logVo.setSpuName(redisUtils.getGoodsInfoVo(orderSkuVo.getSpuId()).getName());
-                logVo.setSkuId(orderSkuId);
+                logVo.setSpuName(backOrderSkuVo.getSpuName());
+                logVo.setSkuId(backOrderSkuVo.getSkuId());
                 logVo.setSkuPriceActual(price.multiply(BigDecimal.valueOf(100)).negate().longValue());
                 logVo.setStatus(GoblinStatusConst.Status.ORDER_LOG_STATUS_22.getValue());
                 logVo.setOperationId(backOrderVo.getUserId());

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java

@@ -564,7 +564,7 @@ public class GoblinMongoUtils {
         return map;
     }
 
-    //商品订单操作日志列表
+    //商品订单列表
     public HashMap<String, Object> storeOrderList(String storeId, Integer page, String orderCode, String cst, String cet, String expressContacts, String phone, Integer status) {
         //查询销量
         int size = 20;
@@ -600,4 +600,49 @@ public class GoblinMongoUtils {
         map.put("total", total);
         return map;
     }
+
+    //商品退款订单列表
+    public HashMap<String, Object> storeBackOrderList(String storeId, Integer page, String orderBackCode, Integer type, String cst, String cet, String orderCode, String spuName, Integer status) {
+        //查询销量
+        int size = 20;
+        int skipCount = ((page - 1) * size);
+        Criteria criteria = Criteria.where("storeId").is(storeId);
+        if (cst != null && cet != null) {
+            criteria = criteria.and("createdAt").gte(cst).lt(cet);
+        }
+        if (orderCode != null) {
+            criteria = criteria.and("orderCode").is(orderCode);
+        }
+        if (orderBackCode != null) {
+            criteria = criteria.and("backCode").is(orderBackCode);
+        }
+        if (status != null) {
+            criteria = criteria.and("status").is(status);
+        }
+        if (status != null) {
+            criteria = criteria.and("status").is(status);
+        }
+        if (type != null) {
+            criteria = criteria.and("type").is(type);
+        }
+        if (spuName != null) {
+            criteria = criteria.and("backOrderSkuVos.spuName").regex(".*?\\" + spuName);
+        }
+        Query query = Query.query(criteria);
+        query.skip(skipCount).limit(size);
+        query.fields().include("backCode").include("orderCode").include("backOrderId").include("type").include("status").include("realBackPrice").include("createdAt")
+                .include("backOrderSkuVos.spuName").include("backOrderSkuVos.skuName").include("backOrderSkuVos.spuPic").include("backOrderSkuVos.skuPic")
+                .include("backOrderSkuVos.skuSpecs");
+        List<GoblinBackOrderVo> dataList = mongoTemplate.find(query, GoblinBackOrderVo.class, GoblinBackOrderVo.class.getSimpleName());
+        //查询总数量
+        Query countQuery = Query.query(criteria);
+        countQuery.fields().include("orderCode");
+        List<GoblinBackOrderVo> countList = mongoTemplate.find(countQuery, GoblinBackOrderVo.class, GoblinBackOrderVo.class.getSimpleName());
+        long total = countList.size();
+        HashMap<String, Object> map = CollectionUtil.mapStringObject();
+        map.put("data", dataList);
+        map.put("total", total);
+        return map;
+    }
+
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/ObjectUtil.java

@@ -49,6 +49,7 @@ public class ObjectUtil {
     private static final ArrayList<GoblinStoreOrderListSkuVo> goblinStoreOrderListSkuVoArrayList = new ArrayList<>();
     private static final ArrayList<GoblinShoppingCartVo> goblinShoppingCartVoArrayList=new ArrayList<>();
     private static final ArrayList<GoblinShoppingCartVoDetail> goblinShoppingCartVoDetailArrayList=new ArrayList<>();
+    private static final ArrayList<GoblinStoreBackOrderListVo> goblinStoreBackOrderListVoArrayList=new ArrayList<>();
 
     private static final BasicDBObject basicDBObject = new BasicDBObject();
 
@@ -58,6 +59,9 @@ public class ObjectUtil {
     public static ArrayList<GoblinShoppingCartVo> goblinShoppingCartVoArrayList() {
         return (ArrayList<GoblinShoppingCartVo>) goblinShoppingCartVoArrayList.clone();
     }
+    public static ArrayList<GoblinStoreBackOrderListVo> goblinStoreBackOrderListVoArrayList() {
+        return (ArrayList<GoblinStoreBackOrderListVo>) goblinStoreBackOrderListVoArrayList.clone();
+    }
     public static ArrayList<GoblinShoppingCartVoDetail> goblinShoppingCartVoDetailArrayList() {
         return (ArrayList<GoblinShoppingCartVoDetail>) goblinShoppingCartVoDetailArrayList.clone();
     }