Accept Merge Request #29: (dev-lzl -> dev-测试环境分支不要从这拉代码)

Merge Request: 合并

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

src/main/java/com/sqx/modules/datacentre/controller/app/AppRiderBankCardInfoController.java

@@ -0,0 +1,25 @@
+package com.sqx.modules.datacentre.controller.app;
+
+import com.sqx.common.utils.Result;
+import com.sqx.modules.datacentre.service.RiderBankCardInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags={"骑手银行卡信息"})
+@RestController
+@RequestMapping("/app/rider/bank")
+public class AppRiderBankCardInfoController {
+
+    @Autowired
+    private RiderBankCardInfoService riderBankCardInfoService;
+
+    @ApiOperation("查询单个骑手银行卡信息")
+    @GetMapping("/getUserId")
+    public Result getUserIdCardInfo(Long userId) {
+        return riderBankCardInfoService.getUserIdCardInfo(userId);
+    }
+}

src/main/java/com/sqx/modules/pay/entity/CashOut.java

@@ -117,6 +117,12 @@ public class CashOut implements Serializable {
     @ApiModelProperty(name = "银行卡开户行")
     private String openBank ;
 
+    /**
+     * 用户手机号
+     */
+    private String phone;
+
+
     @TableField(exist = false)
     private String userName;
 

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

@@ -20,4 +20,9 @@ public class CashOutVO extends CashOut {
      */
     private String stationName;
 
+    /**
+     * 用户手机号
+     */
+    private String phoneNumber;
+
 }

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

@@ -298,7 +298,7 @@
     </sql>
 
     <select id="selectCashOutList" resultType="com.sqx.modules.pay.vo.CashOutVO">
-        select gh.shop_name, co.*,rs.station_name as stationName,tu.user_name as userName
+        select gh.shop_name, co.*,rs.station_name as stationName,tu.user_name as userName,tu.phone as phoneNumber
         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