|
|
@@ -559,34 +559,6 @@ public class ExcelUtil {
|
|
|
}
|
|
|
order.setOrderRemark(orderRemark);
|
|
|
|
|
|
- String colorDiscount = "0";
|
|
|
- if (selfOperated == 1) {
|
|
|
- colorDiscount = getValue(temp.getCell(discountColumnIndex)).trim();
|
|
|
- if (colorDiscount != null && !"".equals(colorDiscount)) {
|
|
|
- colorDiscount = colorDiscount.replaceAll("\\r|\\r|\\n", "");
|
|
|
- }
|
|
|
- if (colorDiscount == null || "".equals(colorDiscount)) {
|
|
|
- order.setReturnStatus("error");
|
|
|
- order.setReturnMsg("价格不正确");
|
|
|
- // 读取购买数量
|
|
|
- order.setOrderProductDiscount(0);
|
|
|
- order.setOrderProductPrice(0);
|
|
|
- } else {
|
|
|
- // 读取购买数量
|
|
|
- Double colorDiscountDou = Double.valueOf(colorDiscount);
|
|
|
- colorDiscountDou = colorDiscountDou * 100 / orderNumByInt;
|
|
|
- order.setOrderProductDiscount(colorDiscountDou.intValue());
|
|
|
- order.setOrderProductPrice(colorDiscountDou.intValue());
|
|
|
- Double orderTotal = Double.valueOf(colorDiscount);
|
|
|
- orderTotal = orderTotal * 100;
|
|
|
- order.setOrderTotal(orderTotal.intValue());
|
|
|
- }
|
|
|
- } else {
|
|
|
- order.setOrderProductDiscount(0);
|
|
|
- order.setOrderProductPrice(0);
|
|
|
- order.setOrderTotal(0);
|
|
|
- }
|
|
|
-
|
|
|
try {
|
|
|
if (infoColumnIndex.length == 1) {
|
|
|
// 如果infoColumnIndex = 1, 则表示需要截取（可能是-、“ ”）
|
