|
|
@ -103,7 +103,9 @@ public class DeviceController {
|
|
|
|
_bucket.put("productCode", bucket.getProductCode());//产品大类
|
|
|
|
_bucket.put("productCode", bucket.getProductCode());//产品大类
|
|
|
|
_bucket.put("productSubCode", bucket.getProductSubCode());//产品子类
|
|
|
|
_bucket.put("productSubCode", bucket.getProductSubCode());//产品子类
|
|
|
|
_bucket.put("isShow", bucket.getIsShow());//是否显示
|
|
|
|
_bucket.put("isShow", bucket.getIsShow());//是否显示
|
|
|
|
|
|
|
|
_bucket.put("status", bucket.getStatus());//
|
|
|
|
_bucket.put("showName", bucket.getShowName());//显示名称
|
|
|
|
_bucket.put("showName", bucket.getShowName());//显示名称
|
|
|
|
|
|
|
|
_bucket.put("bucketImg", bucket.getBucketImg());//桶身图片
|
|
|
|
BigDecimal price = calculatePrice(bucket, config);//综合计算价格
|
|
|
|
BigDecimal price = calculatePrice(bucket, config);//综合计算价格
|
|
|
|
_bucket.put("price", price);//价格
|
|
|
|
_bucket.put("price", price);//价格
|
|
|
|
_bucket.put("currentWeight", bucket.getCurrentWeight());//当前重量
|
|
|
|
_bucket.put("currentWeight", bucket.getCurrentWeight());//当前重量
|
|
|
@ -171,6 +173,7 @@ public class DeviceController {
|
|
|
|
DeviceRespVO.Bucket _bucket = new DeviceRespVO.Bucket();
|
|
|
|
DeviceRespVO.Bucket _bucket = new DeviceRespVO.Bucket();
|
|
|
|
BigDecimal price = calculatePrice(bucket, config);//计算价格
|
|
|
|
BigDecimal price = calculatePrice(bucket, config);//计算价格
|
|
|
|
_bucket.setBucketCode(bucket.getBucketCode());
|
|
|
|
_bucket.setBucketCode(bucket.getBucketCode());
|
|
|
|
|
|
|
|
_bucket.setStatus(bucket.getStatus());
|
|
|
|
_bucket.setDoorNum(bucket.getDoorNum());
|
|
|
|
_bucket.setDoorNum(bucket.getDoorNum());
|
|
|
|
_bucket.setOrdNum(bucket.getShowOrd());
|
|
|
|
_bucket.setOrdNum(bucket.getShowOrd());
|
|
|
|
_bucket.setProductCode(bucket.getProductCode());
|
|
|
|
_bucket.setProductCode(bucket.getProductCode());
|
|
|
|