Merge remote-tracking branch 'refs/remotes/origin/dev-wyf-partner' into test-ecs

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

@@ -455,6 +455,12 @@ public class GoblinRedisConst {
      */
     public static final String SQB_GOBLIN_ORDER_SN_KEY = PREFIX.concat("sqb:orderSn:");
 
+    /**
+     * 订单退款分布式锁
+     * {goblin:refund:lock:${orderId}, 1}
+     */
+    public static final String REFUND_ORDER_LOCK = PREFIX.concat("refund:lock:");
+
     /**
      * 收钱吧 用户订单列表
      */

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

@@ -83,6 +83,8 @@ public class GoblinBackOrderVo implements Serializable, Cloneable {
     private String auditAt;
     @ApiModelProperty(value = "创建时间")
     private String createdAt;
+    @ApiModelProperty(value = "发起方[1-用户|2-商家]")
+    private Integer operationType;
     @ApiModelProperty(value = "过期时间")
     private String expireAt;
 

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

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 店铺退款列表接口返回体：分页数据 + 各审核状态 Tab 数量。
+ */
+@ApiModel("店铺退款列表分页结果")
+@Data
+public class GoblinStoreBackOrderListPageVo {
+
+    /** 当前页列表及分页信息 */
+    @ApiModelProperty("分页数据")
+    private PageInfo<GoblinStoreBackOrderListVo> pageInfo;
+    /** 顶部审核 Tab 角标数量，不受当前 status 筛选影响 */
+    @ApiModelProperty("各审核状态数量")
+    private GoblinStoreBackOrderStatusCountVo statusCount;
+}

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

@@ -20,11 +20,23 @@ public class GoblinStoreBackOrderListVo implements Cloneable {
     private Integer type;
     @ApiModelProperty(value = "退款／退货状态[0-商铺发起退款|1-退款申请(用户发送退款请求)|2-退款成功(商家同意退款)|3-退款拒绝(商家拒绝退款)|4-退货申请(用户发起退货请求)|5-退货拒绝(商家拒绝退货)|6-退货审核通过等待用户填写物流(商家审核通过，等待用户寄回商品)|7-待收货(用户已确认)|8-退货完成(商家收货并且同意退款给用户)|9-退货失败(商家不同意退款)|10-退款失败|11-取消退款")
     private Integer status;
-    @ApiModelProperty(value = " 退款金额")
+    @ApiModelProperty(value = "退款范围[1-整单退款|2-部分退款]")
+    private Integer refundScope;
+    @ApiModelProperty(value = "原订单实付金额")
+    private BigDecimal priceActual;
+    @ApiModelProperty(value = "实际退款金额")
     private BigDecimal realBackPrice;
-    @ApiModelProperty(value = " 创建时间")
+    @ApiModelProperty(value = "发起方[1-用户发起|2-商家发起]")
+    private Integer operationType;
+    @ApiModelProperty(value = "申请时间")
     private String createdAt;
-    @ApiModelProperty(value = "退款sku")
+    @ApiModelProperty(value = "审核时间")
+    private String auditAt;
+    @ApiModelProperty(value = "退款完成时间")
+    private String refundAt;
+    @ApiModelProperty(value = "处理时间（优先退款完成时间，其次审核时间，最后拒绝时间）")
+    private String processedAt;
+    @ApiModelProperty(value = "退款商品明细")
     private List<GoblinBackOrderSkuVo> backOrderSkuVos;
 
 

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

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * 店铺退款列表 - 各 status 数量。
+ * status 含义见 {@link GoblinBackOrderVo#getStatus()}，前端自行组合 Tab。
+ */
+@ApiModel("店铺退款列表-各审核状态数量")
+@Data
+public class GoblinStoreBackOrderStatusCountVo {
+
+    @ApiModelProperty("全部")
+    private long all;
+
+    @ApiModelProperty("商铺发起退款[status=0]")
+    private long storeInitiated;
+
+    @ApiModelProperty("退款申请[status=1]")
+    private long refundApply;
+
+    @ApiModelProperty("退款成功[status=2]")
+    private long refundSuccess;
+
+    @ApiModelProperty("退款拒绝[status=3]")
+    private long refundReject;
+
+    @ApiModelProperty("退货申请[status=4]")
+    private long returnApply;
+
+    @ApiModelProperty("退货拒绝[status=5]")
+    private long returnReject;
+
+    @ApiModelProperty("退货审核通过待填物流[status=6]")
+    private long returnWaitLogistics;
+
+    @ApiModelProperty("待收货[status=7]")
+    private long waitReceive;
+
+    @ApiModelProperty("退货完成[status=8]")
+    private long returnCompleted;
+
+    @ApiModelProperty("退货失败[status=9]")
+    private long returnFailed;
+
+    @ApiModelProperty("退款失败[status=10]")
+    private long refundFailed;
+
+    @ApiModelProperty("取消退款[status=11]")
+    private long refundCancelled;
+
+    /**
+     * 从 Mongo 按 status 分组统计结果组装 VO。
+     */
+    public static GoblinStoreBackOrderStatusCountVo of(long all, Map<Integer, Long> grouped) {
+        GoblinStoreBackOrderStatusCountVo vo = new GoblinStoreBackOrderStatusCountVo();
+        vo.all = all;
+        vo.storeInitiated = grouped.getOrDefault(0, 0L);
+        vo.refundApply = grouped.getOrDefault(1, 0L);
+        vo.refundSuccess = grouped.getOrDefault(2, 0L);
+        vo.refundReject = grouped.getOrDefault(3, 0L);
+        vo.returnApply = grouped.getOrDefault(4, 0L);
+        vo.returnReject = grouped.getOrDefault(5, 0L);
+        vo.returnWaitLogistics = grouped.getOrDefault(6, 0L);
+        vo.waitReceive = grouped.getOrDefault(7, 0L);
+        vo.returnCompleted = grouped.getOrDefault(8, 0L);
+        vo.returnFailed = grouped.getOrDefault(9, 0L);
+        vo.refundFailed = grouped.getOrDefault(10, 0L);
+        vo.refundCancelled = grouped.getOrDefault(11, 0L);
+        return vo;
+    }
+}

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

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 店铺订单列表接口返回体：分页数据 + 各状态 Tab 数量。
+ */
+@ApiModel("店铺订单列表分页结果")
+@Data
+public class GoblinStoreOrderListPageVo {
+
+    /** 当前页列表及分页信息 */
+    @ApiModelProperty("分页数据")
+    private PageInfo<GoblinStoreOrderListVo> pageInfo;
+    /** 顶部状态 Tab 角标数量，不受当前 status 筛选影响 */
+    @ApiModelProperty("各状态数量")
+    private GoblinStoreOrderStatusCountVo statusCount;
+}

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

@@ -64,6 +64,15 @@ public class GoblinStoreOrderListVo implements Cloneable {
     @ApiModelProperty(value = " sku相关")
     private List<GoblinStoreOrderListSkuVo> storeOrderListSkuVoList;
 
+    @ApiModelProperty(value = " 下单账号-UID")
+    private String userId;
+
+    @ApiModelProperty(value = " 下单账号-昵称")
+    private String userName;
+
+    @ApiModelProperty(value = " 下单账号-手机号")
+    private String userMobile;
+
 
     private static final GoblinStoreOrderListVo obj = new GoblinStoreOrderListVo();
 

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

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * 店铺订单列表 - 各状态 Tab 数量。
+ * 对应前端 statusTabs：全部 / 待支付(0) / 待发货(2) / 已发货(3) / 已完成(4) / 已退款(6)
+ */
+@ApiModel("店铺订单列表-各状态数量")
+@Data
+public class GoblinStoreOrderStatusCountVo {
+
+    /** 全部（含其他 status，如取消单等） */
+    @ApiModelProperty("全部")
+    private long all;
+    /** 待支付 status=0 */
+    @ApiModelProperty("待支付[status=0]")
+    private long pendingPay;
+    /** 待发货 status=2 */
+    @ApiModelProperty("待发货[status=2]")
+    private long pendingShip;
+    /** 已发货 status=3 */
+    @ApiModelProperty("已发货[status=3]")
+    private long shipped;
+    /** 已完成 status=4 */
+    @ApiModelProperty("已完成[status=4]")
+    private long completed;
+    /** 已退款 status=6 */
+    @ApiModelProperty("已退款[status=6]")
+    private long refunded;
+
+    /**
+     * 从 Mongo 按 status 分组统计结果组装 VO。
+     * 新增 Tab 时在此补充 getOrDefault 即可。
+     */
+    public static GoblinStoreOrderStatusCountVo of(long all, Map<Integer, Long> grouped) {
+        GoblinStoreOrderStatusCountVo vo = new GoblinStoreOrderStatusCountVo();
+        vo.all = all;
+        vo.pendingPay = grouped.getOrDefault(0, 0L);
+        vo.pendingShip = grouped.getOrDefault(2, 0L);
+        vo.shipped = grouped.getOrDefault(3, 0L);
+        vo.completed = grouped.getOrDefault(4, 0L);
+        vo.refunded = grouped.getOrDefault(6, 0L);
+        return vo;
+    }
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinStoreOrderRefundParam.java

+package com.liquidnet.service.goblin.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class GoblinStoreOrderRefundParam {
+    @ApiModelProperty(value = "订单id")
+    @NotNull(message = "订单id不能为空")
+    private String orderId;
+
+    @ApiModelProperty(value = "退款orderSkuId列表[发货后可选；不传为整单退款；发货前强制整单退款]")
+    private List<String> orderSkuIds;
+
+    @ApiModelProperty(value = "退款原因")
+    private String reason;
+
+    @ApiModelProperty(value = "详细描述")
+    private String describes;
+}

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.GoblinBackOrderDetailsVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinBackOrderVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinStoreBackOrderListPageVo;
 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.param.GoblinStoreOrderRefundParam;
 
 import java.math.BigDecimal;
 
 public interface IGoblinStoreBackOrderService {
-    ResponseDto<PageInfo<GoblinStoreBackOrderListVo>> orderBackList(Integer page,
+    ResponseDto<GoblinStoreBackOrderListPageVo> orderBackList(Integer page,
                                                                     String orderBackCode,
                                                                     Integer type,
                                                                     String cst,
                                                                     String cet,
                                                                     String orderCode,
                                                                     String spuName,
-                                                                    Integer status);
+                                                                    String status);
 
     ResponseDto<GoblinBackOrderDetailsVo> orderDetails(String backOrderId);
 
@@ -28,5 +26,7 @@ public interface IGoblinStoreBackOrderService {
 
     ResponseDto<Boolean> refusedRefund(String backOrderId);
 
+    ResponseDto<Boolean> refundOrder(GoblinStoreOrderRefundParam param);
+
     ResponseDto<Boolean> changeSkuRefund(String backOrderId, BigDecimal refundPrice, String orderSkuId);
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/manage/IGoblinStoreOrderService.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.GoblinOrderLogVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinStoreOrderListPageVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinStoreOrderListVo;
-import com.liquidnet.service.goblin.param.RefundCallbackParam;
-import org.springframework.web.bind.annotation.RequestParam;
 
-import javax.validation.Valid;
+import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 
 public interface IGoblinStoreOrderService {
-    ResponseDto<PageInfo<GoblinStoreOrderListVo>> orderList(Integer page,
+    ResponseDto<GoblinStoreOrderListPageVo> orderList(Integer page,
                                                             String orderCode,
                                                             Integer type,
                                                             String cst,
@@ -20,6 +17,14 @@ public interface IGoblinStoreOrderService {
                                                             String phone,
                                                             Integer status);
 
+    void exportOrderList(HttpServletResponse response,
+                         String orderCode,
+                         String cst,
+                         String cet,
+                         String expressContacts,
+                         String phone,
+                         Integer status);
+
     ResponseDto<GoblinStoreOrderListVo> orderDetails(String orderId);
 
     ResponseDto<Boolean> orderCancel(String orderId);
@@ -32,8 +37,8 @@ public interface IGoblinStoreOrderService {
 
     ResponseDto<Boolean> refundOrderSku(String orderId, String orderSkuId, BigDecimal price);
 
-    ResponseDto<Boolean> express(String orderId, String orderSkuIds,String mailNo,String uid,String orderCode);
+    ResponseDto<Boolean> express(String orderId, String orderSkuIds, String mailNo, String uid, String orderCode);
 
-    ResponseDto<Boolean> changeExpressMailNo(String orderId, String mailId,String mailNo);
+    ResponseDto<Boolean> changeExpressMailNo(String orderId, String mailId, String mailNo);
 
 }

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.github.xiaoymin.knife4j.annotations.ApiSupport;import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.vo.GoblinBackOrderDetailsVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinBackOrderVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinStoreBackOrderListPageVo;
 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.param.GoblinStoreOrderRefundParam;
 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;
@@ -41,17 +37,17 @@ public class GoblinStoreBackOrderController {
             @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-退货中]"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "status", value = "审核状态，多个用英文逗号分隔。0-商铺发起退款|1-退款申请|2-退款成功|3-退款拒绝|4-退货申请|5-退货拒绝|6-待填物流|7-待收货|8-退货完成|9-退货失败|10-退款失败|11-取消退款"),
     })
     @GetMapping(value = "list")
-    public ResponseDto<PageInfo<GoblinStoreBackOrderListVo>> orderBackList(@RequestParam(value = "page", required = true) @Valid Integer page,
+    public ResponseDto<GoblinStoreBackOrderListPageVo> 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) {
+                                                                           @RequestParam(value = "status", required = false) String status) {
 
         return goblinStoreBackOrderService.orderBackList(page, orderBackCode, type, cst, cet, orderCode, spuName, status);
     }
@@ -83,6 +79,12 @@ public class GoblinStoreBackOrderController {
         return goblinStoreBackOrderService.refusedRefund(backOrderId);
     }
 
+    @ApiOperation(value = "发起退款")
+    @PostMapping(value = "refund")
+    public ResponseDto<Boolean> refundOrder(@RequestBody @Valid GoblinStoreOrderRefundParam param) {
+        return goblinStoreBackOrderService.refundOrder(param);
+    }
+
     @ApiOperation(value = "修改金额")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "backOrderId", value = "订单id"),

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

 package com.liquidnet.service.goblin.controller.manage;
 
-import com.github.pagehelper.PageInfo;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.goblin.dto.vo.GoblinMailVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinStoreOrderListPageVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinStoreOrderListVo;
-import com.liquidnet.service.goblin.param.RefundCallbackParam;
-import com.liquidnet.service.goblin.service.IGoblinOrderService;
 import com.liquidnet.service.goblin.service.manage.IGoblinStoreOrderService;
-import io.swagger.annotations.*;
+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 org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.math.BigDecimal;
-import java.util.List;
 
 @ApiSupport(order = 149101)
 @Api(tags = "店铺-订单")
@@ -40,10 +43,10 @@ public class GoblinStoreOrderController {
             @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "cet", value = "下单终止时间"),
             @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "expressContacts", value = "收货人姓名"),
             @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "phone", value = "手机号"),
-            @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "status", value = "订单状态[0-代付款|2-待发货|3-已发货|4-已完成]"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "status", value = "订单状态[0-待支付|2-待发货|3-已发货|4-已完成|6-已退款]"),
     })
     @GetMapping(value = "list")
-    public ResponseDto<PageInfo<GoblinStoreOrderListVo>> orderList(@RequestParam(value = "page", required = true) @Valid Integer page,
+    public ResponseDto<GoblinStoreOrderListPageVo> orderList(@RequestParam(value = "page", required = true) @Valid Integer page,
                                                                    @RequestParam(value = "orderCode", required = false) String orderCode,
                                                                    @RequestParam(value = "type", required = false) Integer type,
                                                                    @RequestParam(value = "cst", required = false) String cst,
@@ -55,6 +58,26 @@ public class GoblinStoreOrderController {
         return goblinStoreOrderService.orderList(page, orderCode, type, cst, cet, expressContacts, phone, status);
     }
 
+    @ApiOperation(value = "订单列表导出")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "orderCode", value = "订单编号"),
+            @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 = "expressContacts", value = "收货人姓名"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "phone", value = "手机号"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "status", value = "订单状态[0-代付款|2-待发货|3-已发货|4-已完成]"),
+    })
+    @GetMapping(value = "list/export")
+    public void exportOrderList(HttpServletResponse response,
+                                @RequestParam(value = "orderCode", required = false) String orderCode,
+                                @RequestParam(value = "cst", required = false) String cst,
+                                @RequestParam(value = "cet", required = false) String cet,
+                                @RequestParam(value = "expressContacts", required = false) String expressContacts,
+                                @RequestParam(value = "phone", required = false) String phone,
+                                @RequestParam(value = "status", required = false) Integer status) {
+        goblinStoreOrderService.exportOrderList(response, orderCode, cst, cet, expressContacts, phone, status);
+    }
+
     @ApiOperation(value = "订单详情")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderId", value = "订单id"),
@@ -112,7 +135,7 @@ public class GoblinStoreOrderController {
         return goblinStoreOrderService.changeAddress(orderId, expressContacts, expressPhone, expressAddressDetail);
     }
 
-    @ApiOperation(value = "退款(sku/整单)")
+    @ApiOperation(value = "退款(sku/整单)-废弃")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderId", value = "订单id"),
             @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "orderSkuId", value = "orderSkuId[整单退不传]"),
@@ -135,7 +158,7 @@ public class GoblinStoreOrderController {
     public ResponseDto<Boolean> express(@RequestParam(value = "orderId", required = true) @Valid String orderId,
                                         @RequestParam(value = "orderSkuIds", required = false) @Valid String orderSkuIds,
                                         @RequestParam(value = "mailNo", required = true) @Valid String mailNo) {
-        return goblinStoreOrderService.express(orderId, orderSkuIds, mailNo, CurrentUtil.getCurrentUid(),"");
+        return goblinStoreOrderService.express(orderId, orderSkuIds, mailNo, CurrentUtil.getCurrentUid(), "");
     }
 
     @ApiOperation(value = "修改快递单号")

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

+package com.liquidnet.service.goblin.service.impl.helper;
+
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.HttpUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.goblin.dto.vo.GoblinBackOrderSkuVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinOrderSkuVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinStoreOrderVo;
+import com.liquidnet.service.goblin.util.GoblinRedisUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.MultiValueMap;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+
+@Component
+@Slf4j
+public class GoblinRefundHelper {
+    @Autowired
+    private GoblinRedisUtils redisUtils;
+
+    @Value("${liquidnet.service.order.url-pay.goblinRefundUrl}")
+    private String synUrl;
+    @Value("${liquidnet.service.dragon.urls.refundApply}")
+    private String refundApply;
+    @Value("${liquidnet.service.order.url-pay.goblinRefundUrl}")
+    private String goblinRefundUrl;
+    @Value("${liquidnet.service.dragon.urls.refundResult}")
+    private String refundApplyCallBack;
+
+    public static BigDecimal remainRefundPrice(GoblinOrderSkuVo orderSkuVo, BigDecimal applyingRefundPrice) {
+        BigDecimal priceActual = nullToZero(orderSkuVo.getSkuPriceActual());
+        BigDecimal priceRefund = nullToZero(orderSkuVo.getPriceRefund());
+        BigDecimal applying = nullToZero(applyingRefundPrice);
+        BigDecimal remain = priceActual.subtract(priceRefund).subtract(applying);
+        return remain.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : remain;
+    }
+
+    public static BigDecimal beforeShipRefundPrice(BigDecimal skuRefundPrice, BigDecimal priceExpress) {
+        return nullToZero(skuRefundPrice).add(nullToZero(priceExpress));
+    }
+
+    public static GoblinBackOrderSkuVo buildBackOrderSkuVo(GoblinOrderSkuVo orderSkuVo, BigDecimal refundPrice, String nowStr) {
+        GoblinBackOrderSkuVo backOrderSkuVo = GoblinBackOrderSkuVo.getNew();
+        backOrderSkuVo.setOrderSkuId(orderSkuVo.getOrderSkuId());
+        backOrderSkuVo.setSpuId(orderSkuVo.getSpuId());
+        backOrderSkuVo.setSpuName(orderSkuVo.getSpuName());
+        backOrderSkuVo.setSkuId(orderSkuVo.getSkuId());
+        backOrderSkuVo.setSkuName(orderSkuVo.getSkuName());
+        backOrderSkuVo.setRefundPrice(refundPrice);
+        backOrderSkuVo.setSkuSpecs(orderSkuVo.getSkuSpecs());
+        backOrderSkuVo.setCreatedAt(nowStr);
+        backOrderSkuVo.setSkuPic(orderSkuVo.getSkuImage());
+        backOrderSkuVo.setSkuType(orderSkuVo.getSkuType());
+        return backOrderSkuVo;
+    }
+
+    public static boolean isBackOrderFinished(Integer status) {
+        return status != null && (status == 2 || status == 3 || status == 5 || status == 8 || status == 9 || status == 10 || status == 11);
+    }
+
+    public static boolean isUnshippedSku(GoblinOrderSkuVo orderSkuVo) {
+        return orderSkuVo != null && orderSkuVo.getStatus() == 2;
+    }
+
+    public static boolean isShippedSku(GoblinOrderSkuVo orderSkuVo) {
+        if (orderSkuVo == null) {
+            return false;
+        }
+        return orderSkuVo.getStatus() == 3 || orderSkuVo.getStatus() == 4;
+    }
+
+    public String initRefund(GoblinStoreOrderVo orderVo, BigDecimal price, String refundCode) {
+        MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
+        params.add("code", orderVo.getPayCode());
+        params.add("notifyUrl", synUrl);
+        params.add("orderCode", orderVo.getMasterOrderCode());
+        params.add("orderRefundCode", refundCode);
+        params.add("paymentId", orderVo.getPaymentId());
+        params.add("paymentType", orderVo.getPaymentType());
+        params.add("price", String.valueOf(price));
+        params.add("priceTotal", String.valueOf(getMasterOrderActualPrice(orderVo)));
+        params.add("reason", "按需退款");
+        MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
+        headers.add("Accept", "application/json;charset=UTF-8");
+        String returnString = HttpUtil.post(refundApply, params, headers);
+        log.debug("REFUND DATA = " + returnString);
+        return returnString;
+    }
+
+    public String alipayCallBack(GoblinStoreOrderVo orderVo, String refundCode) {
+        MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
+        params.add("callBackUrl", goblinRefundUrl);
+        params.add("orderCode", orderVo.getMasterOrderCode());
+        params.add("orderRefundCode", refundCode);
+        params.add("paymentId", orderVo.getPaymentId());
+        MultiValueMap<String, String> headers = CollectionUtil.linkedMultiValueMapStringString();
+        headers.add("Accept", "application/json;charset=UTF-8");
+        log.debug("REFUND CALLBACK params = " + params);
+        String returnString = HttpUtil.post(refundApplyCallBack, params, headers);
+        log.debug("REFUND CALLBACK DATA = " + returnString);
+        return returnString;
+    }
+
+    public boolean isRefundSuccess(String returnString) {
+        HashMap hashMapResult = JsonUtils.fromJson(returnString, HashMap.class);
+        Boolean success = (Boolean) hashMapResult.get("success");
+        return Boolean.TRUE.equals(success);
+    }
+
+    public String getRefundMessage(String returnString) {
+        HashMap hashMapResult = JsonUtils.fromJson(returnString, HashMap.class);
+        String message = (String) hashMapResult.get("message");
+        return message == null ? "" : message;
+    }
+
+    private BigDecimal getMasterOrderActualPrice(GoblinStoreOrderVo orderVo) {
+        BigDecimal totalPrice = BigDecimal.ZERO;
+        String[] orderIds = redisUtils.getMasterCode(orderVo.getMasterOrderCode());
+        if (orderIds == null || orderIds.length == 0) {
+            return nullToZero(orderVo.getPriceActual());
+        }
+        for (String orderId : orderIds) {
+            GoblinStoreOrderVo vo = redisUtils.getGoblinOrder(orderId);
+            if (vo != null) {
+                totalPrice = totalPrice.add(nullToZero(vo.getPriceActual()));
+            }
+        }
+        return totalPrice.compareTo(BigDecimal.ZERO) > 0 ? totalPrice : nullToZero(orderVo.getPriceActual());
+    }
+
+    private static BigDecimal nullToZero(BigDecimal value) {
+        return value == null ? BigDecimal.ZERO : value;
+    }
+}

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/sqlmap.properties

@@ -129,6 +129,7 @@ goblin_order.store.log=INSERT INTO goblin_order_operation_log (`order_log_id`,`o
 goblin_order.store.refundLog=INSERT INTO goblin_back_order_log (`back_order_log_id`,`back_order_id`,`operation_type`,`message`,`operation_name`,`status`,`created_at`) VALUES(?,?,?,?,?,?,?)
 goblin_order.store.orderExpressPrice=UPDATE goblin_store_order SET price_total =? , price_modify = ? ,price_voucher = ? , price_actual = ? ,price_express = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.backOrder=INSERT INTO goblin_back_order (`back_order_id`,`back_code`,`order_id`,`order_code`,`store_id`,`user_id`,`sku_id_nums`,`type`,`reason`,`describes`,`real_back_price`,`status`,`created_at`,`audit_at`,`error_reason`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+goblin_order.store.backOrderWithExpress=INSERT INTO goblin_back_order (`back_order_id`,`back_code`,`order_id`,`order_code`,`store_id`,`user_id`,`sku_id_nums`,`type`,`reason`,`describes`,`real_back_price`,`back_price_express`,`status`,`pics`,`created_at`,`audit_at`,`error_reason`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 goblin_order.store.changeExpress=UPDATE goblin_back_order SET real_back_price = ? ,back_price_express = ? updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.changeSku=UPDATE goblin_back_order SET real_back_price = ? , updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.backOrderStatus=UPDATE goblin_back_order SET status = ? , refuse_at=?,refuse_size=?,updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
@@ -137,6 +138,7 @@ goblin_order.store.orderStatus.time=UPDATE goblin_store_order SET status = ? ,zh
 goblin_order.store.applyRefund=UPDATE goblin_back_order SET status = ? ,reason=?,audit_at=?, updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 #----                   \u7528\u6237\u8BA2\u5355\u64CD\u4F5C
 goblin_order.user.applyRefund=INSERT INTO goblin_back_order (`back_order_id`,`back_code`,`order_id`,`order_code`,`store_id`,`user_id`,`sku_id_nums`,`type`,`reason`,`describes`,`real_back_price`,`back_price_express`,`status`,`logis_company_name`,`mail_no`,`pics`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+goblin_order.user.applyRefundAuto=INSERT INTO goblin_back_order (`back_order_id`,`back_code`,`order_id`,`order_code`,`store_id`,`user_id`,`sku_id_nums`,`type`,`reason`,`describes`,`real_back_price`,`back_price_express`,`status`,`logis_company_name`,`mail_no`,`pics`,`created_at`,`audit_at`,`error_reason`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 goblin_order.user.againRefund=UPDATE goblin_back_order SET status = ? ,  describes = ? ,  pics = ? ,  reason = ? ,  type = ?, updated_at=? where back_order_id=?
 #----  \u8D2D\u7269\u8F66\u64CD\u4F5C
 goblin_shop.cart.delete=UPDATE goblin_shopping_cart set del_tag=? where  user_id=? and sku_id=?

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/test/java/com/liquidnet/service/goblin/test/GoblinRefundHelperTest.java

+package com.liquidnet.service.goblin.test;
+
+import com.liquidnet.service.goblin.dto.vo.GoblinOrderSkuVo;
+import com.liquidnet.service.goblin.service.impl.helper.GoblinRefundHelper;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.math.BigDecimal;
+
+public class GoblinRefundHelperTest {
+
+    @Test
+    public void remainRefundPriceSubtractsRefundedAndApplyingAmount() {
+        GoblinOrderSkuVo skuVo = new GoblinOrderSkuVo();
+        skuVo.setSkuPriceActual(new BigDecimal("100.00"));
+        skuVo.setPriceRefund(new BigDecimal("30.00"));
+
+        BigDecimal remain = GoblinRefundHelper.remainRefundPrice(skuVo, new BigDecimal("20.00"));
+
+        Assert.assertEquals(0, new BigDecimal("50.00").compareTo(remain));
+    }
+
+    @Test
+    public void remainRefundPriceNeverReturnsNegativeAmount() {
+        GoblinOrderSkuVo skuVo = new GoblinOrderSkuVo();
+        skuVo.setSkuPriceActual(new BigDecimal("10.00"));
+        skuVo.setPriceRefund(new BigDecimal("8.00"));
+
+        BigDecimal remain = GoblinRefundHelper.remainRefundPrice(skuVo, new BigDecimal("5.00"));
+
+        Assert.assertEquals(0, BigDecimal.ZERO.compareTo(remain));
+    }
+
+    @Test
+    public void beforeShipRefundIncludesExpressFee() {
+        BigDecimal refundPrice = GoblinRefundHelper.beforeShipRefundPrice(new BigDecimal("80.00"), new BigDecimal("12.00"));
+
+        Assert.assertEquals(0, new BigDecimal("92.00").compareTo(refundPrice));
+    }
+}

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

@@ -1253,22 +1253,6 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             List<GoblinBackOrderSkuVo> backOrderSkuVos = backOrderVo.getBackOrderSkuVos();
             GoblinStoreOrderVo orderVo = redisUtils.getGoblinOrder(orderId);
             orderVo.setPriceRefund(orderVo.getPriceRefund() == null ? BigDecimal.ZERO : orderVo.getPriceRefund().add(refundCallbackParam.getRefundPrice()));
-            if (orderVo.getPriceRefund().compareTo(orderVo.getPriceActual()) >= 0) {
-                //整单退款 退券
-                orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_6.getValue());
-                if (!(orderVo.getUcouponId() == null || orderVo.getUcouponId().equals(""))) {
-                    orderUtils.backCoupon(orderVo.getUcouponId(), orderVo.getUserId());
-                }
-
-                if (!(orderVo.getStoreCouponId() == null || orderVo.getStoreCouponId().equals(""))) {
-                    List<BackCouponParam> params = ObjectUtil.getBackCouponParam();
-                    BackCouponParam backCouponParam = BackCouponParam.getNew();
-                    backCouponParam.setuCouponIds(orderVo.getStoreCouponId());
-                    backCouponParam.setUid(orderVo.getUserId());
-                    params.add(backCouponParam);
-                    orderUtils.backStoreCoupon(params);
-                }
-            }
             backOrderVo.setStatus(GoblinStatusConst.Status.ORDER_BACK_STATUS_2.getValue());
             backOrderVo.setRefundAt(nowStr);
             for (GoblinBackOrderSkuVo backOrderSkuVo : backOrderSkuVos) {
@@ -1322,6 +1306,20 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 logVo.setCreatedAt(now);
                 mongoUtils.insertGoblinOrderLogVo(logVo);
             }
+            if (isOrderFullyRefunded(orderVo)) {
+                orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_6.getValue());
+                if (!(orderVo.getUcouponId() == null || orderVo.getUcouponId().equals(""))) {
+                    orderUtils.backCoupon(orderVo.getUcouponId(), orderVo.getUserId());
+                }
+                if (!(orderVo.getStoreCouponId() == null || orderVo.getStoreCouponId().equals(""))) {
+                    List<BackCouponParam> params = ObjectUtil.getBackCouponParam();
+                    BackCouponParam backCouponParam = BackCouponParam.getNew();
+                    backCouponParam.setuCouponIds(orderVo.getStoreCouponId());
+                    backCouponParam.setUid(orderVo.getUserId());
+                    params.add(backCouponParam);
+                    orderUtils.backStoreCoupon(params);
+                }
+            }
             //redis
             redisUtils.setGoblinOrder(orderId, orderVo);
             redisUtils.setBackOrderVo(backOrderVo.getBackOrderId(), backOrderVo);
@@ -1479,4 +1477,26 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
         return "";
     }
 
+    /**
+     * 主单是否已全部退完：以所有子单实退金额为准，不再要求累计退款金额达到主单实付（含运费）。
+     * 已发货后部分退不含运费时，商品全部退完也应进入退款通过；待发货整单退含运费时，子单同样会全部退完。
+     */
+    private boolean isOrderFullyRefunded(GoblinStoreOrderVo orderVo) {
+        if (orderVo == null || orderVo.getOrderSkuVoIds() == null || orderVo.getOrderSkuVoIds().isEmpty()) {
+            return false;
+        }
+        for (String orderSkuId : orderVo.getOrderSkuVoIds()) {
+            GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(orderSkuId);
+            if (orderSkuVo == null) {
+                return false;
+            }
+            BigDecimal priceRefund = orderSkuVo.getPriceRefund() == null ? BigDecimal.ZERO : orderSkuVo.getPriceRefund();
+            BigDecimal skuPriceActual = orderSkuVo.getSkuPriceActual() == null ? BigDecimal.ZERO : orderSkuVo.getSkuPriceActual();
+            if (priceRefund.compareTo(skuPriceActual) < 0) {
+                return false;
+            }
+        }
+        return true;
+    }
+
 }