订单导出和提现导出增加骑手站点

src/main/java/com/sqx/modules/exportExecl/controller/ExportExeclController.java

@@ -57,9 +57,9 @@ public class ExportExeclController {
     @ApiOperation("导出订单列表")
     public Result excelOrder(Integer status, String phone, Long shopId, String userName,
                              String orderNumber, Integer orderType, String shopName, String riderPhone,
-                             String startTime, String endTime, String userId, String payStartTime, String payEndTime) throws Exception{
+                             String startTime, String endTime, String userId, String payStartTime, String payEndTime,Integer riderStationId) throws Exception{
         Integer size = appOrderDao.excelAllOrderAdminCount( status, phone, shopId, userName, orderNumber, orderType,
-                shopName, riderPhone,startTime,endTime,payStartTime,payEndTime);
+                shopName, riderPhone,startTime,endTime,payStartTime,payEndTime,riderStationId);
         //可导出最大数量
         String count=commonInfoService.findOne(431).getValue();
         if(size>Integer.parseInt(count)){
@@ -81,14 +81,19 @@ public class ExportExeclController {
         if(endTime!=null&&!endTime.trim().equals("")){stringBuffer.append("结束时间："+endTime+";");}
         if(payStartTime!=null&&!payStartTime.trim().equals("")){stringBuffer.append("支付开始时间："+payStartTime+";");}
         if(payEndTime!=null&&!payEndTime.trim().equals("")){stringBuffer.append("支付结束时间："+payEndTime+";");}
-
+        if(riderStationId!=null){
+            RiderStation riderStation=riderStationService.getById(riderStationId);
+            if(riderStation!=null){
+                stringBuffer=stringBuffer.append("站点"+riderStation.getStationName());
+            }
+        }
         ExportJob exportJob =new ExportJob();
         exportJob.setFlag(0);
         exportJob.setFileType("order");
         exportJob.setConditionDetail(stringBuffer.toString());
         exportJob.setConditions(","+(status==null?"":status)+","+phone+","+(shopId==null?"":shopId)+","+userName+","+orderNumber+","
                 +(orderType==null?"":orderType)+","+shopName+","
-                +riderPhone+","+startTime+","+endTime+","+payStartTime+","+payEndTime);
+                +riderPhone+","+startTime+","+endTime+","+payStartTime+","+payEndTime+","+riderStationId);
         LocalDateTime localDateTime = LocalDateTime.now();
         String time=localDateTime.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
         exportJob.setFileName((int) (Math.random() * 100) +time+"订单列表.xlsx");
@@ -127,7 +132,14 @@ public class ExportExeclController {
         if(queryDTO.getUserId()==null){
             return Result.error("用户id不能为空");
         }
-        ExportJob exportJob =this.buildExportJob("提现管理.xlsx","payouts", String.valueOf(queryDTO.getUserId()),queryDTO.toStrMessage(),queryDTO.toStrCode());
+        String strMessage=queryDTO.toStrMessage();
+        if(StringUtils.hasText(queryDTO.getRiderStationId())){
+            RiderStation riderStation=riderStationService.getById(queryDTO.getRiderStationId());
+            if(riderStation!=null){
+                strMessage=strMessage+"站点"+riderStation.getStationName();
+            }
+        }
+        ExportJob exportJob =this.buildExportJob("提现管理.xlsx","payouts", String.valueOf(queryDTO.getUserId()),strMessage,queryDTO.toStrCode());
         boolean a=exportJobService.save(exportJob);
         if (a){
             return Result.success("新增提现管理导出计划成功");

src/main/java/com/sqx/modules/order/dao/AppOrderDao.java

@@ -35,13 +35,15 @@ public interface AppOrderDao extends BaseMapper<TbOrder> {
                                        @Param("userName") String userName, @Param("orderNumber") String orderNumber,
                                      @Param("orderType") Integer orderType,@Param("shopName")String shopName,
                                      @Param("riderPhone") String riderPhone,@Param("startTime") String startTime,
-                                     @Param("endTime") String endTime,@Param("payStartTime") String payStartTime,@Param("payEndTime") String payEndTime);
+                                     @Param("endTime") String endTime,@Param("payStartTime") String payStartTime,
+                                     @Param("payEndTime") String payEndTime,@Param("riderStationId")String riderStationId);
     @DataSource("dynamic")
     Integer excelAllOrderAdminCount(@Param("status") Integer status,@Param("phone") String phone, @Param("shopId") Long shopId,
                                      @Param("userName") String userName, @Param("orderNumber") String orderNumber,
                                      @Param("orderType") Integer orderType,@Param("shopName")String shopName,
                                      @Param("riderPhone") String riderPhone,@Param("startTime") String startTime,
-                                     @Param("endTime") String endTime,@Param("payStartTime") String payStartTime,@Param("payEndTime") String payEndTime);
+                                     @Param("endTime") String endTime,@Param("payStartTime") String payStartTime,
+                                    @Param("payEndTime") String payEndTime,@Param("riderStationId")Integer riderStationId);
 
 
     IPage<TbOrder> selectOrderByAdmin(Page<TbOrder> pages,@Param("status") Integer status,@Param("phone") String phone,

src/main/java/com/sqx/modules/order/service/AppOrderService.java

@@ -36,7 +36,7 @@ public interface AppOrderService extends IService<TbOrder> {
 
     ExcelData excelAllOrderAdmin(Integer status, String phone, Long shopId,
                                  String userName, String orderNumber, Integer orderType, String shopName,
-                                 String riderPhone, String startTime, String endTime,String payStartTime, String payEndTime);
+                                 String riderPhone, String startTime, String endTime,String payStartTime, String payEndTime,String riderStationId);
 
     Result selectOrderByUserId(Long userId, String date, String dateType);
 

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -1312,9 +1312,9 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
     @Override
     public ExcelData excelAllOrderAdmin(Integer status, String phone, Long shopId,
                                         String userName, String orderNumber, Integer orderType, String shopName,
-                                        String riderPhone, String startTime, String endTime,String payStartTime, String payEndTime) {
+                                        String riderPhone, String startTime, String endTime,String payStartTime, String payEndTime,String riderStationId) {
         List<TbOrder> tbOrderIPage = appOrderDao.excelAllOrderAdmin( status, phone, shopId, userName, orderNumber, orderType,
-                shopName, riderPhone,startTime,endTime,payStartTime,payEndTime);
+                shopName, riderPhone,startTime,endTime,payStartTime,payEndTime,riderStationId);
 //        for (int i = 0; i < tbOrderIPage.size(); i++) {
 //            List<OrderGoods> orderGoodsList = orderGoodsDao.selectList(new QueryWrapper<OrderGoods>()
 //                    .eq("order_id", tbOrderIPage.get(i).getOrderId()));
@@ -1331,7 +1331,7 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
         titles.add("活动优惠金额（元）");
         titles.add("打包费（元/个 具体按照数量计算）");titles.add("跑腿费（元）");titles.add("支付金额（元）");
         titles.add("跑腿费说明"); titles.add("订单备注");titles.add("支付时间");titles.add("支付方式");
-        titles.add("取餐号"); titles.add("状态");titles.add("是否转单");
+        titles.add("取餐号"); titles.add("状态");titles.add("是否转单");titles.add("骑手站点");
 
         data.setTitles(titles);
         List<List<Object>> rows = new ArrayList();
@@ -1429,6 +1429,7 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             }else{
                 row.add("");
             }
+            row.add(order.getStationName());
             rows.add(row);
         }
         data.setRows(rows);

src/main/java/com/sqx/modules/pay/controller/query/CashOutQueryDTO.java

@@ -56,7 +56,8 @@ public class CashOutQueryDTO extends PageQuery {
                 ","+(type==null?"":type)+
 //                ","+classify+
                 ","+(startTime==null?"":startTime)+
-                ","+(endTime==null?"":endTime)+",";
+                ","+(endTime==null?"":endTime)+
+                ","+(riderStationId==null?"":riderStationId)+",";
     }
     public String toStrMessage() {
         StringBuffer stringBuffer=new StringBuffer();

src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java

@@ -610,6 +610,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
         row.add(cashOutVO.getCreateAt());
         row.add(StringUtils.isEmpty(cashOutVO.getOutAt()) ? "" : cashOutVO.getOutAt());
         row.add(cashOutVO.getOrderNumber());
+        row.add(cashOutVO.getStationName());
         return row;
     }
 
@@ -635,6 +636,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
                 "拒绝原因",
                 "申请时间",
                 "转账拒绝时间",
-                "转账订单号");
+                "转账订单号",
+                "骑手站点");
     }
 }

src/main/java/com/sqx/scheduler/export/ExportScheduler.java

@@ -188,8 +188,9 @@ public class ExportScheduler {
         String endTime=conditions[10];
         String payStartTime=conditions[11];
         String payEndTime=conditions[12];
+        String riderStationId=conditions[13];
 
-        return appOrderService.excelAllOrderAdmin(status, phone, shopId, userName, orderNumber, orderType, shopName, riderPhone, startTime, endTime,payStartTime,payEndTime);
+        return appOrderService.excelAllOrderAdmin(status, phone, shopId, userName, orderNumber, orderType, shopName, riderPhone, startTime, endTime,payStartTime,payEndTime,riderStationId);
     }
 
     //充值记录导出
@@ -248,6 +249,7 @@ public class ExportScheduler {
         queryDTO.setType(conditions[5]);
         queryDTO.setStartTime(conditions[6]);
         queryDTO.setEndTime(conditions[7]);
+        queryDTO.setRiderStationId(conditions[8]);
         return cashOutService.excelPayDetails(queryDTO);
     }
 

src/main/resources/mapper/order/OrderMapper.xml

@@ -153,7 +153,7 @@
         shopPhone,
         tiu.nick_name as riderNickName,tiu.phone as riderPhone,ti.indent_id as indentId,ti.is_rider as isRider,
         ti.rider_user_id as riderUserId, tcu.money as couponMoney,
-        apr.discount_amount as activityDiscountAmount, ai.title activityTitle,ogg.detail,ogg.sumPrice
+        apr.discount_amount as activityDiscountAmount, ai.title activityTitle,ogg.detail,ogg.sumPrice,rs.station_name as stationName
         from tb_order tor
         left join tb_user tu on tor.user_id = tu.user_id
         left join goods_shop gs on tor.shop_id = gs.shop_id
@@ -162,6 +162,7 @@
         left join tb_coupon_user tcu on tor.coupon_id = tcu.id
         left join activity_part_record apr on apr.order_id = tor.order_id
         left join activity ai on ai.id = apr.activity_id
+        left join rider_station rs on tiu.rider_station_id = rs.id
         left join (  select @a:=0,order_id ,group_concat(@a:=@a+1,".商品名：",goods_name,",数量：",goods_num,",规格：",sku_message) detail,sum(goods_num*goods_price) sumPrice  from order_goods og group by order_id
         ) ogg on ogg.order_id =tor.order_id
         where 1 = 1
@@ -204,6 +205,9 @@
         <if test="payEndTime != null and payEndTime != '' ">
             and date_format(tor.pay_time,'%Y-%m-%d') &lt;= date_format(#{payEndTime},'%Y-%m-%d')
         </if>
+        <if test="riderStationId!=null and riderStationId!=''">
+            and tiu.rider_station_id=#{riderStationId}
+        </if>
         order by tor.pay_time desc, tor.create_time desc
     </select>
 
@@ -213,6 +217,7 @@
         left join goods_shop gs on tor.shop_id = gs.shop_id
         left join tb_indent ti on tor.order_id = ti.order_id
         left join tb_user tiu on tiu.user_id = ti.rider_user_id
+        left join rider_station rs on tiu.rider_station_id = rs.id
         where 1 = 1
         <if test="riderPhone!=null and riderPhone!=''">
             and tiu.phone =#{riderPhone}
@@ -253,6 +258,9 @@
         <if test="payEndTime != null and payEndTime != '' ">
             and date_format(tor.pay_time,'%Y-%m-%d') &lt;= date_format(#{payEndTime},'%Y-%m-%d')
         </if>
+        <if test="riderStationId!=null and riderStationId!=''">
+            and tiu.rider_station_id=#{riderStationId}
+        </if>
         order by tor.pay_time desc, tor.create_time desc
     </select>
 

src/main/resources/mapper/pay/CashDao.xml

@@ -291,7 +291,7 @@
             <if test="params.openBank != null and params.openBank != '' and params.openBank != 'null'">
                 and co.open_bank = #{params.openBank}
             </if>
-            <if test="params.riderStationId != null">
+            <if test="params.riderStationId != null and params.riderStationId != '' ">
                 and tu.rider_station_id = #{params.riderStationId}
             </if>
         </where>
@@ -322,9 +322,11 @@
     </select>
 
     <select id="excelPayDetails" resultType="com.sqx.modules.pay.vo.CashOutVO">
-        select gh.shop_name, co.*
+        select gh.shop_name, co.*,rs.station_name as stationName
         from cash_out co
         left join goods_shop gh on gh.shop_id = co.shop_id
+        left join tb_user tu on tu.user_id=co.user_id
+        left join rider_station rs on tu.rider_station_id=rs.id
         <include refid="cashOutQueryCondition"></include>
         order by id desc
     </select>