bugfix
This commit is contained in:
4
.idea/workspace.xml
generated
4
.idea/workspace.xml
generated
@ -6,6 +6,8 @@
|
|||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="bdad98b9-7a5e-48f7-b79e-ed6a34d55dab" name="Default Changelist" comment="第一次提交">
|
<list default="true" id="bdad98b9-7a5e-48f7-b79e-ed6a34d55dab" name="Default Changelist" comment="第一次提交">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/dto/GoodsDeDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/dto/GoodsDeDto.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/dto/PackageDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/controller/dto/PackageDto.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/wisdo/mmining/service/impl/OrderServiceImpl.java" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
@ -652,7 +654,7 @@
|
|||||||
<workItem from="1719564748404" duration="2015000" />
|
<workItem from="1719564748404" duration="2015000" />
|
||||||
<workItem from="1719795551124" duration="6472000" />
|
<workItem from="1719795551124" duration="6472000" />
|
||||||
<workItem from="1720079374607" duration="5784000" />
|
<workItem from="1720079374607" duration="5784000" />
|
||||||
<workItem from="1720140599554" duration="3146000" />
|
<workItem from="1720140599554" duration="13407000" />
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00001" summary="第一次提交">
|
<task id="LOCAL-00001" summary="第一次提交">
|
||||||
<created>1623736948713</created>
|
<created>1623736948713</created>
|
||||||
|
@ -4,9 +4,9 @@ import lombok.Data;
|
|||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class GoodsDeDto {
|
public class GoodsDeDto {
|
||||||
private Long id;
|
private Object id;
|
||||||
private String name;
|
private String name;
|
||||||
private Integer num;
|
private Integer num;
|
||||||
private Long specId;
|
private Object specId;
|
||||||
private String spec;
|
private String spec;
|
||||||
}
|
}
|
||||||
|
@ -6,7 +6,7 @@ import java.util.List;
|
|||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class PackageDto {
|
public class PackageDto {
|
||||||
private Long id;
|
private Object id;
|
||||||
private List<GoodsDeDto> goods;
|
private List<GoodsDeDto> goods;
|
||||||
private Integer afterSalesStatus;
|
private Integer afterSalesStatus;
|
||||||
private String logisticsNumber;
|
private String logisticsNumber;
|
||||||
|
@ -148,7 +148,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, WisdOeder> implem
|
|||||||
} else {
|
} else {
|
||||||
queryWrapper.and(wrapper -> wrapper.eq("after_sales_status", 61).or().eq("after_sales_status", 62).or().eq("after_sales_status", 63).or().eq("after_sales_status", 64).or().eq("after_sales_status", 65).or().eq("after_sales_status", 66));
|
queryWrapper.and(wrapper -> wrapper.eq("after_sales_status", 61).or().eq("after_sales_status", 62).or().eq("after_sales_status", 63).or().eq("after_sales_status", 64).or().eq("after_sales_status", 65).or().eq("after_sales_status", 66));
|
||||||
}
|
}
|
||||||
queryWrapper.orderByDesc("create_time");
|
queryWrapper.orderByDesc("order_refund_time");
|
||||||
queryWrapper.orderByAsc("after_sales_status");
|
queryWrapper.orderByAsc("after_sales_status");
|
||||||
Page<WisdOeder> p = new Page<>(page, num);
|
Page<WisdOeder> p = new Page<>(page, num);
|
||||||
IPage<WisdOeder> wisdCompanyIPage = orderMapper.selectPage(p, queryWrapper);
|
IPage<WisdOeder> wisdCompanyIPage = orderMapper.selectPage(p, queryWrapper);
|
||||||
|
Reference in New Issue
Block a user