激活码列表返回结构修改

cash-service/account-service/src/main/resources/mapper/MerchantRegisterMapper.xml

@@ -4,4 +4,21 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.czg.service.account.mapper.MerchantRegisterMapper">
 
+    <select id="pageInfo" resultType="com.czg.account.vo.MerchantRegisterVO">
+        select a.*, b.shop_name, b.phone, b.register_type, b.expire_time
+        from tb_merchant_register as a
+                 left join tb_shop_info as b on a.shop_id = b.id
+        <where>
+            <if test="state != null">
+                a.status=#{state}
+            </if>
+            <if test="startTime != null and startTime != ''">
+                a.create_time >= #{startTime}
+            </if>
+
+            <if test="endTime != null and endTime != ''">
+                a.create_time &lt;= #{endTime}
+            </if>
+        </where>
+    </select>
 </mapper>