线上支付供应商账号bugfix

src/main/java/com/caimei365/order/mapper/OrderClubMapper.java

@@ -482,10 +482,19 @@ public interface OrderClubMapper {
 
     void insertVoucherImage(VoucherImageDto voucherImageDto);
 
+    Integer getShopAccountOwnership(@Param("shopId") Integer shopId);
+
     /**
      * 查询供应商银行卡信息
      * @param shopId
      * @return
      */
     ShopPo getShopBankAccount(@Param("shopId") Integer shopId);
+
+    /**
+     * 查询供应商采美银行卡信息
+     * @param shopId
+     * @return
+     */
+    ShopPo getShopCmBankAccount(@Param("shopId") Integer shopId);
 }

src/main/java/com/caimei365/order/service/impl/OrderClubServiceImpl.java

@@ -1160,7 +1160,15 @@ public class OrderClubServiceImpl implements OrderClubService {
      */
     @Override
     public ResponseJson<ShopPo> getShopBankAccount(Integer shopId) {
-        return ResponseJson.success(orderClubMapper.getShopBankAccount(shopId));
+        // 账号归属 0采美 1 供应商
+        Integer accountOwnership = orderClubMapper.getShopAccountOwnership(shopId);
+        ShopPo shop = null;
+        if (1 == accountOwnership) {
+            shop = orderClubMapper.getShopBankAccount(shopId);
+        } else {
+            shop = orderClubMapper.getShopCmBankAccount(shopId);
+        }
+        return ResponseJson.success(shop);
     }
 
 }

src/main/resources/mapper/OrderClubMapper.xml

@@ -1131,7 +1131,14 @@
         values (#{voucherId},#{img})
     </insert>
 
+    <select id="getShopAccountOwnership" resultType="java.lang.Integer">
+        select ifnull(AccountOwnership, 0) as AccountOwnership from shop where shopId = #{shopId}
+    </select>
     <select id="getShopBankAccount" resultType="com.caimei365.order.model.po.ShopPo">
         SELECT shopId, name, bankAccount, bankAccountName, bankName FROM shop WHERE shopId = #{shopId}
     </select>
+
+    <select id="getShopCmBankAccount" resultType="com.caimei365.order.model.po.ShopPo">
+        SELECT shopId, name, cmBankAccount as bankAccount, cmBankAccountName as bankAccountName, cmBankName as bankName FROM shop WHERE shopId = #{shopId}
+    </select>
 </mapper>