‘linchangsheng’ 1 month ago
parent
commit
67ac61ceed

+ 6 - 2
src/main/java/com/gree/mall/manager/logic/order/OrderShareLogic.java

@@ -87,7 +87,9 @@ public class OrderShareLogic {
                        String workUserName, String phone, String status, String startTime, String endTime, String startSettleTime, String endSettleTime,
                        String workUserName, String phone, String status, String startTime, String endTime, String startSettleTime, String endSettleTime,
                        String payType,
                        String payType,
                        String position,String startPayTime,String endPayTime) throws Exception {
                        String position,String startPayTime,String endPayTime) throws Exception {
-        List<OrderShare> list = list(request,userId, websitId, orderShareId, orderId, workUserName, phone, status, startTime, endTime,
+        List<String> strings = new ArrayList<>();
+        strings.add(status);
+        List<OrderShare> list = list(request,userId, websitId, orderShareId, orderId, workUserName, phone, strings, startTime, endTime,
                 startSettleTime, endSettleTime, position,startPayTime,endPayTime, payType,1,-1).getRecords();
                 startSettleTime, endSettleTime, position,startPayTime,endPayTime, payType,1,-1).getRecords();
         String[] titles = {"序号","结算编号","订单类型", "订单编号", "店铺名称", "商品信息", "单价", "数量", "总金额",
         String[] titles = {"序号","结算编号","订单类型", "订单编号", "店铺名称", "商品信息", "单价", "数量", "总金额",
                 "商品佣金", "订单佣金","优惠金额","结算金额","平台优惠券名称", "交易单号",
                 "商品佣金", "订单佣金","优惠金额","结算金额","平台优惠券名称", "交易单号",
@@ -209,7 +211,9 @@ public class OrderShareLogic {
         excelData.setTitles(Arrays.asList(titles));
         excelData.setTitles(Arrays.asList(titles));
         excelData.setName("结算订单");
         excelData.setName("结算订单");
 
 
-        List<OrderShare> list = list(request, userId, websitId, orderShareId, orderId, workUserName, phone, status, startTime, endTime,
+        List<String> statuss = new ArrayList<>();
+        statuss.add(status);
+        List<OrderShare> list = list(request, userId, websitId, orderShareId, orderId, workUserName, phone, statuss, startTime, endTime,
                 startSettleTime, endSettleTime, position, startPayTime, endPayTime, payType,1, -1).getRecords();
                 startSettleTime, endSettleTime, position, startPayTime, endPayTime, payType,1, -1).getRecords();
 
 
         if (CollectionUtils.isEmpty(list)) {
         if (CollectionUtils.isEmpty(list)) {