Commit 4746cdf4 authored by shiyu's avatar shiyu

发布商品2

parent 1dc14392
...@@ -12,7 +12,6 @@ import com.wwdz.ch.db.dao.SwitchDao; ...@@ -12,7 +12,6 @@ import com.wwdz.ch.db.dao.SwitchDao;
import com.wwdz.ch.db.dao.distribution.*; import com.wwdz.ch.db.dao.distribution.*;
import com.wwdz.ch.db.domain.distribution.*; import com.wwdz.ch.db.domain.distribution.*;
import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto; import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
import com.xxdxxs.utils.DateUtils; import com.xxdxxs.utils.DateUtils;
import com.xxdxxs.utils.EntityMapper; import com.xxdxxs.utils.EntityMapper;
import com.xxdxxs.utils.StringUtils; import com.xxdxxs.utils.StringUtils;
...@@ -23,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -23,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -118,6 +116,12 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService { ...@@ -118,6 +116,12 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
if (supplierItem.getBuyLimitNum() == -1) { if (supplierItem.getBuyLimitNum() == -1) {
supplierItemVo.setIsLimitBuy(false); supplierItemVo.setIsLimitBuy(false);
} }
AuctionConfig auctionConfig = auctionConfigDao.findByItemId(supplierItem.getId());
if (auctionConfig.getIsValid()) {
supplierItemVo.setEditAble(false);
} else {
supplierItemVo.setEditAble(true);
}
supplierItemVos.add(supplierItemVo); supplierItemVos.add(supplierItemVo);
//售出数量 //售出数量
Long selledNum = distributionOrderDao.countSelledNum(supplierItem.getId()); Long selledNum = distributionOrderDao.countSelledNum(supplierItem.getId());
......
...@@ -149,5 +149,10 @@ public class SupplierItemVo implements Entity { ...@@ -149,5 +149,10 @@ public class SupplierItemVo implements Entity {
*/ */
private Date realEndTime; private Date realEndTime;
/**
* 是否可编辑
*/
private Boolean editAble;
} }
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