|
|
@@ -2665,8 +2665,11 @@ public class Order extends Controller {
|
|
|
Rows orderdetailsRows = dbConnect.runSqlQuery("select * from sa_orderitems where sa_orderid="+sa_orderid+" and ifnull(remarks,'')!=''");
|
|
|
if(amount.compareTo(BigDecimal.ZERO)>0){
|
|
|
if(orderRows.isEmpty() && orderdetailsRows.isEmpty()){
|
|
|
- check();
|
|
|
- dbConnect.runSqlUpdate("update sa_order set checkby='自动审核' where sa_orderid="+sa_orderid);
|
|
|
+ String result = check();
|
|
|
+ if(result.contains("成功")){
|
|
|
+ dbConnect.runSqlUpdate("update sa_order set checkby='自动审核' where sa_orderid="+sa_orderid);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -2769,7 +2772,10 @@ public class Order extends Controller {
|
|
|
public String check() throws YosException {
|
|
|
boolean isdebug = content.getBooleanValue("isdebug");
|
|
|
Long sa_orderid = content.getLong("sa_orderid");
|
|
|
- String reviewtype = content.getString("reviewtype");
|
|
|
+ String reviewtype = content.getStringValue("reviewtype");
|
|
|
+
|
|
|
+ dbConnect.runSqlUpdate("update sa_order set pay_enterpriseid=sys_enterpriseid where pay_enterpriseid=0 and sa_orderid="+sa_orderid);
|
|
|
+
|
|
|
Rows rows = getOrderRows(this, sa_orderid);
|
|
|
if (rows.isEmpty()) {
|
|
|
return getErrReturnObject().setErrMsg("订单不存在").toString();
|