Merge branch 'test' into dev
This commit is contained in:
@@ -22,7 +22,7 @@ public class AppCourseCollectController extends AbstractController {
|
|||||||
@Login
|
@Login
|
||||||
@PostMapping("/insertCourseCollect")
|
@PostMapping("/insertCourseCollect")
|
||||||
@ApiOperation("app收藏短剧信息")
|
@ApiOperation("app收藏短剧信息")
|
||||||
@Debounce(interval = 3000, value = "#userId,#courseCollect.courseId,#courseCollect.classify,#courseCollect.type")
|
@Debounce(interval = 1000, value = "#userId,#courseCollect.courseId,#courseCollect.classify,#courseCollect.type")
|
||||||
public Result insertCourseCollect(@RequestBody CourseCollect courseCollect, @RequestAttribute("userId") Long userId) {
|
public Result insertCourseCollect(@RequestBody CourseCollect courseCollect, @RequestAttribute("userId") Long userId) {
|
||||||
courseCollect.setUserId(userId);
|
courseCollect.setUserId(userId);
|
||||||
return courseCollectService.insertCourseCollect(courseCollect);
|
return courseCollectService.insertCourseCollect(courseCollect);
|
||||||
|
|||||||
@@ -113,7 +113,7 @@ public class WuyouController {
|
|||||||
payDetailsDao.insert(payDetails);
|
payDetailsDao.insert(payDetails);
|
||||||
} else {
|
} else {
|
||||||
payDetails.setTradeNo(AliPayOrderUtil.createOrderId());
|
payDetails.setTradeNo(AliPayOrderUtil.createOrderId());
|
||||||
payDetailsDao.updateById(payDetails);
|
payDetailsDao.update(payDetails, new LambdaQueryWrapper<PayDetails>().eq(PayDetails::getId, payDetails.getId()).eq(PayDetails::getUserId, payDetails.getUserId()));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (order.getPayMoney().compareTo(BigDecimal.ZERO) == 0) {
|
if (order.getPayMoney().compareTo(BigDecimal.ZERO) == 0) {
|
||||||
|
|||||||
Reference in New Issue
Block a user