Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabBillingEnterpriseSmsPackageMapper.java

@@ -60,6 +60,15 @@ public interface TabBillingEnterpriseSmsPackageMapper {
                                                                   @Param("startDate") String startDate,
                                                                   @Param("endDate") String endDate);
 
+    List<TabBillingEnterpriseSmsPackage> listEnterpriseSmsPackageNoStatus(@Param("enterpriseId") Integer enterpriseId,
+                                                                  @Param("status") Integer status,
+                                                                  @Param("search") String search,
+                                                                  @Param("startDate") String startDate,
+                                                                  @Param("endDate") String endDate,
+                                                                  @Param("pageNum") int pageNum,
+                                                                  @Param("pageSize") int pageSize,
+                                                                  @Param("totalCount") int totalCount);
+
 
     /**
      * 短信套餐包列表查询，账户总览页面统计使用

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingOrderServiceImpl.java

@@ -20,8 +20,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -101,7 +99,6 @@ public class BillingOrderServiceImpl implements BillingOrderService {
         if(order != null){
             int i1 = this.tabBillingOrderMapper.updateOrderBySerialNumber(orderSerialNumber, totalFeePaid, auditStatus);
             logger.info("修改订单状态：{}", i1);
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
             SmsPackageOrderItemDTO itemDTO = JSON.parseObject(order.getItemJson(), SmsPackageOrderItemDTO.class);
             if(itemDTO != null){
                 for(int i= 0; i< itemDTO.getBuyCount(); i++){
@@ -119,11 +116,11 @@ public class BillingOrderServiceImpl implements BillingOrderService {
                     Calendar now = Calendar.getInstance();
                     now.setTime(new Date());
                     now.add(Calendar.MONTH, itemDTO.getPackageLength());
-                    try {
-                        smsPackage.setEffectiveDate(simpleDateFormat.parse(simpleDateFormat.format(now.getTime())));
-                    } catch (ParseException e) {
-                        e.printStackTrace();
-                    }
+                    now.set(Calendar.HOUR, 23);
+                    now.set(Calendar.MINUTE, 59);
+                    now.set(Calendar.SECOND, 59);
+
+                    smsPackage.setEffectiveDate(now.getTime());
                     this.billingEnterpriseSmsPackageService.saveEnterpriseSmsPackage(smsPackage);
                 }
             }

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/PackageServiceImpl.java

@@ -20,8 +20,14 @@ public class PackageServiceImpl implements PackageService {
                                                                          Integer status, String startDate, String endDate,
                                                                          int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<TabBillingEnterpriseSmsPackage> list = this.tabBillingEnterpriseSmsPackageMapper.listEnterpriseSmsPackage
-                (enterpriseId, status, search, startDate, endDate);
-        return (Page<TabBillingEnterpriseSmsPackage>) list;
+        if (status != null) {
+            List<TabBillingEnterpriseSmsPackage> list = this.tabBillingEnterpriseSmsPackageMapper.listEnterpriseSmsPackage(enterpriseId, status, search, startDate, endDate);
+            return (Page<TabBillingEnterpriseSmsPackage>) list;
+        } else {
+            List<TabBillingEnterpriseSmsPackage> list = this.tabBillingEnterpriseSmsPackageMapper
+                    .listEnterpriseSmsPackageNoStatus(enterpriseId, status, search, startDate, endDate, pageNum, pageSize, pageNum * pageSize);
+            return (Page<TabBillingEnterpriseSmsPackage>) list;
+        }
+
     }
 }

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

@@ -19,6 +19,42 @@
     enterprise_sms_package_id, enterprise_id, status, create_time, update_time, sms_package_name, 
     sms_package_code, type, effective_date, billing_order_id, total_acount, remain_account
   </sql>
+  <sql id="list1">
+    select
+    <include refid="Base_Column_List" />
+    from tab_billing_enterprise_sms_package
+    where enterprise_id = #{enterpriseId,jdbcType=INTEGER}
+    and status = 2
+    <if test="startDate != null and startDate != ''">
+      and effective_date &gt;= #{startDate}
+    </if>
+    <if test="endDate != null and endDate != ''">
+      and effective_date &lt;= #{endDate}
+    </if>
+    <if test="search !=null and search !=''">
+      and sms_package_name like concat('%',#{search},'%')
+    </if>
+    order by status, create_time desc
+    limit #{totalCount}
+  </sql>
+  <sql id="list2">
+    select
+    <include refid="Base_Column_List" />
+    from tab_billing_enterprise_sms_package
+    where enterprise_id = #{enterpriseId,jdbcType=INTEGER}
+    and status !=0
+    <if test="startDate != null and startDate != ''">
+      and effective_date &gt;= #{startDate}
+    </if>
+    <if test="endDate != null and endDate != ''">
+      and effective_date &lt;= #{endDate}
+    </if>
+    <if test="search !=null and search !=''">
+      and sms_package_name like concat('%',#{search},'%')
+    </if>
+    order by status, create_time desc
+    limit #{totalCount}
+  </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
@@ -194,9 +230,17 @@
     <if test="search !=null and search !=''">
       and sms_package_name like concat('%',#{search},'%')
     </if>
-    order by create_time desc, status
+    order by create_time desc
+  </select>
+  <select id="listEnterpriseSmsPackageNoStatus" resultMap="BaseResultMap">
+    select <include refid="Base_Column_List" />
+    from
+    (
+     (<include refid="list1"/>)
+    union
+    (<include refid="list2"/>)
+    ) t1
   </select>
-
 
   <select id="listSmsPackage" resultMap="BaseResultMap">
     select