|
|
@@ -5,7 +5,6 @@ import com.txz.cif.core.ResultCode;
|
|
|
import com.txz.cif.core.ResultGenerator;
|
|
|
import com.txz.cif.model.Goods;
|
|
|
import com.txz.cif.model.PaymentMethod;
|
|
|
-import com.txz.cif.model.RechargeRecord;
|
|
|
import com.txz.cif.service.GoodsService;
|
|
|
import com.txz.cif.service.PaymentMethodService;
|
|
|
import com.txz.cif.web.para.GoodsParam;
|
|
|
@@ -99,13 +98,13 @@ public class GoodsController {
|
|
|
|
|
|
PaymentMethod paymentMethod = paymentMethodService.findById(param.getMethodId());
|
|
|
|
|
|
- Condition condition = new Condition(RechargeRecord.class);
|
|
|
+ Condition condition = new Condition(Goods.class);
|
|
|
Criteria criteria = condition.createCriteria();
|
|
|
criteria.andEqualTo("methodId", param.getMethodId());
|
|
|
if (param.getStatus() != null) {
|
|
|
criteria.andEqualTo("status", param.getStatus());
|
|
|
}
|
|
|
- condition.setOrderByClause("create_time desc");
|
|
|
+ condition.setOrderByClause("status DESC, sort_num ASC, amount ASC , create_time DESC");
|
|
|
List<Goods> list = goodsService.findByCondition(condition);
|
|
|
|
|
|
return Result.success(PaymentPriceVO.builder()
|
