Merge remote-tracking branch 'origin/master'

cif-service/src/main/java/com/txz/cif/service/impl/UserServiceImpl.java

@@ -1,7 +1,6 @@
 package com.txz.cif.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
@@ -9,11 +8,13 @@ import cn.hutool.crypto.SecureUtil;
 import com.google.common.base.Joiner;
 import com.txz.cif.constants.RedisConstants;
 import com.txz.cif.core.*;
+import com.txz.cif.dao.UserMapper;
 import com.txz.cif.dto.UserDTO;
 import com.txz.cif.dubbo.client.OperatingConfigDubboServiceClient;
-import com.txz.cif.model.*;
-import com.txz.cif.dao.UserMapper;
-import com.txz.cif.service.*;
+import com.txz.cif.model.Account;
+import com.txz.cif.model.User;
+import com.txz.cif.service.AccountService;
+import com.txz.cif.service.UserService;
 import com.txz.cif.web.para.UserAddParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,12 +23,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
-import static java.util.regex.Pattern.compile;
-
 /**
  * Created by CodeGenerator on 2019/11/18.
  */

cif-service/src/main/java/com/txz/cif/web/RechargeRecordApiController.java

@@ -96,7 +96,7 @@ public class RechargeRecordApiController {
     public Result<PaymentPriceVO> goodsList(@PathVariable("methodId") Long methodId) {
         Condition c = new Condition(Goods.class);
         c.createCriteria().andEqualTo("status", 1).andEqualTo("methodId", methodId);
-        c.setOrderByClause("amount asc");
+        c.setOrderByClause("sort_num asc");
         List<Goods> goods = goodsService.findByCondition(c);
         
         PaymentMethod paymentMethod = paymentMethodService.findById(methodId);