oying-system/src/main/java/com/oying/modules/rider/domain/dto/RiderIncomeDetailQueryCriteria.java
@@ -38,5 +38,6 @@ @ApiModelProperty(value = "订单状态:1-待取货,2-配送中,3-已完成,4-已取消") private String orderStatus; private List<Timestamp> updateTime; private List<Timestamp> createTime; } oying-system/src/main/java/com/oying/modules/rider/rest/RiderIncomeDetailController.java
@@ -24,7 +24,7 @@ @RestController @RequiredArgsConstructor @Api(tags = "骑手收入明细") @RequestMapping("/api/riderIncomeDetail") @RequestMapping("/api/rider/riderIncomeDetail") public class RiderIncomeDetailController { private final RiderIncomeDetailService riderIncomeDetailService; oying-system/src/main/java/com/oying/modules/rider/rest/RiderInfoController.java
@@ -24,7 +24,7 @@ @RestController @RequiredArgsConstructor @Api(tags = "三方骑手数据信息") @RequestMapping("/api/riderInfo") @RequestMapping("/api/rider/riderInfo") public class RiderInfoController { private final RiderInfoService riderInfoService; oying-system/src/main/java/com/oying/modules/rider/rest/RiderOrderOperationController.java
@@ -24,7 +24,7 @@ @RestController @RequiredArgsConstructor @Api(tags = "骑手订单操作日志") @RequestMapping("/api/riderOrderOperation") @RequestMapping("/api/rider/riderOrderOperation") public class RiderOrderOperationController { private final RiderOrderOperationService riderOrderOperationService; oying-system/src/main/java/com/oying/modules/rider/rest/RiderOrderRecordController.java
@@ -23,8 +23,8 @@ **/ @RestController @RequiredArgsConstructor @Api(tags = "骑手收入明细") @RequestMapping("/api/riderOrderRecord") @Api(tags = "骑手订单信息") @RequestMapping("/api/rider/riderOrderRecord") public class RiderOrderRecordController { private final RiderOrderRecordService riderOrderRecordService; @@ -37,7 +37,7 @@ } @GetMapping @ApiOperation("查询骑手收入明细") @ApiOperation("查询骑手订单信息") @PreAuthorize("@el.check('riderOrderRecord:list')") public ResponseEntity<PageResult<RiderOrderRecord>> queryRiderOrderRecord(RiderOrderRecordQueryCriteria criteria){ Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize()); @@ -45,8 +45,8 @@ } @PostMapping @Log("新增骑手收入明细") @ApiOperation("新增骑手收入明细") @Log("新增骑手订单信息") @ApiOperation("新增骑手订单信息") @PreAuthorize("@el.check('riderOrderRecord:add')") public ResponseEntity<Object> createRiderOrderRecord(@Validated @RequestBody RiderOrderRecord resources){ riderOrderRecordService.create(resources); @@ -54,8 +54,8 @@ } @PutMapping @Log("修改骑手收入明细") @ApiOperation("修改骑手收入明细") @Log("新增骑手订单信息") @ApiOperation("新增骑手订单信息") @PreAuthorize("@el.check('riderOrderRecord:edit')") public ResponseEntity<Object> updateRiderOrderRecord(@Validated @RequestBody RiderOrderRecord resources){ riderOrderRecordService.update(resources); @@ -63,8 +63,8 @@ } @DeleteMapping @Log("删除骑手收入明细") @ApiOperation("删除骑手收入明细") @Log("新增骑手订单信息") @ApiOperation("新增骑手订单信息") @PreAuthorize("@el.check('riderOrderRecord:del')") public ResponseEntity<Object> deleteRiderOrderRecord(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) { riderOrderRecordService.deleteAll(ids); oying-system/src/main/java/com/oying/modules/rider/rest/RiderOrderReminderController.java
@@ -24,7 +24,7 @@ @RestController @RequiredArgsConstructor @Api(tags = "骑手消息提示记录") @RequestMapping("/api/riderOrderReminder") @RequestMapping("/api/rider/riderOrderReminder") public class RiderOrderReminderController { private final RiderOrderReminderService riderOrderReminderService; oying-system/src/main/java/com/oying/modules/rider/rest/RiderWalletInfoController.java
@@ -24,7 +24,7 @@ @RestController @RequiredArgsConstructor @Api(tags = "骑手钱包详情") @RequestMapping("/api/riderWalletInfo") @RequestMapping("/api/rider/riderWalletInfo") public class RiderWalletInfoController { private final RiderWalletInfoService riderWalletInfoService; oying-system/src/main/java/com/oying/modules/rider/rest/RiderWithdrawalRecordController.java
@@ -24,7 +24,7 @@ @RestController @RequiredArgsConstructor @Api(tags = "骑手提现记录") @RequestMapping("/api/riderWithdrawalRecord") @RequestMapping("/api/rider/riderWithdrawalRecord") public class RiderWithdrawalRecordController { private final RiderWithdrawalRecordService riderWithdrawalRecordService; oying-system/src/main/resources/mapper/rider/RiderIncomeDetailMapper.xml
@@ -52,10 +52,10 @@ <if test="criteria.orderStatus != null"> and order_status = #{criteria.orderStatus} </if> <if test="criteria.updateTime != null and criteria.updateTime.size() > 0"> AND update_time BETWEEN #{criteria.updateTime[0]} AND #{criteria.updateTime[1]} <if test="criteria.createTime != null and criteria.createTime.size() > 0"> AND create_time BETWEEN #{criteria.createTime[0]} AND #{criteria.createTime[1]} </if> </where> order by income_id desc order by create_time desc </select> </mapper>