Accept Merge Request #19: (dev-lzl -> dev-minio)

Merge Request: 合并

Created By: @刘子麟
Accepted By: @刘子麟
URL: https://chuanghaikeji.coding.net/p/moxuanyunshangwaimai/d/backend/git/merge/19?initial=true

db/update_241014.sql

@@ -0,0 +1,12 @@
+-- 创建站点表
+CREATE TABLE rider_station
+(
+    id           INT PRIMARY KEY,
+    station_name VARCHAR(100)
+);
+
+-- 用户表增加站点id字段
+ALTER TABLE tb_user ADD rider_station_id int;
+
+-- 给tb_order添加order_number索引
+ALTER TABLE tb_order ADD INDEX order_number_index (order_number);

src/main/java/com/sqx/config/ShiroConfig.java

@@ -84,6 +84,8 @@ public class ShiroConfig {
 
         filterMap.put("/admin/goods/**","anon");
         filterMap.put("/selfGoodsRule/**","anon");
+//        站点
+        filterMap.put("/admin/riderStation/**","anon");
         //
         filterMap.put("/**", "oauth2");
         filterMap.put("/shop/ordersChat/selectShopAllUnreadCount", "oauth2");

src/main/java/com/sqx/modules/app/entity/UserEntity.java

@@ -14,248 +14,253 @@ import java.math.BigDecimal;
 
 /**
  * 用户
- *
  */
 @Data
 @ApiModel("用户")
 @TableName("tb_user")
 public class UserEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	@TableId(type = IdType.AUTO)
+    @TableId(type = IdType.AUTO)
 
-	@ApiModelProperty("用户id")
-	private Long userId;
+    @ApiModelProperty("用户id")
+    private Long userId;
 
 
-	@ApiModelProperty("用户名")
-	private String userName;
+    @ApiModelProperty("用户名")
+    private String userName;
 
 
-	@ApiModelProperty("用户类型 1用户 2骑手师傅")
-	private Integer userType;
+    @ApiModelProperty("用户类型 1用户 2骑手师傅")
+    private Integer userType;
 
 
-	@ApiModelProperty("手机号")
-	private String phone;
+    @ApiModelProperty("手机号")
+    private String phone;
 
 
-	@ApiModelProperty("头像")
-	private String avatar;
+    @ApiModelProperty("头像")
+    private String avatar;
 
 
-	@ApiModelProperty("昵称")
-	private String nickName;
+    @ApiModelProperty("昵称")
+    private String nickName;
 
 
-	@ApiModelProperty("性别 1男 2女")
-	private Integer sex;
+    @ApiModelProperty("性别 1男 2女")
+    private Integer sex;
 
 
-	@ApiModelProperty("年龄")
-	private Integer age;
+    @ApiModelProperty("年龄")
+    private Integer age;
 
 
-	@ApiModelProperty("保证金")
-	private BigDecimal cashDeposit;
+    @ApiModelProperty("保证金")
+    private BigDecimal cashDeposit;
 
 
-	@ApiModelProperty("账户余额")
-	private BigDecimal balance;
+    @ApiModelProperty("账户余额")
+    private BigDecimal balance;
 
 
-	@ApiModelProperty("证件号码")
-	private String identityCardNumber;
+    @ApiModelProperty("证件号码")
+    private String identityCardNumber;
 
 
-	@ApiModelProperty("身份证正面图片")
-	private String identityCardFront;
+    @ApiModelProperty("身份证正面图片")
+    private String identityCardFront;
 
 
-	@ApiModelProperty("身份证反面图片")
-	private String identityCardVerso;
+    @ApiModelProperty("身份证反面图片")
+    private String identityCardVerso;
 
 
-	@ApiModelProperty("手持身份证正面图片")
-	private String selfIdentityCard;
+    @ApiModelProperty("手持身份证正面图片")
+    private String selfIdentityCard;
 
 
-	@ApiModelProperty("实名认证审核状态（0：待审核；1：审核通过；2：审核不通过）")
-	private String checkCertification;
+    @ApiModelProperty("实名认证审核状态（0：待审核；1：审核通过；2：审核不通过）")
+    private String checkCertification;
 
 
-	@ApiModelProperty("实名认证审核说明")
-	private String checkCertificationMessage;
+    @ApiModelProperty("实名认证审核说明")
+    private String checkCertificationMessage;
 
 
-	@ApiModelProperty("邀请码")
-	private String invitationCode;
+    @ApiModelProperty("邀请码")
+    private String invitationCode;
 
 
-	@ApiModelProperty("邀请人邀请码")
-	private String inviterCode;
+    @ApiModelProperty("邀请人邀请码")
+    private String inviterCode;
 
 
-	@ApiModelProperty("微信app openid")
-	private String wxOpenId;
+    @ApiModelProperty("微信app openid")
+    private String wxOpenId;
 
 
-	@ApiModelProperty("rider_wx_open_id")
-	private String riderWxOpenId;
+    @ApiModelProperty("rider_wx_open_id")
+    private String riderWxOpenId;
 
 
-	@ApiModelProperty("普通用户微信小程序openid")
-	private String openId;
+    @ApiModelProperty("普通用户微信小程序openid")
+    private String openId;
 
 
-	@ApiModelProperty("骑手用户微信小程序openid")
-	private String riderOpenId;
+    @ApiModelProperty("骑手用户微信小程序openid")
+    private String riderOpenId;
 
-	@ApiModelProperty("商家用户微信小程序openid")
-	private String shopOpenId;
+    @ApiModelProperty("商家用户微信小程序openid")
+    private String shopOpenId;
 
 
-	@ApiModelProperty("密码")
-	private String password;
+    @ApiModelProperty("密码")
+    private String password;
 
 
-	@ApiModelProperty("苹果id")
-	private String appleId;
+    @ApiModelProperty("苹果id")
+    private String appleId;
 
 
-	@ApiModelProperty("手机类型 1安卓 2ios")
-	private Integer sysPhone;
+    @ApiModelProperty("手机类型 1安卓 2ios")
+    private Integer sysPhone;
 
 
-	@ApiModelProperty("状态 1正常 2禁用")
-	private Integer status;
+    @ApiModelProperty("状态 1正常 2禁用")
+    private Integer status;
 
 
-	@ApiModelProperty("来源 app 小程序 公众号")
-	private String platform;
+    @ApiModelProperty("来源 app 小程序 公众号")
+    private String platform;
 
 
-	@ApiModelProperty("积分")
-	private Integer jifen;
+    @ApiModelProperty("积分")
+    private Integer jifen;
 
 
-	@ApiModelProperty("设备id")
-	private String clientid;
+    @ApiModelProperty("设备id")
+    private String clientid;
 
 
-	@ApiModelProperty("骑手设备id")
-	private String riderClientid;
+    @ApiModelProperty("骑手设备id")
+    private String riderClientid;
 
-	@ApiModelProperty("商家设备id")
-	private String shopClientId;
+    @ApiModelProperty("商家设备id")
+    private String shopClientId;
 
 
-	@ApiModelProperty("支付宝名字")
-	private String zhiFuBaoName;
+    @ApiModelProperty("支付宝名字")
+    private String zhiFuBaoName;
 
 
-	@ApiModelProperty("支付宝账号")
-	private String zhiFuBao;
+    @ApiModelProperty("支付宝账号")
+    private String zhiFuBao;
 
 
-	@ApiModelProperty("创建时间")
-	private String createTime;
+    @ApiModelProperty("创建时间")
+    private String createTime;
 
 
-	@ApiModelProperty("更新时间")
-	private String updateTime;
+    @ApiModelProperty("更新时间")
+    private String updateTime;
 
 
-	@ApiModelProperty("用户类型")
-	private Integer type;
+    @ApiModelProperty("用户类型")
+    private Integer type;
 
 
-	@ApiModelProperty("用户提交实名认证时间")
-	private String auditTime;
+    @ApiModelProperty("用户提交实名认证时间")
+    private String auditTime;
 
 
-	@ApiModelProperty("该用户是否是跑腿新用户 1：是新用户 2：是老用户")
-	private Integer newUserFlag;
+    @ApiModelProperty("该用户是否是跑腿新用户 1：是新用户 2：是老用户")
+    private Integer newUserFlag;
 
 
-	@ApiModelProperty("该用户是否是外卖新用户 1：是新用户 2：是老用户")
-	private Integer newUserFlagWm;
+    @ApiModelProperty("该用户是否是外卖新用户 1：是新用户 2：是老用户")
+    private Integer newUserFlagWm;
 
 
-	@ApiModelProperty("骑手当前经度")
-	private Double stationLng;
+    @ApiModelProperty("骑手当前经度")
+    private Double stationLng;
 
 
-	@ApiModelProperty("骑手当前维度")
-	private Double stationLat;
+    @ApiModelProperty("骑手当前维度")
+    private Double stationLat;
 
 
-	@ApiModelProperty("骑手是否上线 1：上线 2：未上线")
-	private Integer onLineFlag;
+    @ApiModelProperty("骑手是否上线 1：上线 2：未上线")
+    private Integer onLineFlag;
 
 
-	@ApiModelProperty("实名认证支付保证金订单号")
-	private String checkNumber;
+    @ApiModelProperty("实名认证支付保证金订单号")
+    private String checkNumber;
 
 
-	@ApiModelProperty("是否是门店用户 1是")
-	private Integer shopAdminFlag;
+    @ApiModelProperty("是否是门店用户 1是")
+    private Integer shopAdminFlag;
 
 
-	@ApiModelProperty("门店管理员id")
-	private Long adminUserId;
+    @ApiModelProperty("门店管理员id")
+    private Long adminUserId;
 
-	@ApiModelProperty("用户提现二维码")
-	@TableField(value = "cash_qr_code")
-	private String cashQrCode;
+    @ApiModelProperty("用户提现二维码")
+    @TableField(value = "cash_qr_code")
+    private String cashQrCode;
 
-	@ApiModelProperty("是否推送消息")
-	private Integer isSendMsg;
+    @ApiModelProperty("是否推送消息")
+    private Integer isSendMsg;
 
-	private String msg;
+    private String msg;
 
-	@ApiModelProperty("是否是会员 0不是  1是")
-	private Integer isVip;
+    @ApiModelProperty("是否是会员 0不是  1是")
+    private Integer isVip;
 
-	@ApiModelProperty("会员到期时间")
-	private String vipExpirationTime;
+    @ApiModelProperty("会员到期时间")
+    private String vipExpirationTime;
 
-	@TableField(exist = false)
-	private BigDecimal money;
+    @ApiModelProperty("站点id")
+    private Integer riderStationId;
 
-	@TableField(exist = false)
-	private BigDecimal integralNum;
+    @TableField(exist = false)
+    private BigDecimal money;
 
-	//本月下单数量
-	@TableField(exist = false)
-	private Integer orderMonth;
+    @TableField(exist = false)
+    private BigDecimal integralNum;
 
-	//本月接单数量
-	@TableField(exist = false)
-	private Integer joinOrderMonth;
+    //本月下单数量
+    @TableField(exist = false)
+    private Integer orderMonth;
 
-	//本月充值
-	@TableField(exist = false)
-	private BigDecimal topUpMonth;
+    //本月接单数量
+    @TableField(exist = false)
+    private Integer joinOrderMonth;
 
-	//骑手收入
-	@TableField(exist = false)
-	private BigDecimal riderMoney;
+    //本月充值
+    @TableField(exist = false)
+    private BigDecimal topUpMonth;
 
-	//提现金额
-	@TableField(exist = false)
-	private BigDecimal cashMoney;
+    //骑手收入
+    @TableField(exist = false)
+    private BigDecimal riderMoney;
 
-	@TableField(exist = false)
-	private String indentNumber;
+    //提现金额
+    @TableField(exist = false)
+    private BigDecimal cashMoney;
 
-	@TableField(exist = false)
-	private Double distance;
+    @TableField(exist = false)
+    private String indentNumber;
 
-	@TableField(exist = false)
-	private Integer shopStatus;
+    @TableField(exist = false)
+    private Double distance;
 
-	@TableField(exist = false)
-	private Long shopId;
+    @TableField(exist = false)
+    private Integer shopStatus;
 
+    @TableField(exist = false)
+    private Long shopId;
+
+    //	站点名称
+    @TableField(exist = false)
+    private String stationName;
 }

src/main/java/com/sqx/modules/datacentre/controller/DataCentreController.java

@@ -2,6 +2,7 @@ package com.sqx.modules.datacentre.controller;
 
 import com.sqx.common.utils.Result;
 import com.sqx.modules.app.entity.RechargeRecord;
+import com.sqx.modules.app.entity.UserEntity;
 import com.sqx.modules.app.service.RechargeRecordService;
 import com.sqx.modules.app.service.UserMoneyService;
 import com.sqx.modules.coupon.entity.TbCouponUser;
@@ -148,8 +149,8 @@ public class DataCentreController {
 
     @ApiOperation("查看所有实名认证待审核用户")
     @GetMapping(value = "findAllCertification")
-    public Result findAllCertification(Integer page, Integer limit, String userName, String phone, String checkCertification) {
-        return dataCentreService.findAllCertification(page, limit, userName, phone, checkCertification);
+    public Result findAllCertification(Integer page, Integer limit, String userName, String phone, String checkCertification,Integer riderStationId) {
+        return dataCentreService.findAllCertification(page, limit, userName, phone, checkCertification,riderStationId);
     }
 
     @ApiOperation("实名认证审核")
@@ -168,9 +169,9 @@ public class DataCentreController {
 
     @ApiOperation("接单排行榜")
     @GetMapping(value = "rankingList")
-    public Result rankingList(Integer page, Integer limit, String address, String date, String dateType) {
+    public Result rankingList(Integer page, Integer limit, String address, String date, String dateType,Integer riderStationId) {
 
-        return dataCentreService.rankingList(page, limit, address, date, dateType);
+        return dataCentreService.rankingList(page, limit, address, date, dateType,riderStationId);
     }
 
     @ApiOperation("门店统计")
@@ -277,4 +278,10 @@ public class DataCentreController {
     }
 
 
+    @ApiOperation("编辑实名认证待审核用户")
+    @PostMapping(value = "updateCertification")
+    public Result updateCertification(@RequestBody UserEntity userEntity) {
+        return dataCentreService.updateCertification(userEntity);
+    }
+
 }

src/main/java/com/sqx/modules/datacentre/dao/DataCentreDao.java

@@ -44,13 +44,13 @@ public interface DataCentreDao {
 
     BigDecimal selectTopUpStatistics(@Param("date") String date,@Param("dateType") String dateType);
 
-    IPage<UserEntity> findAllCertification(Page<UserEntity> pages, String userName, String phone, String checkCertification);
+    IPage<UserEntity> findAllCertification(Page<UserEntity> pages, String userName, String phone, String checkCertification,Integer riderStationId);
 
     int checkCertification(@Param("userId") Long userId, @Param("checkCertification") String checkCertification,@Param("checkCertificationMessage") String checkCertificationMessage);
 
     UserEntity findCertification(Long userId);
 
-    IPage<TbIndent> rankingList(Page<TbIndent> pages, String address, String date, String dateType);
+    IPage<TbIndent> rankingList(Page<TbIndent> pages, String address, String date, String dateType,Integer riderStationId);
 
     int selectNewShopCount(@Param("query")ShopCenterQuery query);
 

src/main/java/com/sqx/modules/datacentre/service/DataCentreService.java

@@ -1,6 +1,7 @@
 package com.sqx.modules.datacentre.service;
 
 import com.sqx.common.utils.Result;
+import com.sqx.modules.app.entity.UserEntity;
 import com.sqx.modules.datacentre.query.DataCenterQuery;
 import com.sqx.modules.datacentre.query.ShopCenterQuery;
 import com.sqx.modules.pay.controller.query.CashOutQueryDTO;
@@ -20,13 +21,13 @@ public interface DataCentreService {
 
     Result selectTopUpStatistics(String date, String dateType);
 
-    Result findAllCertification(Integer page, Integer limit, String userName, String phone, String checkCertification);
+    Result findAllCertification(Integer page, Integer limit, String userName, String phone, String checkCertification,Integer riderStationId);
 
     Result checkCertification(Long userId, String checkCertification, String checkCertificationMessage);
 
     Result findCertification(Long userId);
 
-    Result rankingList(Integer page, Integer limit, String address, String date, String dateType);
+    Result rankingList(Integer page, Integer limit, String address, String date, String dateType,Integer riderStationId);
 
     Result selectShopCenter(ShopCenterQuery query);
 
@@ -54,4 +55,5 @@ public interface DataCentreService {
 
     Result presenterVip(Long userId);
 
+    Result updateCertification(UserEntity userEntity);
 }

src/main/java/com/sqx/modules/datacentre/service/impl/DataCentreServiceImpl.java

@@ -170,9 +170,9 @@ public class DataCentreServiceImpl implements DataCentreService {
     }
 
     @Override
-    public Result findAllCertification(Integer page,Integer limit,String userName,String phone, String checkCertification) {
+    public Result findAllCertification(Integer page,Integer limit,String userName,String phone, String checkCertification,Integer riderStationId) {
         Page<UserEntity> pages=new Page<>(page,limit);
-        return Result.success().put("data", new PageUtils(dataCentreDao.findAllCertification(pages, userName, phone,checkCertification )));
+        return Result.success().put("data", new PageUtils(dataCentreDao.findAllCertification(pages, userName, phone,checkCertification, riderStationId)));
     }
 
     @Transactional
@@ -227,9 +227,9 @@ public class DataCentreServiceImpl implements DataCentreService {
     }
 
     @Override
-    public Result rankingList(Integer page, Integer limit, String address,String date, String dateType) {
+    public Result rankingList(Integer page, Integer limit, String address,String date, String dateType,Integer riderStationId) {
         Page<TbIndent> pages=new Page<>(page,limit);
-        PageUtils pageUtils = new PageUtils(dataCentreDao.rankingList(pages, address, date, dateType));
+        PageUtils pageUtils = new PageUtils(dataCentreDao.rankingList(pages, address, date, dateType,riderStationId));
         return Result.success().put("data", pageUtils);
     }
 
@@ -415,4 +415,11 @@ public class DataCentreServiceImpl implements DataCentreService {
     }
 
 
+    @Override
+    public Result updateCertification(UserEntity userEntity) {
+        userDao.updateById(userEntity);
+        return Result.success();
+    }
+
+
 }

src/main/java/com/sqx/modules/errand/entity/TbIndent.java

@@ -264,7 +264,9 @@ public class TbIndent implements Serializable {
     @TableField(exist = false)
     private Integer evaluateMessage;
 
-
+    //	站点名称
+    @TableField(exist = false)
+    private String stationName;
 
     public TbIndent() {}
 }

src/main/java/com/sqx/modules/order/controller/OrderController.java

@@ -47,8 +47,8 @@ public class OrderController extends AbstractController {
     public Result selectAllOrderAdmin(Integer page, Integer limit, Integer status, String phone, Long shopId, String userName,
                                       String orderNumber, String indentStatus, String reservationFlag,
                                       @ApiParam("1上门 2骑手配送 3商家配送 不传查所有") Integer orderType,
-                                      String shopName, String riderPhone, String startTime, String endTime, String payStartTime, String payEndTime) {
-        return appOrderService.selectAllOrderAdmin(page, limit, status, phone, shopId, userName, orderNumber, orderType, shopName, riderPhone, indentStatus, reservationFlag, startTime, endTime, payStartTime, payEndTime);
+                                      String shopName, String riderPhone, String startTime, String endTime, String payStartTime, String payEndTime,Integer riderStationId) {
+        return appOrderService.selectAllOrderAdmin(page, limit, status, phone, shopId, userName, orderNumber, orderType, shopName, riderPhone, indentStatus, reservationFlag, startTime, endTime, payStartTime, payEndTime,riderStationId);
     }
 
 //    @GetMapping("excelOrder")

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

@@ -29,7 +29,7 @@ public interface AppOrderDao extends BaseMapper<TbOrder> {
     IPage<TbOrder> selectAllOrderAdmin(Page<TbOrder> pages,@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("indentStatus") String indentStatus, @Param("reservationFlag") String reservationFlag,
-                                       @Param("startTime") String startTime,@Param("endTime") String endTime, @Param("payStartTime") String payStartTime, @Param("payEndTime") String payEndTime);
+                                       @Param("startTime") String startTime,@Param("endTime") String endTime, @Param("payStartTime") String payStartTime, @Param("payEndTime") String payEndTime,@Param("riderStationId") Integer riderStationId);
     @DataSource("dynamic")
     List<TbOrder> excelAllOrderAdmin(@Param("status") Integer status,@Param("phone") String phone, @Param("shopId") Long shopId,
                                        @Param("userName") String userName, @Param("orderNumber") String orderNumber,

src/main/java/com/sqx/modules/order/entity/TbOrder.java

@@ -274,5 +274,14 @@ public class TbOrder implements Serializable {
     @ApiModelProperty("导出商品总价")
     private Double sumPrice;
 
+    @TableField(exist = false)
+    @ApiModelProperty("站点id")
+    private Integer riderStationId;
+
+    @TableField(exist = false)
+    @ApiModelProperty("站点名称")
+    private String stationName;
+
+
     public TbOrder() {}
 }

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

@@ -32,7 +32,7 @@ public interface AppOrderService extends IService<TbOrder> {
     Result selectAllOrder(Integer page, Integer limit, Integer status, String phone, Long shopId, String userName, String orderNumber, Integer orderType,String shopName);
 
     Result selectAllOrderAdmin(Integer page, Integer limit, Integer status, String phone, Long shopId, String userName,
-                               String orderNumber, Integer orderType,String shopName,String riderPhone, String indentStatus, String reservationFlag, String startTime, String endTime, String payStartTime, String payEndTime);
+                               String orderNumber, Integer orderType,String shopName,String riderPhone, String indentStatus, String reservationFlag, String startTime, String endTime, String payStartTime, String payEndTime,Integer riderStationId);
 
     ExcelData excelAllOrderAdmin(Integer status, String phone, Long shopId,
                                  String userName, String orderNumber, Integer orderType, String shopName,

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

@@ -1296,10 +1296,10 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
     @Override
     public Result selectAllOrderAdmin(Integer page, Integer limit, Integer status, String phone, Long shopId, String userName,
                                       String orderNumber, Integer orderType, String shopName, String riderPhone, String indentStatus,
-                                      String reservationFlag, String startTime, String endTime, String payStartTime, String payEndTime) {
+                                      String reservationFlag, String startTime, String endTime, String payStartTime, String payEndTime,Integer riderStationId) {
         Page<TbOrder> pages = new Page<>(page, limit);
         IPage<TbOrder> tbOrderIPage = appOrderDao.selectAllOrderAdmin(pages, status, phone, shopId, userName, orderNumber,
-                orderType, shopName, riderPhone, indentStatus, reservationFlag, startTime,endTime, payStartTime, payEndTime);
+                orderType, shopName, riderPhone, indentStatus, reservationFlag, startTime,endTime, payStartTime, payEndTime,riderStationId);
         for (int i = 0; i < tbOrderIPage.getRecords().size(); i++) {
             List<OrderGoods> orderGoodsList = orderGoodsDao.selectList(new QueryWrapper<OrderGoods>()
                     .eq("order_id", tbOrderIPage.getRecords().get(i).getOrderId()));

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

@@ -39,6 +39,9 @@ public class CashOutQueryDTO extends PageQuery {
     @ApiModelProperty("查询结束时间")
     private String endTime;
 
+    @ApiModelProperty("骑手所在站点id")
+    private String riderStationId;
+
     public String toStrCode() {
         return
 //                ","+bankCardNo+

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

@@ -115,6 +115,9 @@ public class WxErrRiderServiceImpl implements WxErrRiderService {
         }
         userEntity.setUserId(userId);
         userEntity.setCheckNumber(generalOrder);
+//        因为添加站点，所以需要更新tb_user表
+        userDao.updateById(userEntity);
+
         CommonInfo one = commonInfoService.findOne(273);
         double money = Double.parseDouble(one.getValue());
         PayDetails payDetails = new PayDetails();

src/main/java/com/sqx/modules/pay/vo/CashOutVO.java

@@ -14,4 +14,10 @@ public class CashOutVO extends CashOut {
      * 店铺名称
      */
     private String shopName;
+
+    /**
+     * 站点名称
+     */
+    private String stationName;
+
 }

src/main/java/com/sqx/modules/riderStation/controller/AdminRiderStationController.java

@@ -0,0 +1,58 @@
+package com.sqx.modules.riderStation.controller;
+
+import com.sqx.common.utils.Result;
+import com.sqx.modules.goods.service.GoodsShopService;
+import com.sqx.modules.riderStation.entity.RiderStation;
+import com.sqx.modules.riderStation.service.RiderStationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags={"管理端-骑手站点"})
+@RestController
+@RequestMapping("/admin/riderStation")
+public class AdminRiderStationController {
+
+    @Autowired
+    private RiderStationService riderStationService;
+
+    @ApiOperation("添加站点")
+    @PostMapping(value = "/saveStation")
+    public Result saveStation(@RequestBody RiderStation riderStation){
+        return riderStationService.saveStation(riderStation);
+    }
+
+    @ApiOperation("查询站点")
+    @GetMapping(value = "/selectStationList")
+    public Result selectStationList(Integer page,Integer size){
+        return riderStationService.selectStationList(page,size);
+    }
+
+    @ApiOperation("修改站点")
+    @PostMapping(value = "/updateStation")
+    public Result updateStation(@RequestBody RiderStation riderStation){
+        return riderStationService.updateStation(riderStation);
+    }
+
+    @ApiOperation("删除站点")
+    @GetMapping(value = "/removeStation")
+    public Result removeStation(Integer id){
+        riderStationService.removeById(id);
+        return  Result.success();
+    }
+
+    @ApiOperation("站点下拉框")
+    @GetMapping(value = "/stationList")
+    public Result stationList(){
+        return riderStationService.stationList();
+    }
+
+
+    @ApiOperation("骑手所在站点")
+    @GetMapping(value = "/getRiderStationName")
+    public Result getRiderStationName(Integer userId){
+        System.out.println("userId = " + userId);
+        return riderStationService.getRiderStationName(userId);
+    }
+}

src/main/java/com/sqx/modules/riderStation/dao/RiderStationDao.java

@@ -0,0 +1,9 @@
+package com.sqx.modules.riderStation.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sqx.modules.riderStation.entity.RiderStation;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface RiderStationDao extends BaseMapper<RiderStation> {
+}

src/main/java/com/sqx/modules/riderStation/entity/RiderStation.java

@@ -0,0 +1,21 @@
+package com.sqx.modules.riderStation.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("rider_station")
+public class RiderStation {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+
+    @ApiModelProperty("主键id")
+    private Long id;
+
+    @ApiModelProperty("站点名称")
+    private String stationName;
+}

src/main/java/com/sqx/modules/riderStation/service/RiderStationService.java

@@ -0,0 +1,20 @@
+package com.sqx.modules.riderStation.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sqx.common.utils.Result;
+import com.sqx.modules.riderStation.controller.AdminRiderStationController;
+import com.sqx.modules.riderStation.entity.RiderStation;
+import com.sqx.modules.shop.entity.SearchHistory;
+
+public interface RiderStationService extends IService<RiderStation> {
+
+    Result saveStation(RiderStation riderStation);
+
+    Result selectStationList(Integer page, Integer size);
+
+    Result stationList();
+
+    Result getRiderStationName(Integer userId);
+
+    Result updateStation(RiderStation riderStation);
+}

src/main/java/com/sqx/modules/riderStation/service/impl/RiderStationServiceImpl.java

@@ -0,0 +1,87 @@
+package com.sqx.modules.riderStation.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.api.R;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sqx.common.utils.PageUtils;
+import com.sqx.common.utils.Result;
+import com.sqx.modules.app.dao.UserDao;
+import com.sqx.modules.app.entity.UserEntity;
+import com.sqx.modules.riderStation.dao.RiderStationDao;
+import com.sqx.modules.riderStation.entity.RiderStation;
+import com.sqx.modules.riderStation.service.RiderStationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class RiderStationServiceImpl extends ServiceImpl<RiderStationDao, RiderStation> implements RiderStationService {
+
+    @Autowired
+    private UserDao userDao;
+
+    @Override
+    public Result saveStation(RiderStation riderStation) {
+        String stationName = riderStation.getStationName();
+        LambdaQueryWrapper<RiderStation> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(RiderStation::getStationName,stationName);
+        RiderStation station = this.getOne(wrapper);
+        if (ObjectUtils.isNotEmpty(station)) {
+            return Result.error("该站点已存在");
+        }
+        this.save(riderStation);
+        return Result.success();
+    }
+
+    @Override
+    public Result selectStationList(Integer page, Integer size) {
+        IPage<RiderStation> riderStationIPage = this.page(new Page<RiderStation>(page, size));
+        PageUtils pageUtils = new PageUtils(riderStationIPage);
+        return Result.success().put("data", pageUtils);
+    }
+
+    @Override
+    public Result stationList() {
+        List<RiderStation> list = this.list();
+        return Result.success().put("data", list);
+    }
+
+    @Override
+    public Result getRiderStationName(Integer userId) {
+        UserEntity userEntity = userDao.selectById(userId);
+        if (ObjectUtils.isEmpty(userEntity)) {
+            return Result.error("用户不存在");
+        }
+        Integer riderStationId = userEntity.getRiderStationId();
+
+        RiderStation riderStation = this.getById(riderStationId);
+
+        return Result.success().put("data",riderStation);
+    }
+
+    @Override
+    public Result updateStation(RiderStation riderStation) {
+        Long id = riderStation.getId();
+        String stationName = riderStation.getStationName();
+
+        LambdaQueryWrapper<RiderStation> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(RiderStation::getStationName,stationName);
+        RiderStation station = this.getOne(wrapper);
+
+        if (ObjectUtils.isNotEmpty(station)) {
+            Long id1 = station.getId();
+            if (!id.equals(id1)) {
+                return Result.error("所修改的站点已存在");
+            }
+        }
+        this.updateById(riderStation);
+
+        return Result.success();
+    }
+
+}

src/main/java/com/sqx/modules/utils/fieYun/FeiYunUtils.java

@@ -965,7 +965,14 @@ public class FeiYunUtils {
                 }
                 //endregion
                 if (goods_name_start != null) {
-                    stringBuilder.append(goods_name_start).append("名称").append(goods_name_end).append("　　　  ");
+                    //长度十个字
+                    stringBuilder.append(goods_name_start).append("名称").append(goods_name_end);
+                    if (sum_money_start != null) {
+                        stringBuilder.append("　　　  ");
+                    } else {
+                        stringBuilder.append("　　　     ");
+                    }
+
                 }
 
                 if (goods_price_start != null) {
@@ -997,7 +1004,19 @@ public class FeiYunUtils {
                         name = orderGoods.getGoodsName();
                     }
                     stringBuilder.append(goods_name_start).append(name).append(goods_name_end);
-                    stringBuilder.append("　　　　");
+
+                    StringBuilder space = new StringBuilder();
+                    if (sum_money_start != null) {
+                        for (int len = (name.length() - 1); len < 7; len++) {
+                            space.append(" ");
+                        }
+                    }else{
+                        for (int len = (name.length() - 1); len < 10; len++) {
+                            space.append(" ");
+                        }
+                    }
+
+                    stringBuilder.append(space.toString());
                     stringBuilder.append(goods_price_start).append(orderGoods.getGoodsPrice()).append(goods_price_end);
                     if (orderGoods.getGoodsPrice().doubleValue() < 10) {
                         stringBuilder.append("　   ");
@@ -1510,7 +1529,7 @@ public class FeiYunUtils {
 
             String content = stringBuilder.toString();
 
-            doRequest(sn, content, tbOrder.getStatus(), isAppend,tbOrder.getOrderId());
+            doRequest(sn, content, tbOrder.getStatus(), isAppend, tbOrder.getOrderId());
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -1523,7 +1542,7 @@ public class FeiYunUtils {
     /**
      * 小票机打印订单接口
      *
-     * @param sn       打印机编号
+     * @param sn 打印机编号
      * @return 成功：{"msg":"ok","ret":0,"data":"xxxxxxx_xxxxxxxx_xxxxxxxx","serverExecutedTime":5}
      * 失败：{"msg":"错误描述","ret":非0,"data":"null","serverExecutedTime":5}
      */
@@ -1539,7 +1558,7 @@ public class FeiYunUtils {
             sb.append("<BR>");
             sb.append("<CUT>");
 
-            doRequest(sn, sb.toString(),5,null, tbOrder.getOrderId());
+            doRequest(sn, sb.toString(), 5, null, tbOrder.getOrderId());
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -1584,7 +1603,7 @@ public class FeiYunUtils {
 
                 //region 添加订单打印状态
                 int updateData = appOrderService.updateOrderPrint(orderId);
-                if(updateData <= 0){
+                if (updateData <= 0) {
                     log.error("更新订单打印状态失败，订单ID为：{}", orderId);
                 }
 
@@ -1593,8 +1612,8 @@ public class FeiYunUtils {
                 pid.setOrderId(orderId);
                 pid.setIsAppend(isAppend == null ? "否" : (isAppend.intValue() == 1 ? "是" : "否"));
                 Result detailResult = printInfoDetailService.insertPrintInfoDetail(pid);
-                if((int)detailResult.get("code") != 0 ){
-                    log.error("记录打印数据失败，订单ID为："+ orderId+"；是否补打："+isAppend);
+                if ((int) detailResult.get("code") != 0) {
+                    log.error("记录打印数据失败，订单ID为：" + orderId + "；是否补打：" + isAppend);
                 }
                 //endregion
 
@@ -2100,36 +2119,36 @@ public class FeiYunUtils {
 
 
     /**
-     *    飞鹅技术支持-2020-03-25
-     *    #########################################################################################################
-     *    一，纯数字条件下：
-     *        58mm打印机最大支持28位纯数字，80mm打印机最大支持46位纯数字，超出无效
-     *
-     *        26-28位数字条形码，在数字中不可以出现2个及以上连续的0存在
-     *        23-25位数字条形码，在数字中不可以出现3个及以上连续的0存在
-     *        21-22位数字条形码，在数字中不可以出现4个及以上连续的0存在
-     *        19-20位数字条形码，在数字中不可以出现6个及以上连续的0存在
-     *        17-18位数字条形码，在数字中不可以出现8个及以上连续的0存在
-     *        15-16位数字条形码，在数字中不可以出现10个及以上连续的0存在
-     *        少于或等于14位数字的条形码，0的数量没有影响
-     *    #########################################################################################################
-     *    二，非纯数字混合条件下：
-     *        58mm打印机最大支持14位字符，80mm打印机最大支持23位字符，超出无效
-     *
-     *        支持数字，大小写字母，特殊字符例如:  !@#$%^&*()-=+_
-     *    #########################################################################################################
-     *    把条形码函数返回值，调用飞鹅云打印接口发给打印机打印
+     * 飞鹅技术支持-2020-03-25
+     * #########################################################################################################
+     * 一，纯数字条件下：
+     * 58mm打印机最大支持28位纯数字，80mm打印机最大支持46位纯数字，超出无效
+     * <p>
+     * 26-28位数字条形码，在数字中不可以出现2个及以上连续的0存在
+     * 23-25位数字条形码，在数字中不可以出现3个及以上连续的0存在
+     * 21-22位数字条形码，在数字中不可以出现4个及以上连续的0存在
+     * 19-20位数字条形码，在数字中不可以出现6个及以上连续的0存在
+     * 17-18位数字条形码，在数字中不可以出现8个及以上连续的0存在
+     * 15-16位数字条形码，在数字中不可以出现10个及以上连续的0存在
+     * 少于或等于14位数字的条形码，0的数量没有影响
+     * #########################################################################################################
+     * 二，非纯数字混合条件下：
+     * 58mm打印机最大支持14位字符，80mm打印机最大支持23位字符，超出无效
+     * <p>
+     * 支持数字，大小写字母，特殊字符例如:  !@#$%^&*()-=+_
+     * #########################################################################################################
+     * 把条形码函数返回值，调用飞鹅云打印接口发给打印机打印
      */
     private static String getDigitBarCode(String input) {
         String chr = "";
         String laststr = "";
-        byte[] codeB = { 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39 }; // 匹配字符集B
-        byte[] codeC = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+        byte[] codeB = {0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39}; // 匹配字符集B
+        byte[] codeC = {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
                 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20,
                 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31,
                 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42,
                 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53,
-                0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, 0x60, 0x61, 0x62, 0x63 }; // 匹配字符集C
+                0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, 0x60, 0x61, 0x62, 0x63}; // 匹配字符集C
         int length = input.length();
         byte[] b = new byte[100];
         b[0] = 0x1b;
@@ -2150,7 +2169,7 @@ public class FeiYunUtils {
         b[15] = (byte) (length + 2); // 得出条形码长度
         b[16] = 0x7b;
         b[17] = 0x42;
-        boolean result=input.matches("[0-9]+");//判断是否为纯数字
+        boolean result = input.matches("[0-9]+");//判断是否为纯数字
         if (length > 14 && result == true) {
             b[17] = 0x43;
             int j = 0;
@@ -2164,18 +2183,18 @@ public class FeiYunUtils {
                 j = j + 2;
                 if (iindex == 0) {
                     chr = "";
-                    if(b[key + i - 1] == '0' && b[key + i - 2] == '0') {
+                    if (b[key + i - 1] == '0' && b[key + i - 2] == '0') {
                         b[key + i] = codeB[0];
-                        b[key + i+1] = codeB[0];
-                        key+=1;
-                    }else {
-                        if(b[key + i-1] == 'C' && b[key + i-2] == '{' ){//判断前面的为字符集C时转换字符集B
+                        b[key + i + 1] = codeB[0];
+                        key += 1;
+                    } else {
+                        if (b[key + i - 1] == 'C' && b[key + i - 2] == '{') {//判断前面的为字符集C时转换字符集B
                             b[key + i - 2] = 0x7b;
                             b[key + i - 1] = 0x42;
                             b[key + i] = codeB[0];
                             b[key + i + 1] = codeB[0];
                             key += 1;
-                        }else{
+                        } else {
                             b[key + i] = 0x7b;
                             b[key + i + 1] = 0x42;
                             b[key + i + 2] = codeB[0];
@@ -2190,19 +2209,19 @@ public class FeiYunUtils {
                         b[key + i + 1] = 0x43;
                         b[key + i + 2] = codeC[iindex];
                         key += 2;
-                    }else {
+                    } else {
                         chr = "";
                         b[key + i] = codeC[iindex];
-                        if(iindex == 48) chr = "chr";//判断chr(48)等于0的情况
+                        if (iindex == 48) chr = "chr";//判断chr(48)等于0的情况
                     }
                 }
             }
             int lastKey = getLastIndex(b);
             if (length % 2 > 0) {
                 int lastnum = Integer.valueOf(input.substring(input.length() - 1)); // 取得字符串的最后一个数字
-                if(b[lastKey] == '0' && b[lastKey-1] == '0'){//判断前面的为字符集B,此时不需要转换字符集
+                if (b[lastKey] == '0' && b[lastKey - 1] == '0') {//判断前面的为字符集B,此时不需要转换字符集
                     b[lastKey + 1] = codeB[lastnum];
-                }else{
+                } else {
                     b[lastKey + 1] = 0x7b;
                     b[lastKey + 2] = 0x42;
                     b[lastKey + 3] = codeB[lastnum];
@@ -2216,14 +2235,14 @@ public class FeiYunUtils {
             str = new String(b);
             laststr = str;
 
-            String Last_two = input.substring(input.length()-2,input.length());
+            String Last_two = input.substring(input.length() - 2, input.length());
             int Last_two_int = 0;
             Last_two_int = Integer.valueOf(Last_two);
-            if(Last_two_int > 32) {
+            if (Last_two_int > 32) {
                 laststr = laststr.trim().substring(1);
             }
         } else { // 1-14位数字的条形码进来这个区间
-            b[15] = (byte) (length+2);
+            b[15] = (byte) (length + 2);
             laststr = new String(b);
             laststr = laststr.substring(0, 18);
             laststr += input;

src/main/resources/mapper/dataCentre/dataCenterMapper.xml

@@ -91,7 +91,7 @@
         select count(*)
         from tb_indent
         where rider_user_id = #{userId}
-          and indent_state in (2,3,4,6,11)
+          and indent_state in (2, 3, 4, 6, 11)
           and date_format(create_time, '%Y-%m') = date_format(#{date}, '%Y-%m')
     </select>
 
@@ -132,20 +132,25 @@
     </select>
 
     <select id="findAllCertification" resultType="com.sqx.modules.app.entity.UserEntity">
-        select * from tb_user where 1 = 1
+        select tu.*,rs.station_name AS stationName from tb_user tu
+        left join rider_station rs on tu.rider_station_id=rs.id
+        where 1 = 1
         <if test="phone!=null and phone!=''">
-            and phone=#{phone}
+            and tu.phone=#{phone}
         </if>
         <if test="userName!=null and userName!=''">
-            and user_name = #{userName}
+            and tu.user_name = #{userName}
         </if>
         <if test="checkCertification!=null and checkCertification!='' and checkCertification!='-1' ">
-            and check_certification = #{checkCertification}
+            and tu.check_certification = #{checkCertification}
         </if>
         <if test="checkCertification!=null or checkCertification=='-1'">
-            and check_certification in (0,1,2)
+            and tu.check_certification in (0,1,2)
         </if>
-        order by audit_time desc
+        <if test="riderStationId!=null and riderStationId!=''">
+            and tu.rider_station_id = #{riderStationId}
+        </if>
+        order by tu.audit_time desc
     </select>
 
     <update id="checkCertification">
@@ -170,12 +175,13 @@
         ( SELECT @rank_num := 0 ) r,
         ( SELECT ifnull( sum( rider_money ), 0 ) AS moneyOrder, i.rider_user_id, u.nick_name as nickName, u.avatar as
         avatar,
-        i.user_province as userProvince, i.user_city as userCity, i.user_district as userDistrict
+        i.user_province as userProvince, i.user_city as userCity, i.user_district as userDistrict,rs.station_name as stationName
         FROM tb_indent i left join tb_user u on i.rider_user_id = u.user_id
+        left join rider_station rs on u.rider_station_id=rs.id
         WHERE i.rider_user_id IS NOT NULL
         <if test="address!=null and address!=''">
-            and (i.user_province like concat('%',#{address},'%') or i.user_city like concat('%',#{address},'%') or
-            i.user_district like concat('%',#{address},'%'))
+                and (i.user_province like concat('%',#{address},'%') or i.user_city like concat('%',#{address},'%') or
+                i.user_district like concat('%',#{address},'%'))
         </if>
         <if test="dateType=='day'">
             and date_format(i.create_time,'%Y-%m-%d')=date_format(#{date},'%Y-%m-%d')
@@ -186,6 +192,9 @@
         <if test="dateType=='year'">
             and date_format(i.create_time,'%Y')=date_format(#{date},'%Y')
         </if>
+        <if test="riderStationId != null and riderStationId != ''">
+            and u.rider_station_id=#{riderStationId}
+        </if>
         GROUP BY i.rider_user_id ) a
         ORDER BY moneyOrder DESC
     </select>
@@ -215,9 +224,10 @@
         @rank_num := @rank_num + 1 AS rankNum
         FROM
         ( SELECT @rank_num := 0 ) r,
-        ( SELECT ifnull( sum( pay_money ), 0 ) AS shopMoney, tor.shop_id , u.shop_name,gp.id as shopType,gp.shop_type_name as shopTypeName
+        ( SELECT ifnull( sum( pay_money ), 0 ) AS shopMoney, tor.shop_id , u.shop_name,gp.id as
+        shopType,gp.shop_type_name as shopTypeName
         FROM tb_order tor left join goods_shop u on tor.shop_id = u.shop_id
-        left join shop_type gp on  gp.id=u.shop_type_id
+        left join shop_type gp on gp.id=u.shop_type_id
         WHERE tor.shop_id IS NOT NULL and tor.status = 4
         <if test="query.startTime != null and query.startTime !=''">
             and tor.pay_time >= #{query.startTime}
@@ -247,9 +257,10 @@
         @rank_num := @rank_num + 1 AS Rank
         FROM
         ( SELECT @rank_num := 0 ) r,
-        ( SELECT ifnull( sum( pay_money ), 0 ) AS shopMoney, tor.shop_id , u.shop_name,gp.id as shopType,gp.shop_type_name as shopTypeName
+        ( SELECT ifnull( sum( pay_money ), 0 ) AS shopMoney, tor.shop_id , u.shop_name,gp.id as
+        shopType,gp.shop_type_name as shopTypeName
         FROM tb_order tor left join goods_shop u on tor.shop_id = u.shop_id
-        left join shop_type gp on  gp.id=u.shop_type_id
+        left join shop_type gp on gp.id=u.shop_type_id
         WHERE tor.shop_id IS NOT NULL and tor.status = 4
         <if test="query.startTime != null and query.startTime !=''">
             and tor.pay_time >= #{query.startTime}

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

@@ -86,7 +86,7 @@
         shopPhone,
         tiu.user_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
+        apr.discount_amount as activityDiscountAmount, ai.title activityTitle,tiu.rider_station_id as riderStationId,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
@@ -95,6 +95,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
         where 1 = 1
         <if test="riderPhone!=null and riderPhone!=''">
             and tiu.phone =#{riderPhone}
@@ -141,6 +142,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,13 +291,18 @@
             <if test="params.openBank != null and params.openBank != '' and params.openBank != 'null'">
                 and co.open_bank = #{params.openBank}
             </if>
+            <if test="params.riderStationId != null">
+                and tu.rider_station_id = #{params.riderStationId}
+            </if>
         </where>
     </sql>
 
     <select id="selectCashOutList" 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>