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

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

 package com.gic.enterprise.service.impl;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.alibaba.fastjson.JSON;
 import com.gic.commons.util.GlobalInfo;
 import com.gic.enterprise.constant.BillingOrderStatusEnum;
@@ -25,6 +14,16 @@ import com.gic.enterprise.service.BillingEnterpriseSmsPackageService;
 import com.gic.enterprise.service.BillingOrderService;
 import com.gic.enterprise.utils.CreateRandomUtils;
 import com.github.pagehelper.Page;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+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;
 
 @Service("billingOrderService")
 public class BillingOrderServiceImpl implements BillingOrderService {
@@ -113,7 +112,7 @@ public class BillingOrderServiceImpl implements BillingOrderService {
                     smsPackage.setCreateTime(new Date());
                     smsPackage.setUpdateTime(new Date());
                     smsPackage.setSmsPackageCode(itemDTO.getCode());
-                    smsPackage.setSmsPackageName(itemDTO.getSmsPackageName()+"-"+itemDTO.getSmsAmount());
+                    smsPackage.setSmsPackageName(itemDTO.getSmsPackageName());
                     smsPackage.setBillingOrderId(order.getOrderId());
                     smsPackage.setTotalAcount(itemDTO.getSmsAmount());
                     smsPackage.setRemainAccount(itemDTO.getSmsAmount());

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

@@ -194,7 +194,7 @@
     <if test="search !=null and search !=''">
       and sms_package_name like concat('%',#{search},'%')
     </if>
-    order by create_time desc
+    order by create_time desc, status
   </select>