|
|
@@ -274,14 +274,15 @@ public class InsertServiceImpl implements InsertService {
|
|
|
}
|
|
|
}
|
|
|
//
|
|
|
-
|
|
|
- if(trimNull(trades.get(i).getStatus() )!="TRADE_NO_CREATE_PAY"
|
|
|
- &&trimNull(trades.get(i).getStatus() )!="WAIT_BUYER_PAY"
|
|
|
- &&trimNull(trades.get(i).getStatus() )!="PAY_PENDING"
|
|
|
- &&trimNull(trades.get(i).getStatus() )!="WAIT_BUYER_CONFIRM_GOODS"
|
|
|
- &&trimNull(trades.get(i).getStatus() )!="TRADE_CLOSED_BY_TAOBAO"
|
|
|
- &&trimNull(trades.get(i).getStatus() )!="TRADE_CLOSED"
|
|
|
- &&trimNull(trades.get(i).getStatus() )!="TRADE_FINISHED") {
|
|
|
+ String sa_tradestatus=trimNull(trades.get(i).getStatus() );
|
|
|
+
|
|
|
+ if(!"TRADE_NO_CREATE_PAY".equals(sa_tradestatus)
|
|
|
+ &&!"WAIT_BUYER_PAY".equals(sa_tradestatus)
|
|
|
+ &&!"PAY_PENDING".equals(sa_tradestatus)
|
|
|
+ &&!"WAIT_BUYER_CONFIRM_GOODS".equals(sa_tradestatus)
|
|
|
+ &&!"TRADE_CLOSED_BY_TAOBAO".equals(sa_tradestatus)
|
|
|
+ &&!"TRADE_CLOSED".equals(sa_tradestatus)
|
|
|
+ &&!"TRADE_FINISHED".equals(sa_tradestatus)) {
|
|
|
|
|
|
String INSERTSALESql = "insert into sale( SA_ISUPDATE,SA_DISCOUNTFEE,SA_TRADESTATUS, sa_sellernick,sa_custcode,sa_paymentscode,SA_TAOBAOID,sa_payments,sa_custname,sa_kind,sa_wwh_user,sa_need15,sa_id,sa_tradeid,sa_code,sa_date,sa_recorder,sa_recorddate,sa_currency,sa_rate" +
|
|
|
",sa_apcustname,sa_need9,sa_toplace" +
|
shenliang