partner后台 退款订单列表增加字段；优化数据落库顺序

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/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-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderAppServiceImpl.java

@@ -517,22 +517,12 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
         vo.setStatus(backOrder.getStatus());
         vo.setAuditAt(backOrder.getAuditAt() == null ? null : nowStr);
         vo.setBackOrderSkuVos(orderSkuVoList);
+        vo.setOperationType(GoblinStatusConst.Type.OPERATION_TYPE_1.getValue());
         //添加日志
         GoblinBackOrderLog backOrderLog = initBackLog(param.getOrderId(), uid, now);
         backOrderLog.setStatus(GoblinStatusConst.Status.ORDER_LOG_STATUS_21.getValue());
         backOrderLog.setOperationType(GoblinStatusConst.Type.OPERATION_TYPE_1.getValue());
         backOrderLog.setMessage("用户发起发起：" + JsonUtils.toJson(param));
-        if (orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_2.getValue()) {
-            String returnString = refundHelper.initRefund(orderVo, backOrder.getRealBackPrice(), backOrder.getBackCode());
-            if (!refundHelper.isRefundSuccess(returnString)) {
-                String message = refundHelper.getRefundMessage(returnString);
-                backOrder.setStatus(GoblinStatusConst.Status.ORDER_BACK_STATUS_10.getValue());
-                backOrder.setErrorReason("失败原因：" + message);
-                vo.setStatus(backOrder.getStatus());
-                vo.setErrorReason(backOrder.getErrorReason());
-                log.error("REFUND DATA = " + returnString);
-            }
-        }
         //redis
         redisUtils.setBackOrderVo(backOrder.getBackOrderId(), vo);
         redisUtils.setGoblinOrder(orderVo.getOrderId(), orderVo);
@@ -556,7 +546,23 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
         });
         queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_USER_ORDER_OPERA.getKey(), SqlMapping.gets(sqls, applyRefund, orderStatus, orderSkuStatus, refundLog, updateCandyUserCouponObjs));
         if (orderVo.getStatus() == GoblinStatusConst.Status.ORDER_STATUS_2.getValue()) {
-            if (backOrder.getStatus() == GoblinStatusConst.Status.ORDER_BACK_STATUS_10.getValue()) {
+            String returnString = refundHelper.initRefund(orderVo, backOrder.getRealBackPrice(), backOrder.getBackCode());
+            if (!refundHelper.isRefundSuccess(returnString)) {
+                String message = refundHelper.getRefundMessage(returnString);
+                backOrder.setStatus(GoblinStatusConst.Status.ORDER_BACK_STATUS_10.getValue());
+                backOrder.setErrorReason("失败原因：" + message);
+                vo.setStatus(backOrder.getStatus());
+                vo.setErrorReason(backOrder.getErrorReason());
+                log.error("REFUND DATA = " + returnString);
+                redisUtils.setBackOrderVo(backOrder.getBackOrderId(), vo);
+                mongoUtils.updateGoblinBackOrderVo(backOrder.getBackOrderId(), vo);
+                queueUtils.sendMsgByRedis(
+                        MQConst.GoblinQueue.GOBLIN_USER_ORDER_OPERA.getKey(),
+                        SqlMapping.get("goblin_order.store.applyRefund",
+                                vo.getStatus(), vo.getReason(), vo.getAuditAt(), now,
+                                backOrder.getBackOrderId(), now, now
+                        )
+                );
                 return ResponseDto.failure("退款失败:" + backOrder.getErrorReason());
             }
             if (DragonConstant.REFUND_TYPE_MICROPAY_ALIPAY.equals(orderVo.getPaymentType())) {

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

@@ -1501,7 +1501,9 @@ public class GoblinMongoUtils {
         Query query = Query.query(criteria);
         query.skip(skipCount).limit(size).with(Sort.by(Sort.Order.desc("createdAt")));
         ;
-        query.fields().include("backCode").include("orderCode").include("backOrderId").include("type").include("status").include("realBackPrice").include("createdAt")
+        query.fields().include("backCode").include("orderCode").include("orderId").include("backOrderId").include("type").include("status")
+                .include("realBackPrice").include("createdAt").include("auditAt").include("refundAt").include("describes").include("reason")
+                .include("operationType")
                 .include("backOrderSkuVos.spuName").include("backOrderSkuVos.skuName").include("backOrderSkuVos.spuPic").include("backOrderSkuVos.skuPic")
                 .include("backOrderSkuVos.skuSpecs").include("backOrderSkuVos.skuId").include("backOrderSkuVos.spuId").include("backOrderSkuVos.orderSkuId")
                 .include("backOrderSkuVos.refundPrice");