记得上下班打卡 | git大法好,push需谨慎

Commit 33c0f916 authored by 胡佳晨's avatar 胡佳晨

修改 退款订单列表

parent 62097021
...@@ -17,11 +17,11 @@ public class GoblinStoreBackOrderListVo implements Cloneable { ...@@ -17,11 +17,11 @@ public class GoblinStoreBackOrderListVo implements Cloneable {
@ApiModelProperty(value = "订单号") @ApiModelProperty(value = "订单号")
private String orderCode; private String orderCode;
@ApiModelProperty(value = "类型[1-退款|2-退货]") @ApiModelProperty(value = "类型[1-退款|2-退货]")
private String type; private Integer type;
@ApiModelProperty(value = "退款/退货状态[0-商铺发起退款|1-退款申请(用户发送退款请求)|2-退款成功(商家同意退款)|3-退款拒绝(商家拒绝退款)|4-退货申请(用户发起退货请求)|5-退货拒绝(商家拒绝退货)|6-退货审核通过等待用户填写物流(商家审核通过,等待用户寄回商品)|7-待收货(用户已确认)|8-退货完成(商家收货并且同意退款给用户)|9-退货失败(商家不同意退款)") @ApiModelProperty(value = "退款/退货状态[0-商铺发起退款|1-退款申请(用户发送退款请求)|2-退款成功(商家同意退款)|3-退款拒绝(商家拒绝退款)|4-退货申请(用户发起退货请求)|5-退货拒绝(商家拒绝退货)|6-退货审核通过等待用户填写物流(商家审核通过,等待用户寄回商品)|7-待收货(用户已确认)|8-退货完成(商家收货并且同意退款给用户)|9-退货失败(商家不同意退款)")
private String status; private Integer status;
@ApiModelProperty(value = " 退款金额") @ApiModelProperty(value = " 退款金额")
private String realBackPrice; private BigDecimal realBackPrice;
@ApiModelProperty(value = " 创建时间") @ApiModelProperty(value = " 创建时间")
private String createdAt; private String createdAt;
@ApiModelProperty(value = "退款sku") @ApiModelProperty(value = "退款sku")
......
...@@ -58,9 +58,9 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer ...@@ -58,9 +58,9 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer
vo.setBackCode(item.getBackCode()); vo.setBackCode(item.getBackCode());
vo.setBackOrderSkuVos(item.getBackOrderSkuVos()); vo.setBackOrderSkuVos(item.getBackOrderSkuVos());
vo.setOrderCode(item.getOrderCode()); vo.setOrderCode(item.getOrderCode());
vo.setRealBackPrice(item.getBackOrderId()); vo.setRealBackPrice(item.getRealBackPrice());
vo.setStatus(item.getBackOrderId()); vo.setStatus(item.getStatus());
vo.setType(item.getBackOrderId()); vo.setType(item.getType());
listVos.add(vo); listVos.add(vo);
} }
PageInfo<GoblinStoreBackOrderListVo> pageInfo = new PageInfo(listVos); PageInfo<GoblinStoreBackOrderListVo> pageInfo = new PageInfo(listVos);
......
...@@ -946,9 +946,6 @@ public class GoblinMongoUtils { ...@@ -946,9 +946,6 @@ public class GoblinMongoUtils {
if (status != null) { if (status != null) {
criteria = criteria.and("status").is(status); criteria = criteria.and("status").is(status);
} }
if (status != null) {
criteria = criteria.and("status").is(status);
}
if (type != null) { if (type != null) {
criteria = criteria.and("type").is(type); criteria = criteria.and("type").is(type);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment