|
|
@ -30,6 +30,9 @@ import jnpf.util.*;
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.*;
|
|
|
|
import jnpf.base.UserInfo;
|
|
|
|
import jnpf.base.UserInfo;
|
|
|
|
import jnpf.permission.entity.UserEntity;
|
|
|
|
import jnpf.permission.entity.UserEntity;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* nxPrice
|
|
|
|
* nxPrice
|
|
|
@ -50,8 +53,10 @@ public class NxPriceServiceImpl extends ServiceImpl<NxPriceMapper, NxPriceEntity
|
|
|
|
private NxPriceProductService nxPriceProductService;
|
|
|
|
private NxPriceProductService nxPriceProductService;
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private NxPriceRecycleService nxPriceRecycleService;
|
|
|
|
private NxPriceRecycleService nxPriceRecycleService;
|
|
|
|
@Autowired
|
|
|
|
@Resource
|
|
|
|
private NxPriceMapper nxPriceMapper;
|
|
|
|
private NxPriceMapper nxPriceMapper;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public List<NxPriceEntity> getList(NxPricePagination nxPricePagination){
|
|
|
|
public List<NxPriceEntity> getList(NxPricePagination nxPricePagination){
|
|
|
|
return getTypeList(nxPricePagination,nxPricePagination.getDataType());
|
|
|
|
return getTypeList(nxPricePagination,nxPricePagination.getDataType());
|
|
|
@ -496,14 +501,28 @@ public class NxPriceServiceImpl extends ServiceImpl<NxPriceMapper, NxPriceEntity
|
|
|
|
//主表字段验证
|
|
|
|
//主表字段验证
|
|
|
|
//子表字段验证
|
|
|
|
//子表字段验证
|
|
|
|
if (form.getNxPriceProductList()==null||form.getNxPriceProductList().size()==0){
|
|
|
|
if (form.getNxPriceProductList()==null||form.getNxPriceProductList().size()==0){
|
|
|
|
|
|
|
|
|
|
|
|
return "商品名称不能为空";
|
|
|
|
return "商品名称不能为空";
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (form.getNxPriceRecycleList()==null||form.getNxPriceProductList().size()==0){
|
|
|
|
if (form.getNxPriceRecycleList()==null||form.getNxPriceProductList().size()==0){
|
|
|
|
|
|
|
|
|
|
|
|
return "回收站不能为空";
|
|
|
|
return "回收站不能为空";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
NxPriceProductModel nxPriceProductModel =new NxPriceProductModel();
|
|
|
|
|
|
|
|
String recoveryPrice;
|
|
|
|
|
|
|
|
for (NxPriceProductModel model:form.getNxPriceProductList()){
|
|
|
|
|
|
|
|
nxPriceProductModel.setRecoveryPrice(model.getRecoveryPrice());
|
|
|
|
|
|
|
|
recoveryPrice =model.getRecoveryPrice();
|
|
|
|
|
|
|
|
if (recoveryPrice==null){
|
|
|
|
|
|
|
|
return "回收价是必填项";
|
|
|
|
|
|
|
|
}else if (recoveryPrice.equals("0")){
|
|
|
|
|
|
|
|
return "回收价不能等于0";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}catch (Exception e){
|
|
|
|
|
|
|
|
return "回收价不能等于0且要必填";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return countRecover;
|
|
|
|
return countRecover;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|