Merge remote-tracking branch 'origin/dev-rht-pay' into dev-rht-pay

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

@@ -19,5 +19,9 @@ public class CashOutVO extends CashOut {
      * 站点名称
      */
     private String stationName;
+    /**
+     * 商户号
+     */
+    private String mchId;
 
 }

src/main/java/com/sqx/modules/shop/entity/ShopBankCardInfo.java

@@ -1,9 +1,6 @@
 package com.sqx.modules.shop.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -60,4 +57,8 @@ public class ShopBankCardInfo implements Serializable {
     @ApiModelProperty(name = "删除标识", notes = "1 是 0否")
     @Pattern(regexp = "(0|1)", message = "删除标识只能为0或1")
     private String delFlag;
+
+    @ApiModelProperty("商户号")
+    @TableField(exist = false)
+    private String mchId;
 }

src/main/java/com/sqx/modules/shop/service/impl/ShopBankCardInfoServiceImpl.java

@@ -8,6 +8,8 @@ import com.sqx.common.exception.SqxException;
 import com.sqx.modules.app.entity.UserEntity;
 import com.sqx.modules.app.service.UserService;
 import com.sqx.modules.datacentre.entity.SysUserShop;
+import com.sqx.modules.goods.entity.GoodsShop;
+import com.sqx.modules.goods.service.GoodsShopService;
 import com.sqx.modules.shop.dao.ShopBankCardInfoDao;
 import com.sqx.modules.shop.entity.ShopBankCardInfo;
 import com.sqx.modules.shop.service.ShopBankCardInfoService;
@@ -21,6 +23,7 @@ public class ShopBankCardInfoServiceImpl extends ServiceImpl<ShopBankCardInfoDao
 
     private final UserService userService;
     private final SysUserShopService userShopService;
+    private final GoodsShopService goodsShopService;
 
 
     @Override
@@ -44,10 +47,11 @@ public class ShopBankCardInfoServiceImpl extends ServiceImpl<ShopBankCardInfoDao
         LambdaQueryWrapper<ShopBankCardInfo> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(ShopBankCardInfo::getShopId, shopId);
         ShopBankCardInfo cardInfo = this.getOne(queryWrapper);
-
         if (ObjectUtil.isNull(cardInfo)) {
             throw new SqxException("当前店铺未录入银行卡信息");
         }
+        GoodsShop goodsShop=goodsShopService.getById(shopId);
+        cardInfo.setMchId(goodsShop==null?null:goodsShop.getMchId());
         return cardInfo;
     }
 

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,gh.mch_id as mchId
         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