海外短信、短信套餐包、国内短信、服务市场统计余额支付数据

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/utils/chart/BillingInternationSmsRecord.java

@@ -12,7 +12,7 @@ import com.gic.enterprise.qo.HomeStatisticsQO;
 import com.gic.enterprise.service.BillingInternationalSmsRecordService;
 
 /**
- * 余额支付消费明细
+ * 海外短信消费明细
  * @ClassName: BillingAccountBalanceRecord

  * @Description: 

  * @author guojuxing


gic-platform-enterprise-service/src/main/resources/mapper/TabBillingInternationalSmsRecordMapper.xml

@@ -416,6 +416,7 @@
     from tab_billing_international_sms_record
     where status = 1
     and enterprise_id = #{enterpriseId}
+    and pay_type = 4
     <if test="startTime != null">
       and DATE_FORMAT(deduction_time,'%Y-%m-%d') &gt;= #{startTime}
     </if>
@@ -430,6 +431,7 @@
     from tab_billing_international_sms_record
     where status = 1
     and enterprise_id = #{enterpriseId}
+    and pay_type = 4
     <if test="dateType == 1 ">
       and date_format(deduction_time,'%Y-%m') = date_format(now(),'%Y-%m')
     </if>

gic-platform-enterprise-service/src/main/resources/mapper/TabBillingSmsPackageRecordMapper.xml

@@ -242,6 +242,7 @@
     from tab_billing_sms_package_record
     where status = 1
     and enterprise_id = #{enterpriseId}
+    and pay_type = 4
     <if test="startTime != null">
       and DATE_FORMAT(deduction_time,'%Y-%m-%d') &gt;= #{startTime}
     </if>
@@ -258,6 +259,7 @@
     from tab_billing_sms_package_record
     where status = 1
     and enterprise_id = #{enterpriseId}
+    and pay_type = 4
     <if test="dateType == 1 ">
       and date_format(deduction_time,'%Y-%m') = date_format(now(),'%Y-%m')
     </if>

gic-platform-enterprise-service/src/main/resources/mapper/TabBillingSmsRecordMapper.xml

@@ -399,6 +399,7 @@
     and cache_status = 1
     and database_status = 1
     and enterprise_id = #{enterpriseId}
+    and pay_type = 4
     <if test="startTime != null">
       and DATE_FORMAT(deduction_time,'%Y-%m-%d') &gt;= #{startTime}
     </if>
@@ -416,6 +417,7 @@
     and cache_status = 1
     and database_status = 1
     and enterprise_id = #{enterpriseId}
+    and pay_type = 4
     <if test="dateType == 1 ">
       and date_format(deduction_time,'%Y-%m') = date_format(now(),'%Y-%m')
     </if>

gic-platform-enterprise-service/src/main/resources/mapper/TabDataMemberConsumeConfigMapper.xml

@@ -5,15 +5,17 @@
     <id column="member_consume_config_id" jdbcType="INTEGER" property="memberConsumeConfigId" />
     <result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
     <result column="member_consume_count" jdbcType="INTEGER" property="memberConsumeCount" />
-    <result column="member_consume_max" jdbcType="INTEGER" property="memberConsumeMax" />
-    <result column="member_consume_times" jdbcType="INTEGER" property="memberConsumeTimes" />
+    <result column="member_consume_max_default" jdbcType="INTEGER" property="memberConsumeMaxDefault" />
+    <result column="member_consume_times_default" jdbcType="INTEGER" property="memberConsumeTimesDefault" />
+    <result column="member_consume_max_goods" jdbcType="INTEGER" property="memberConsumeMaxGoods" />
+    <result column="member_consume_times_goods" jdbcType="INTEGER" property="memberConsumeTimesGoods" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    member_consume_config_id, enterprise_id, member_consume_count, member_consume_max, 
-    member_consume_times, status, create_time, update_time
+    member_consume_config_id, enterprise_id, member_consume_count, member_consume_max_default, member_consume_times_default,
+    member_consume_max_goods, member_consume_times_goods, status, create_time, update_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -27,11 +29,13 @@
   </delete>
   <insert id="insert" parameterType="com.gic.enterprise.entity.TabDataMemberConsumeConfig">
     insert into tab_data_member_consume_config (member_consume_config_id, enterprise_id, 
-      member_consume_count, member_consume_max, member_consume_times, 
+      member_consume_count, member_consume_max_default, member_consume_times_default,
+      member_consume_max_goods, member_consume_times_goods,
       status, create_time, update_time
       )
     values (#{memberConsumeConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, 
-      #{memberConsumeCount,jdbcType=INTEGER}, #{memberConsumeMax,jdbcType=INTEGER}, #{memberConsumeTimes,jdbcType=INTEGER}, 
+      #{memberConsumeCount,jdbcType=INTEGER}, #{memberConsumeMaxDefault,jdbcType=INTEGER}, #{memberConsumeTimesDefault,jdbcType=INTEGER},
+      #{memberConsumeMaxGoods,jdbcType=INTEGER}, #{memberConsumeTimesGoods,jdbcType=INTEGER},
       #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
       )
   </insert>
@@ -47,11 +51,17 @@
       <if test="memberConsumeCount != null">
         member_consume_count,
       </if>
-      <if test="memberConsumeMax != null">
-        member_consume_max,
+      <if test="memberConsumeMaxDefault != null">
+        member_consume_max_default,
       </if>
-      <if test="memberConsumeTimes != null">
-        member_consume_times,
+      <if test="memberConsumeTimesDefault != null">
+        member_consume_times_default,
+      </if>
+      <if test="memberConsumeMaxGoods != null">
+        member_consume_max_goods,
+      </if>
+      <if test="memberConsumeTimesGoods != null">
+        member_consume_times_goods,
       </if>
       <if test="status != null">
         status,
@@ -73,11 +83,17 @@
       <if test="memberConsumeCount != null">
         #{memberConsumeCount,jdbcType=INTEGER},
       </if>
-      <if test="memberConsumeMax != null">
-        #{memberConsumeMax,jdbcType=INTEGER},
+      <if test="memberConsumeMaxDefault != null">
+        #{memberConsumeMaxDefault,jdbcType=INTEGER},
+      </if>
+      <if test="memberConsumeTimesDefault != null">
+        #{memberConsumeTimesDefault,jdbcType=INTEGER},
       </if>
-      <if test="memberConsumeTimes != null">
-        #{memberConsumeTimes,jdbcType=INTEGER},
+      <if test="memberConsumeMaxGoods != null">
+        #{memberConsumeMaxGoods,jdbcType=INTEGER},
+      </if>
+      <if test="memberConsumeTimesGoods != null">
+        #{memberConsumeTimesGoods,jdbcType=INTEGER},
       </if>
       <if test="status != null">
         #{status,jdbcType=INTEGER},
@@ -99,11 +115,17 @@
       <if test="memberConsumeCount != null">
         member_consume_count = #{memberConsumeCount,jdbcType=INTEGER},
       </if>
-      <if test="memberConsumeMax != null">
-        member_consume_max = #{memberConsumeMax,jdbcType=INTEGER},
+      <if test="memberConsumeMaxDefault != null">
+        member_consume_max_default = #{memberConsumeMaxDefault,jdbcType=INTEGER},
+      </if>
+      <if test="memberConsumeTimesDefault != null">
+        member_consume_times_default = #{memberConsumeTimesDefault,jdbcType=INTEGER},
+      </if>
+      <if test="memberConsumeMaxGoods != null">
+        member_consume_max_goods = #{memberConsumeMaxGoods,jdbcType=INTEGER},
       </if>
-      <if test="memberConsumeTimes != null">
-        member_consume_times = #{memberConsumeTimes,jdbcType=INTEGER},
+      <if test="memberConsumeTimesGoods != null">
+        member_consume_times_goods = #{memberConsumeTimesGoods,jdbcType=INTEGER},
       </if>
       <if test="status != null">
         status = #{status,jdbcType=INTEGER},