java110 4 年 前
コミット
f42983b35c

+ 9 - 0
java110-bean/src/main/java/com/java110/dto/shopVipAccount/ShopVipAccountDto.java

@@ -31,6 +31,7 @@ public class ShopVipAccountDto extends PageDto implements Serializable {
     private String vipAcctId;
     private String vipAcctId;
     private String vipId;
     private String vipId;
     private String acctType;
     private String acctType;
+    private String acctTypeName;
     private String shopId;
     private String shopId;
     private String acctName;
     private String acctName;
     private String storeId;
     private String storeId;
@@ -113,4 +114,12 @@ public class ShopVipAccountDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
         this.statusCd = statusCd;
     }
     }
+
+    public String getAcctTypeName() {
+        return acctTypeName;
+    }
+
+    public void setAcctTypeName(String acctTypeName) {
+        this.acctTypeName = acctTypeName;
+    }
 }
 }

+ 2 - 1
java110-db/src/main/resources/mapper/acct/ShopVipAccountServiceDaoImplMapper.xml

@@ -19,8 +19,9 @@
     <select id="getShopVipAccountInfo" parameterType="Map" resultType="Map">
     <select id="getShopVipAccountInfo" parameterType="Map" resultType="Map">
         select t.amount,t.vip_acct_id,t.vip_acct_id vipAcctId,t.vip_id,t.vip_id vipId,t.acct_type,t.acct_type
         select t.amount,t.vip_acct_id,t.vip_acct_id vipAcctId,t.vip_id,t.vip_id vipId,t.acct_type,t.acct_type
         acctType,t.status_cd,t.status_cd statusCd,t.shop_id,t.shop_id shopId,t.acct_name,t.acct_name
         acctType,t.status_cd,t.status_cd statusCd,t.shop_id,t.shop_id shopId,t.acct_name,t.acct_name
-        acctName,t.store_id,t.store_id storeId
+        acctName,t.store_id,t.store_id storeId,t.create_time createTime,td.`name` acctTypeName
         from shop_vip_account t
         from shop_vip_account t
+        LEFT JOIN t_dict td on td.status_cd = t.acct_type and td.table_name = 'shop_vip_account' and td.table_columns = 'acct_type'
         where 1 =1
         where 1 =1
         <if test="amount !=null and amount != ''">
         <if test="amount !=null and amount != ''">
             and t.amount= #{amount}
             and t.amount= #{amount}