修改 消费

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

@@ -30,7 +30,7 @@ public class GoblinAppOrderDetailsVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "是否可退款")
     private int canRefund;
     @ApiModelProperty(value = "退款订单数量")
-    private int refundSize;
+    private int refuseSize;
     @ApiModelProperty(value = "退款订单状态[退款／退货状态[-1-无状态|0-商铺发起退款|1-退款申请(用户发送退款请求)|2-退款成功(商家同意退款)|3-退款拒绝(商家拒绝退款)|4-退货申请(用户发起退货请求)|5-退货拒绝(商家拒绝退货)|6-退货审核通过等待用户填写物流(商家审核通过，等待用户寄回商品)|7-待收货(用户已确认)|8-退货完成(商家收货并且同意退款给用户)|9-退货失败(商家不同意退款)]")
     private int refundStatus;
 

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

@@ -75,7 +75,7 @@ public class GoblinBackOrderVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "拒绝时间")
     private String refuseAt;
     @ApiModelProperty(value = "拒绝次数")
-    private Integer refundSize;
+    private Integer refuseSize;
     @ApiModelProperty(value = "审核时间")
     private String auditAt;
     @ApiModelProperty(value = "创建时间")

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

@@ -133,7 +133,7 @@ public class GoblinBackOrder implements Serializable, Cloneable {
 
     private LocalDateTime refuseAt;
 
-    private int refundSize;
+    private int refusedSize;
 
     private LocalDateTime createdAt;
 

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_ln_goblin_initialdata.sql

@@ -980,7 +980,7 @@ alter table goblin_store_order add store_price_coupon decimal (8,2) default 0 co
 alter table goblin_back_order add back_price_express decimal (8,2) default 0 comment '退款快递费';
 alter table goblin_back_order add refund_at datetime default null comment '退款时间';
 alter table goblin_back_order add refuse_at datetime default null comment '拒绝时间';
-alter table goblin_back_order add refund_size int default 0 comment '拒绝次数';
+alter table goblin_back_order add refuse_size int default 0 comment '拒绝次数';
 alter table goblin_back_order add audit_at datetime default null comment '审核时间';
 alter table goblin_back_order add refuse_reason varchar(255) default '' comment '退款原因';
 

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

@@ -133,7 +133,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
         } else {
             vo.setRefundStatus(-1);
         }
-        vo.setRefundSize(orderRefundIds.size());
+        vo.setRefuseSize(orderRefundIds.size());
         vo.setRestTime(getRestTime(orderVo));
         vo.setStoreOrderVo(orderVo);
         vo.setOrderSkuVos(skuVos);

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

@@ -199,7 +199,7 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer
         GoblinBackOrderVo backOrderVo = redisUtils.getBackOrderVo(backOrderId);
         backOrderVo.setStatus(GoblinStatusConst.Status.ORDER_BACK_STATUS_3.getValue());
         backOrderVo.setRefuseAt(nowStr);
-        backOrderVo.setRefundSize(backOrderVo.getRefundSize() + 1);
+        backOrderVo.setRefuseSize(backOrderVo.getRefuseSize() + 1);
         //添加日志
         GoblinBackOrderLog backOrderLog = initBackLog(backOrderId, uid, now);
         backOrderLog.setStatus(GoblinStatusConst.Status.ORDER_LOG_STATUS_22.getValue());
@@ -213,7 +213,7 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer
         queueUtils.sendMsgByRedis(
                 MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
                 SqlMapping.get("goblin_order.store.backOrderStatus",
-                        backOrderVo.getStatus(), backOrderVo.getAuditAt(), backOrderVo.getRefundSize(), now,
+                        backOrderVo.getStatus(), backOrderVo.getAuditAt(), backOrderVo.getRefuseSize(), now,
                         backOrderId, now, now
                 )
         );

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

@@ -523,7 +523,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         }
         GoblinOrderOperationLog log = initLog(orderId, uid, now);
         log.setType(GoblinStatusConst.Status.ORDER_LOG_STATUS_13.getValue());
-        log.setRemark("发货：orderId=[" + orderId + "],orderSkuId=[" + orderSkuIds + "],mailNo=[" + mailNo + "]");
+        log.setRemark("发货：orderId=[" + orderId + "],orderSkuId=[" + StringUtils.join(skuIds,",") + "],mailNo=[" + mailNo + "]");
 
         //redis
         redisUtils.setGoblinOrder(orderId, orderVo);