记得上下班打卡 | git大法好,push需谨慎

Commit 6dae91d8 authored by 胡佳晨's avatar 胡佳晨

admin

parent 3306269b
...@@ -55,12 +55,9 @@ public class StoneLogsController extends BaseController { ...@@ -55,12 +55,9 @@ public class StoneLogsController extends BaseController {
@PostMapping("list") @PostMapping("list")
@ResponseBody @ResponseBody
public TableDataInfo list(StoneScoreListParam listParam) { public TableDataInfo list(StoneScoreListParam listParam) {
PageInfo<StoneScoreListDto> result = iScoreService.list(listParam); startPage();
TableDataInfo rspData = new TableDataInfo(); List<StoneScoreListDto> result = iScoreService.list(listParam);
rspData.setCode(0); return this.getDataTable(result);
rspData.setRows(result.getList());
rspData.setTotal(result.getTotal());
return rspData;
} }
@Log(title = "积分明细:修改状态") @Log(title = "积分明细:修改状态")
......
...@@ -11,7 +11,7 @@ import java.util.List; ...@@ -11,7 +11,7 @@ import java.util.List;
public interface IScoreService { public interface IScoreService {
PageInfo<StoneScoreListDto> list(StoneScoreListParam param); List<StoneScoreListDto> list(StoneScoreListParam param);
List<StoneScoreListExportDto> listExport(String[] uidList); List<StoneScoreListExportDto> listExport(String[] uidList);
......
...@@ -40,12 +40,10 @@ public class ScoreServiceImpl implements IScoreService { ...@@ -40,12 +40,10 @@ public class ScoreServiceImpl implements IScoreService {
StoneMongoUtils mongoUtils; StoneMongoUtils mongoUtils;
@Override @Override
public PageInfo<StoneScoreListDto> list(StoneScoreListParam param) { public List<StoneScoreListDto> list(StoneScoreListParam param) {
PageInfo<StoneScoreListDto> pageInfo;
param.setUid("-999"); param.setUid("-999");
List<StoneScoreListDto> dto = stoneScoreUserMapper.list(param); List<StoneScoreListDto> dto = stoneScoreUserMapper.list(param);
pageInfo = new PageInfo(dto); return dto;
return pageInfo;
} }
@Override @Override
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<if test="status!=''"> <if test="status!=''">
AND ssut.status = #{status} OR ssut.status is null AND ssut.status = #{status} OR ssut.status is null
</if> </if>
<if test="uid!=''"> <if test="uid!=-999">
AND ssut.uid =#{uid} OR ssut.status is null AND ssut.uid =#{uid} OR ssut.status is null
</if> </if>
</where> </where>
......
...@@ -978,7 +978,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -978,7 +978,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
// log.info("下单消息模版错误",e); // log.info("下单消息模版错误",e);
// } // }
//加分 //加分
orderUtils.doTask(orderTickets.getUserId(), orderTicketData.getPerformanceTitle(), orderTicketData.getPriceActual()); orderUtils.doTask(orderTicketData.getUserId(), orderTicketData.getPerformanceTitle(), orderTicketData.getPriceActual());
//大麦回调 //大麦回调
sycDamaiOrder(orderTickets.getOrderTicketsId(), orderTicketData.getIsMember()); sycDamaiOrder(orderTickets.getOrderTicketsId(), orderTicketData.getIsMember());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment