|
@@ -325,16 +325,11 @@ public class ShoppingCart extends Controller {
|
|
|
//定制信息
|
|
//定制信息
|
|
|
CustomScheme customScheme = new CustomScheme(this);
|
|
CustomScheme customScheme = new CustomScheme(this);
|
|
|
|
|
|
|
|
- int year = Year.now().getValue();
|
|
|
|
|
- int quarter = YearMonth.now().get(IsoFields.QUARTER_OF_YEAR);
|
|
|
|
|
BigDecimal rwpricerate = new BigDecimal(1);
|
|
BigDecimal rwpricerate = new BigDecimal(1);
|
|
|
Rows custamountrows = dbConnect.runSqlQuery("select * from sa_agents where sys_enterpriseid=" + sys_enterpriseid + " and siteid='" + siteid + "'");
|
|
Rows custamountrows = dbConnect.runSqlQuery("select * from sa_agents where sys_enterpriseid=" + sys_enterpriseid + " and siteid='" + siteid + "'");
|
|
|
if (!custamountrows.isEmpty()) {
|
|
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");
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ if (custamountrows.get(0).getBigDecimal("pricerate").compareTo(BigDecimal.ZERO) > 0) {
|
|
|
|
|
+ rwpricerate = custamountrows.get(0).getBigDecimal("pricerate");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
for (Row row : rows) {
|
|
for (Row row : rows) {
|