|
@@ -38,6 +38,7 @@ import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
|
import java.io.InputStream;
|
|
import java.io.InputStream;
|
|
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.text.ParseException;
|
|
import java.text.ParseException;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
@@ -254,7 +255,7 @@ public class InsideAddressServiceImpl extends ServiceImpl<InsideAddressDao, Insi
|
|
|
|
|
|
|
|
String deliveryFee = dataFormatter.formatCellValue(row.getCell(7));//地址配送费
|
|
String deliveryFee = dataFormatter.formatCellValue(row.getCell(7));//地址配送费
|
|
|
if (ObjectUtils.isNotEmpty(deliveryFee)) {
|
|
if (ObjectUtils.isNotEmpty(deliveryFee)) {
|
|
|
- insideAddress.setDelFlag(deliveryFee);
|
|
|
|
|
|
|
+ insideAddress.setDeliveryFee(new BigDecimal(deliveryFee));
|
|
|
}else {
|
|
}else {
|
|
|
int h = rowNum + 1;
|
|
int h = rowNum + 1;
|
|
|
throw new SqxException("第" + h + "行,地址配送费为空");
|
|
throw new SqxException("第" + h + "行,地址配送费为空");
|