Commit 09041d72 by huluobin

update

parent e70bfedd
......@@ -52,7 +52,6 @@ public class TimesCardOrderServiceImpl extends ServiceImpl<TimesCardOrderMapper,
.name(timesCardType.getName())
//会员id
.customerId(customerId)
.sumTimes(timesCardType.getSumTimes())
.usedTimes(0)
.createTime(new Date())
......
package com.gogirl.infrastructure.common.util.thread;
package com.gogirl.infrastructure.common.util;
import java.util.ArrayList;
import java.util.List;
......@@ -22,7 +22,7 @@ public class Arrange {
//输出A(n,n)的全排列
for (int i = 1; i <= data.size(); i++)
arrange.arrangeSelect(data, new ArrayList<Character>(), i);
arrange.arrangeSelect(data, new ArrayList<>(), i);
}
......
......@@ -85,17 +85,12 @@ public class ThreadUtil {
* 执行异步方法
*
* @param runnable 需要执行的方法体
* @param isDeamon 是否守护线程。守护线程会在主线程结束后自动结束
* @param isDaemon 是否守护线程。守护线程会在主线程结束后自动结束
* @return 执行的方法体
*/
public static Runnable excAsync(final Runnable runnable, boolean isDeamon) {
Thread thread = new Thread() {
@Override
public void run() {
runnable.run();
}
};
thread.setDaemon(isDeamon);
public static Runnable excAsync(final Runnable runnable, boolean isDaemon) {
Thread thread = new Thread(runnable::run);
thread.setDaemon(isDaemon);
thread.start();
return runnable;
......
......@@ -58,7 +58,7 @@ public class MallOrderController {
@ApiOperation("订单确认收货")
@GetMapping("/customer/mallOrder/takeDeliveryOfMallOrder")
public JsonResult<Integer> takeDeliveryOfMallOrder(@RequestHeader String token,
@PathVariable Long mallOrderId) {
@RequestParam Long mallOrderId) {
Integer currentCustomerId = SessionUtils.getCustomerId();
mallOrderService.takeDeliveryOfMallOrder(currentCustomerId, mallOrderId);
return JsonResult.success();
......
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