|
|
@@ -255,7 +255,13 @@ public class InsertServiceImpl implements InsertService {
|
|
|
if(oaid!=null) {
|
|
|
try {
|
|
|
TopOaidDecryptResponse rsp6 = client6.execute(req6, session_Key);
|
|
|
- name_oaid=rsp6.getReceiverList().get(0).getName();
|
|
|
+ if(!("王'R").equals(rsp6.getReceiverList().get(0).getName())){
|
|
|
+ name_oaid=rsp6.getReceiverList().get(0).getName();
|
|
|
+ }
|
|
|
+ if(("王'R").equals(rsp6.getReceiverList().get(0).getName())){
|
|
|
+ name_oaid="王R";
|
|
|
+ }
|
|
|
+
|
|
|
receiver_mobile=rsp6.getReceiverList().get(0).getMobile();
|
|
|
address=trimNull(rsp6.getReceiverList().get(0).getState() ) + trimNull(rsp6.getReceiverList().get(0).getCity() ) + trimNull(rsp6.getReceiverList().get(0).getDistrict() ) + trimNull( rsp6.getReceiverList().get(0).getAddressDetail() );
|
|
|
// rsp6.getReceiverList().get(1
|
|
|
@@ -265,9 +271,7 @@ public class InsertServiceImpl implements InsertService {
|
|
|
}
|
|
|
}
|
|
|
//
|
|
|
- if(trimNull(name_oaid)=="王'R"){
|
|
|
- name_oaid="王R";
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
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" +
|
|
|
@@ -283,6 +287,16 @@ public class InsertServiceImpl implements InsertService {
|
|
|
" WHERE '" + trimNull(trades.get(i).getStatus() ) + "' NOT IN ( 'TRADE_NO_CREATE_PAY','WAIT_BUYER_PAY','PAY_PENDING' ) AND NOT EXISTS ( select sa_id from sale WHERE SA_iD=" + said + " ) AND NOT EXISTS ( select SA_CODE from sale WHERE SA_CODE= '" + trades.get(i).getTid() + "' ) AND NOT EXISTS ( select SA_TAOBAOID from sale WHERE SA_TAOBAOID=" + trades.get(i).getTid() + " ) ";
|
|
|
insertSqlsList.add(INSERTSALESql);
|
|
|
|
|
|
+// try{
|
|
|
+// baseDao.execute(INSERTSALESql);
|
|
|
+//
|
|
|
+//
|
|
|
+// }catch (Exception e) {
|
|
|
+// System.out.println(INSERTSALESql);
|
|
|
+// logger.info( e.getMessage() );
|
|
|
+// }
|
|
|
+
|
|
|
+
|
|
|
List<Order> orders = trades.get(i).getOrders();
|
|
|
for (int j = 0; j < orders.size(); j++) {
|
|
|
int k = j + 1;
|
|
|
@@ -297,6 +311,15 @@ public class InsertServiceImpl implements InsertService {
|
|
|
"WHERE '" + trimNull(trades.get(i).getStatus() ) + "' NOT IN ( 'TRADE_NO_CREATE_PAY','WAIT_BUYER_PAY','PAY_PENDING' ) AND sd_id=" + sdid + " ) AND NOT EXISTS ( select sd_id from sale left join saledetail on sa_id=sd_said " +
|
|
|
"WHERE SA_TAOBAOID = " + trades.get(i).getTid() + " and sd_detno = " + k +" ) ";
|
|
|
insertSqlsList.add(INSERTSALEDETAILSql);
|
|
|
+
|
|
|
+// try{
|
|
|
+// baseDao.execute(INSERTSALEDETAILSql);
|
|
|
+//
|
|
|
+//
|
|
|
+// }catch (Exception e) {
|
|
|
+// System.out.println(INSERTSALEDETAILSql);
|
|
|
+// logger.info( e.getMessage() );
|
|
|
+// }
|
|
|
}
|
|
|
|
|
|
}
|