新增是否可售字段3

ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/vo/SysDistributionOrderVo.java

@@ -114,6 +114,8 @@ public class SysDistributionOrderVo implements Entity {
      */
     private String logisticsCode;
 
+    private String logisticsName;
+
     /**
      * 运单号
      */

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysDistributionOrderServiceImpl.java

@@ -5,6 +5,7 @@ import com.wwdz.ch.admin.entity.vo.SysDistributionOrderVo;
 import com.wwdz.ch.admin.service.SysDistributionOrderService;
 import com.wwdz.ch.core.consts.CommConsts;
 import com.wwdz.ch.core.consts.DistributionEnum;
+import com.wwdz.ch.core.consts.LogisticsEnum;
 import com.wwdz.ch.core.type.PageSearchResult;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.core.util.CacheUtil;
@@ -98,6 +99,7 @@ public class SysDistributionOrderServiceImpl implements SysDistributionOrderServ
                 distributionOrderVo.setStateName(DistributionEnum.DistributionOrderStateEnum.getNameByCode(distributionOrder.getState()));
                 distributionOrderVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(distributionOrder.getType()));
                 distributionOrderVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
+                distributionOrderVo.setLogisticsName(LogisticsEnum.getNameByCode(distributionOrder.getLogisticsCode()));
                 distributionOrderVo.setBuyerName(cacheUtil.getAppletUserNameById(distributionOrder.getBuyerId()));
                 distributionOrderVo.setSellerName(distributionOrder.getSellerId() == CommConsts.SYSTEM_ACCOUNT.longValue()? "系统账号" : cacheUtil.getAppletUserNameById(distributionOrder.getSellerId()));
                 //支付截止时间，下单后半小时内

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSupplierItemServiceImpl.java

@@ -295,6 +295,7 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
             SupplierItem supplierItem = new SupplierItem();
             supplierItem.setId(dto.getId());
             supplierItem.setIsOnSale(dto.getIsOnSale());
+            supplierItem.setIsAbleSale(dto.getIsOnSale());
             supplierItemDao.update(supplierItem);
             if (!dto.getIsOnSale() && oldItem.getType().intValue() == DistributionEnum.DistributionTypeEnum.COLLECT.getCode()) {
                 //下架用户商品,短信通知，跳转到藏品详情页