fix:订单拉取

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/JingdongTask.java

@@ -526,12 +526,12 @@ public class JingdongTask {
      */
     private Integer getSalesPayType(String payType) {
         Map<String, Integer> mapper = new HashMap<>(6);
-        mapper.put("1", 10);
-        mapper.put("2", 30);
-        mapper.put("3", 31);
-        mapper.put("4", 32);
-        mapper.put("5", 33);
-        mapper.put("6", 12);
+        mapper.put("1-货到付款", 10);
+        mapper.put("2-邮局汇款", 30);
+        mapper.put("3-自提", 31);
+        mapper.put("4-在线支付", 32);
+        mapper.put("5-公司转账", 33);
+        mapper.put("6-银行卡转账", 12);
 
         Integer value = mapper.get(payType);
 

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/TaobaoTask.java

@@ -213,6 +213,12 @@ public class TaobaoTask {
 
     }
 
+    /**
+     * https://open.taobao.com/v2/doc?spm=a219a.7629140.0.0.506775feNiUkE9#/apiFile?docType=2&docId=54
+     * @param tid
+     * @param token
+     * @return
+     */
     public Trade getOrderDetails(Long tid, String token) {
         try {
             Thread.sleep(1000);
@@ -221,7 +227,7 @@ public class TaobaoTask {
         }
         TaobaoClient detailsClient = new DefaultTaobaoClient(TaobaoConfig.TAOBAO_URL, TaobaoConfig.appkey, TaobaoConfig.secret);
         TradeFullinfoGetRequest req = new TradeFullinfoGetRequest();
-        req.setFields("created,tid,pay_time,seller_memo,buyer_memo,type,status,price,discount_fee,total_fee,payment,orders,receiver_name,receiver_state,receiver_address,receiver_zip,receiver_mobile,receiver_phone,receiver_town,receiver_city,receiver_district");
+        req.setFields("created,tid,pay_time,seller_memo,buyer_memo,type,status,price,discount_fee,total_fee,payment,orders,receiver_name,receiver_state,receiver_address,receiver_zip,receiver_mobile,receiver_phone,receiver_town,receiver_city,receiver_district,alipay_no");
         req.setTid(tid);
         req.setIncludeOaid("true");
         TradeFullinfoGetResponse rsp = null;
@@ -259,6 +265,8 @@ public class TaobaoTask {
         trade.setSellerMemo(data.getString("seller_memo"));
         trade.setBuyerMemo(data.getString("buyer_memo"));
         trade.setOaid(data.getString("oaid"));
+        trade.setAlipayNo(data.getString("alipay_no"));
+
         JSONObject temp = data.getJSONObject("orders");
         JSONArray orders = temp.getJSONArray("order");
         trade.setOrders(new ArrayList<>(orders.size()));