删除通过存储过程返回值的代码

src/main/java/com/uas/platform/b2c/fa/settlement/model/BillSubmit.java

@@ -156,6 +156,12 @@ public class BillSubmit implements Serializable {
     @Column(name = "bs_purchaseids")
     private String purchaseids;
 
+    /**
+     *
+     */
+    @Column(name = "bs_currency")
+    private String currency;
+
     public Long getId() {
         return id;
     }
@@ -357,4 +363,13 @@ public class BillSubmit implements Serializable {
         if (SystemSession.getUser().getEnterprise() != null)
             this.setSubmitEnuu(SystemSession.getUser().getEnterprise().getUu());
     }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public BillSubmit setCurrency(String currency) {
+        this.currency = currency;
+        return this;
+    }
 }

src/main/java/com/uas/platform/b2c/fa/settlement/service/impl/BillSubmitServiceImpl.java

@@ -135,9 +135,8 @@ public class BillSubmitServiceImpl implements BillSubmitService {
         String purchaseIds = "";
         Double price = 0d;
         for (int i = 0; i < orders.size(); i++) {
-            if (buyerEnuu != null) {
                 Order order = orders.get(i);
-                if (buyerEnuu.equals(order.getBuyerenuu()) && buyeruu.equals(order.getBuyeruu())) {
+                if ((buyerEnuu == null && order.getBuyerenuu() == null)|| (buyerEnuu != null && buyerEnuu.equals(order.getBuyerenuu())) && buyeruu.equals(order.getBuyeruu())) {
                     order.setInvoicetype(bill.getKind());
                     order.setInvoiceAddress(FastjsonUtils.toJson(bill));
                     order.setInvoiceid(bill.getId());
@@ -166,10 +165,8 @@ public class BillSubmitServiceImpl implements BillSubmitService {
                 } else {
                     throw new IllegalOperatorException("订单号： " + order.getOrderid() + " ,不属于您的订单，请重新确认订单号");
                 }
-            } else {
-
-            }
         }
+        billSubmit.setCurrency(orders.get(0).getCurrency());
         billSubmit.setSellername(orders.get(0).getSellername());
         billSubmit.setSellerenuu(orders.get(0).getSellerenuu());
         billSubmit.setStoreid(orders.get(0).getStoreid());
@@ -228,6 +225,7 @@ public class BillSubmitServiceImpl implements BillSubmitService {
                 purchaseIds += ("," + purchase.getPurchaseid());
                 NumberUtil.add(purchase.getPrice(), price);
             }
+            billSubmit.setCurrency(purchases.get(0).getCurrency());
             billSubmit.setSubmituu(sysConf.getAdminUU());
             billSubmit.setSubmitEnuu(sysConf.getEnUU());
             billSubmit.setSellername(purchases.get(0).getSellername());
@@ -256,7 +254,7 @@ public class BillSubmitServiceImpl implements BillSubmitService {
         billSubmit.setSubmituu(order.getBuyeruu());
         if (order.getBuyerenuu() != null)
             billSubmit.setSubmitEnuu(order.getBuyerenuu());
-
+        billSubmit.setCurrency(order.getCurrency());
         billSubmit.setSellername(order.getSellername());
         billSubmit.setSellerenuu(order.getSellerenuu());
         billSubmit.setStoreid(order.getStoreid());

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ReleaseProductByBatchServiceImpl.java

@@ -1,7 +1,5 @@
 package com.uas.platform.b2c.prod.commodity.service.impl;
 
-import static com.uas.platform.b2c.core.utils.NumberUtil.fractionNumCeil;
-
 import com.alibaba.fastjson.JSON;
 import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.service.EnterpriseService;
@@ -14,28 +12,9 @@ import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.core.utils.NumberUtil;
 import com.uas.platform.b2c.core.utils.RegexConstant;
 import com.uas.platform.b2c.core.utils.StringUtilB2C;
-import com.uas.platform.b2c.prod.commodity.constant.DoubleConstant;
-import com.uas.platform.b2c.prod.commodity.constant.ErrorInfoConstant;
-import com.uas.platform.b2c.prod.commodity.constant.ModifyConstant;
-import com.uas.platform.b2c.prod.commodity.constant.ShortConstant;
-import com.uas.platform.b2c.prod.commodity.constant.UploadConstant;
-import com.uas.platform.b2c.prod.commodity.dao.GoodsDao;
-import com.uas.platform.b2c.prod.commodity.dao.PCBDao;
-import com.uas.platform.b2c.prod.commodity.dao.PcbPropertyvalueDao;
-import com.uas.platform.b2c.prod.commodity.dao.ProductDao;
-import com.uas.platform.b2c.prod.commodity.dao.ProductPersonDao;
-import com.uas.platform.b2c.prod.commodity.dao.ProductPrivateDao;
-import com.uas.platform.b2c.prod.commodity.dao.ReleaseProductByBatchDao;
-import com.uas.platform.b2c.prod.commodity.dao.V_ProductPrivateDao;
-import com.uas.platform.b2c.prod.commodity.model.Goods;
-import com.uas.platform.b2c.prod.commodity.model.GoodsQtyPrice;
-import com.uas.platform.b2c.prod.commodity.model.PCB;
-import com.uas.platform.b2c.prod.commodity.model.PCBPropertyValue;
-import com.uas.platform.b2c.prod.commodity.model.Product;
-import com.uas.platform.b2c.prod.commodity.model.ProductPerson;
-import com.uas.platform.b2c.prod.commodity.model.ProductPrivate;
-import com.uas.platform.b2c.prod.commodity.model.ReleaseProductByBatch;
-import com.uas.platform.b2c.prod.commodity.model.V_ProductPrivate;
+import com.uas.platform.b2c.prod.commodity.constant.*;
+import com.uas.platform.b2c.prod.commodity.dao.*;
+import com.uas.platform.b2c.prod.commodity.model.*;
 import com.uas.platform.b2c.prod.commodity.service.GoodsService;
 import com.uas.platform.b2c.prod.commodity.service.ReleaseProductByBatchService;
 import com.uas.platform.b2c.prod.commodity.util.GoodsUtil;
@@ -56,37 +35,11 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.persistence.criteria.CriterionExpression;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.platform.core.persistence.criteria.SimpleExpression;
-import java.math.BigDecimal;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DataAccessException;
@@ -99,6 +52,22 @@ import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
 
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static com.uas.platform.b2c.core.utils.NumberUtil.fractionNumCeil;
+
 @Service
 public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchService {
 
@@ -1395,7 +1364,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 					String str = cell.getStringCellValue().trim();
 //					Object data = getCellData(cell);
 //					String str = data == null ? "" : data.toString();
-					if(str.indexOf("\u00A0")>0){
+					if(str.indexOf("\u00A0") > -1){
 						  str= str.replaceAll("\u00A0", "");
 					}
 					str = StringUtilB2C.replaceTabAndLineBreak(str);

src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderServiceImpl.java

@@ -60,7 +60,8 @@ import com.uas.platform.b2c.trade.deprecated.model.OrderRelationInfo;
 import com.uas.platform.b2c.trade.deprecated.model.UserInfoForOrder;
 import com.uas.platform.b2c.trade.inquiry.dao.TradeChargeDao;
 import com.uas.platform.b2c.trade.inquiry.model.TradeCharge;
-import com.uas.platform.b2c.trade.order.StringConstant.StringFormat;
+import com.uas.platform.b2c.trade.order.StringConstant.*;
+import com.uas.platform.b2c.trade.order.StringConstant.Currency;
 import com.uas.platform.b2c.trade.order.dao.OrderDao;
 import com.uas.platform.b2c.trade.order.dao.OrderDetailDao;
 import com.uas.platform.b2c.trade.order.dao.OrderIndexDetailDao;
@@ -2565,6 +2566,7 @@ public class OrderServiceImpl implements OrderService {
         page.expression(PredicateUtils.eq("status", status, false));
         page.expression(PredicateUtils.isNull("invoiceid"));
         page.expression(PredicateUtils.eq("invoicetype", Type.Bill_No.value(), false));
+        page.expression(PredicateUtils.eq("currency", Currency.RMB, true));
 
         if (StringUtils.hasText(keyword)) {
             SimpleExpression sellername = new SimpleExpression("sellername", keyword , Operator.LIKE);