feat:导出excel

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -2270,9 +2270,9 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                         throw new RuntimeException("淘宝店铺未授权");
                     }
                     AlibabaAscpLogisticsOfflineSendResponse rsp = client.execute(req, token);
-                    logger.info("", rsp.getBody());
+                    logger.info("淘宝订单发货,外部订单id：{}，接口response:{}", salesOrder.getSalesExOrderId(), rsp.getBody());
                 } catch (ApiException e) {
-                    e.printStackTrace();
+                    logger.error("淘宝订单发货异常,外部订单id：{} 异常信息：",salesOrder.getSalesExOrderId(), e);
                     throw new RuntimeException(e);
                 }
             }
@@ -2346,7 +2346,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                         }
                     }
                 } catch (Exception e) {
-                    logger.error("抖音订单发货失败：", e);
+                    logger.error("抖音订单发货失败，外部订单id：" + salesOrder.getSalesExOrderId() + " 异常信息：", e);
                     throw new RuntimeException(e);
                 }
             }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -1636,6 +1636,9 @@ public class AwaitSendController {
         titles.add("订单编号");
         titles.add("交易号");
         titles.add("商家编号");
+        titles.add("付款类型");
+        titles.add("付款渠道流水号");
+        titles.add("商家编号");
         titles.add("订单金额");
         titles.add("订单类型");
         titles.add("姓名");
@@ -1670,6 +1673,8 @@ public class AwaitSendController {
             row.add(salesOrder.getSalesOrderId());
             row.add(salesOrder.getSalesDealCode());
             row.add(salesOrder.getSalesExOrderId());
+            row.add(getPayTypeStr(salesOrder.getSalesPayType()));
+            row.add(salesOrder.getSalesPaymentNo());
             row.add(salesOrder.getSalesPayMoney()/100);
             if(salesOrder.getSalesCustomerId() == null){
                 row.add("正常订单");
@@ -1787,6 +1792,45 @@ public class AwaitSendController {
         return new ModelAndView(new ObjectExcelView(),model);
     }
 
+    /**
+     * 付款方式  1：微信支付 2：现金支付3：已支付定金￥99 4：刷卡支付 5：支付宝支付
+     * update 2023-07-18 新增抖音抖店类型；拉取订单时做映射
+     * 10：货到付款
+     * 11：小程序
+     * 12：银行卡
+     * 13：余额
+     * 14：无需支付（0元单）
+     * 15：DOU分期（信用支付）
+     * 16：新卡支付
+     * 17：先用后付
+     * 京东支付支付类型：
+     * 30：邮局汇款
+     * 31：自提
+     * 32：在线支付
+     * 33：公司转账
+     */
+    private String getPayTypeStr(Integer salesPayType) {
+        Map<Integer, String> mapper = new HashMap<>();
+        mapper.put(1, "微信支付");
+        mapper.put(2, "现金支付");
+        mapper.put(3, "已支付定金￥99");
+        mapper.put(4, "刷卡支付");
+        mapper.put(5, "支付宝支付");
+        mapper.put(10, "货到付款");
+        mapper.put(11, "小程序");
+        mapper.put(12, "银行卡");
+        mapper.put(13, "余额");
+        mapper.put(14, "无需支付（0元单）");
+        mapper.put(15, "DOU分期（信用支付）");
+        mapper.put(16, "新卡支付");
+        mapper.put(17, "先用后付");
+        mapper.put(30, "邮局汇款");
+        mapper.put(31, "自提");
+        mapper.put(32, "在线支付");
+        mapper.put(33, "公司转账");
+        return mapper.get(salesPayType);
+    }
+
     /**物流名称替换**/
     public String replace(String code) {
         String name = "";