bug修改，功能优化

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/dto/JdOrderDto.java

@@ -68,4 +68,13 @@ public class JdOrderDto extends JdOrder implements SetCustomizeAreaId {
      * 是否需要出库
      */
     private boolean isOut;
+
+
+    public boolean getIsOut() {
+        return isOut;
+    }
+
+    public void setIsOut(boolean out) {
+        this.isOut = out;
+    }
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdApiServiceImpl.java

@@ -883,7 +883,7 @@ public class JdApiServiceImpl implements JdApiService {
         request.setCreatedDateEnd(endTime);
         request.setPageIndex(pageIndex);
         request.setPageSize(pageSize);
-//        request.setOrderIds("1558596581");
+//        request.setOrderIds("1558586708");
         if(CollectionUtil.isNotEmpty(orderIds)){
             request.setOrderIds(orderIds.stream().map(o->StrUtil.toString(orderIds)).collect(Collectors.joining(",")));
         }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderDetailsServiceImpl.java

@@ -75,6 +75,8 @@ public class JdOrderDetailsServiceImpl extends ServiceImpl<JdOrderDetailsMapper,
                 .and(StrUtil.isNotBlank(dto.getKeyword()),q->q.like(JdOrderDetails::getOrderId, dto.getKeyword())
                     .or().like(JdOrderDetails::getWareId, dto.getKeyword())
                     .or().like(JdOrderDetails::getProductId, dto.getKeyword()))
+                .orderByAsc(JdOrderDetails::getHandleStatus)
+                .orderByDesc(JdOrderDetails::getUpdateTime)
                 .page(new Page<>(dto.getPageNum(), dto.getPageSize()));
 
         List<JdOrderDetails> records = page.getRecords();

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderServiceImpl.java

@@ -182,7 +182,7 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         JdOrder JdOrder = this.getById(id);
         JdOrderVo result = BeanUtil.toBean(JdOrder, JdOrderVo.class);
 
-        List<JdOrderDetails> jdOrderDetailsList = jdOrderDetailsService.list(q -> q.eq(JdOrderDetails::getJdOrderId, id));
+        List<JdOrderDetails> jdOrderDetailsList = jdOrderDetailsService.lambdaQuery().eq(JdOrderDetails::getJdOrderId, id).orderByDesc(JdOrderDetails::getHasEx).orderByDesc(JdOrderDetails::getId).list();
         List<JdOrderDetailsVo> jdOrderDetailsVoList = BeanUtil.copyToList(jdOrderDetailsList, JdOrderDetailsVo.class);
         productInfoService.attributeAssign(jdOrderDetailsVoList, JdOrderDetails::getProductId, (item, product) -> {
             item.setProductCode(product.getCode());
@@ -683,7 +683,7 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
                 .eq(JdOrder::getId, jdOrderDto.getId()).update();
 
         JdOrder jdOrder = getById(jdOrderDto.getId());
-        if (jdOrderDto.isOut()) {
+        if (jdOrderDto.getIsOut()) {
             //插入到库存调整记录
             DynamicDataSourceContextHolder.push(SourceConstant.WMS);
             StockWait stockWait = new StockWait();