bug修复及购物车信息中添加原单价、客户档案资料费、单价

src/custom/restcontroller/sale/cashbill/cashbill.java

@@ -987,6 +987,7 @@ public class cashbill extends Controller {
         querySQL.setWhere("t1.sys_enterpriseid", sys_enterpriseid);
         querySQL.setWhere(where);
         querySQL.setPage(pageSize, pageNumber);
+        querySQL.setOrderBy("t1.sa_cashbillid desc");
         Rows rows = querySQL.query();
 //        if (isExport) {
 //            //去除不需要导出项

src/custom/restcontroller/sale/shoppingcart/ShoppingCart.java

@@ -15,6 +15,9 @@ import restcontroller.R;
 
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.temporal.IsoFields;
 import java.util.ArrayList;
 import java.util.HashMap;
 
@@ -322,6 +325,18 @@ public class ShoppingCart extends Controller {
         //定制信息
         CustomScheme customScheme = new CustomScheme(this);
 
+        int year = Year.now().getValue();
+        int quarter = YearMonth.now().get(IsoFields.QUARTER_OF_YEAR);
+        BigDecimal rwpricerate = new BigDecimal(1);
+        Rows custamountrows = dbConnect.runSqlQuery("select * from sa_agents where sys_enterpriseid=" + sys_enterpriseid + " and siteid='" + siteid + "'");
+        if (!custamountrows.isEmpty()) {
+
+            if (custamountrows.get(0).getInteger("year") == year && custamountrows.get(0).getInteger("quarter") == quarter) {
+                if (custamountrows.get(0).getBigDecimal("pricerate").compareTo(BigDecimal.ZERO) > 0) {
+                    rwpricerate = custamountrows.get(0).getBigDecimal("pricerate");
+                }
+            }
+        }
         for (Row row : rows) {
             if ((attRowsMap.getOrDefault(row.getString("itemid"), new Rows())).isEmpty()) {
                 row.put("attinfos", defaultImageRows);
@@ -352,6 +367,8 @@ public class ShoppingCart extends Controller {
                         row.put("gradeprice", itemPrice.getContractprice());
                     }
                 }
+                row.put("gradeprice", row.getBigDecimal("gradeprice").multiply(rwpricerate).add(row.getBigDecimal("custamount")));
+                row.put("defaultprice", row.getBigDecimal("gradeprice").multiply(rwpricerate));
 
 //                row.put("gradeprice", istool == 0 ?itemPrice.getContractprice():itemPrice.getMarketprice());
             } catch (Exception e) {

src/custom/restcontroller/sale/stockbill/stockbill.java

@@ -55,6 +55,7 @@ public class stockbill extends Controller {
 //        Rows rows = dbConnect.runSqlQuery(sqlFactory);
         QuerySQL querySQL = queryStockbillList(where.toString());
         querySQL.setPage(pageSize, pageNumber);
+        querySQL.setOrderBy("t1.st_stockbillid desc");
         Rows rows = querySQL.query();
 
         return getSucReturnObject().setData(rows).toString();

src/custom/restcontroller/webmanage/sale/aftersalesmag/aftersalesmag.java

@@ -210,6 +210,10 @@ public class aftersalesmag extends Controller {
         querySQL.setWhere("t1.sa_agentsid in (select sa_agentsid from sa_agents where  sys_enterpriseid=" + sys_enterpriseid + ")");
         querySQL.setWhere("t1.sku not in (select distinct machinecode from sa_aftersalesmag_items where siteid='" + siteid + "' and ifnull(machinecode,'')!='')");
         querySQL.setWhere(where.toString());
+        querySQL.addQueryFields("cardname","t6.name");
+        querySQL.addQueryFields("cardphonenumber","t6.phonenumber");
+        querySQL.addQueryFields("cardaddress","t6.address");
+
         querySQL.setDistinct(true);
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -164,21 +164,10 @@ public class Order extends Controller {
         }
         Rows enterprisefinancerows = dbConnect.runSqlQuery("select * from sys_enterprise_finance where sys_enterprise_financeid="+sys_enterprise_financeid);
         sqlFactory.addParameter("sys_enterprise_financeid", sys_enterprise_financeid);
-        if(isAdd){
-            if(enterprisefinancerows.isNotEmpty()){
-                sqlFactory.addParameter("invoicetaxno", enterprisefinancerows.get(0).getString("taxno"));
-                sqlFactory.addParameter("invoicename", enterprisefinancerows.get(0).getString("enterprisename"));
-                sqlFactory.addParameter("invoiceaddress", enterprisefinancerows.get(0).getString("address"));
-            }else{
-                sqlFactory.addParameter("invoicetaxno", "");
-                sqlFactory.addParameter("invoicename", "");
-                sqlFactory.addParameter("invoiceaddress", "");
-            }
-        }else{
-            sqlFactory.addParameter("invoicetaxno", content.getStringValue("invoicetaxno"));
-            sqlFactory.addParameter("invoicename",content.getStringValue("invoicename"));
-            sqlFactory.addParameter("invoiceaddress", content.getStringValue("invoiceaddress"));
-        }
+
+        sqlFactory.addParameter("invoicetaxno", content.getStringValue("invoicetaxno"));
+        sqlFactory.addParameter("invoicename",content.getStringValue("invoicename"));
+        sqlFactory.addParameter("invoiceaddress", content.getStringValue("invoiceaddress"));
 
         //物流公司档案ID
         sqlFactory.addParameter("sa_logiscompid", content.getLongValue("sa_logiscompid"));