Commit a1a24c20 by huluobin

log

parent 2a3677ac
...@@ -3,7 +3,6 @@ package com.gogirl.interfaces.order.mall; ...@@ -3,7 +3,6 @@ package com.gogirl.interfaces.order.mall;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gogirl.application.order.mall.MallOrderService; import com.gogirl.application.order.mall.MallOrderService;
import com.gogirl.application.xcx.GogirlTokenService;
import com.gogirl.domain.order.mall.MallOrder; import com.gogirl.domain.order.mall.MallOrder;
import com.gogirl.infrastructure.common.base.JsonResult; import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.infrastructure.util.SessionUtils; import com.gogirl.infrastructure.util.SessionUtils;
...@@ -15,6 +14,7 @@ import io.swagger.annotations.Api; ...@@ -15,6 +14,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -22,16 +22,19 @@ import java.math.BigDecimal; ...@@ -22,16 +22,19 @@ import java.math.BigDecimal;
@Api(tags = "商城订单接口", value = "商城订单接口") @Api(tags = "商城订单接口", value = "商城订单接口")
@RestController @RestController
@AllArgsConstructor @AllArgsConstructor
@Slf4j
public class MallOrderController { public class MallOrderController {
private final MallOrderService mallOrderService; private final MallOrderService mallOrderService;
private final GogirlTokenService gogirlTokenService;
@ApiOperation("提交订单") @ApiOperation("提交订单")
@PostMapping("/customer/mallOrder/submitMallOrder") @PostMapping("/customer/mallOrder/submitMallOrder")
public JsonResult<MallOrder> submitMallOrder(@RequestHeader String token, public JsonResult<MallOrder> submitMallOrder(@RequestHeader String token,
@RequestBody SubmitMallOrderCommand cmd) { @RequestBody SubmitMallOrderCommand cmd) {
log.info("token:{}", token);
log.info("token:{}", SessionUtils.getCustomerToken().toString());
Integer currentCustomerId = SessionUtils.getCustomerId(); Integer currentCustomerId = SessionUtils.getCustomerId();
cmd.setCustomerId(currentCustomerId); cmd.setCustomerId(currentCustomerId);
mallOrderService.submitMallOrder(cmd); mallOrderService.submitMallOrder(cmd);
...@@ -44,7 +47,6 @@ public class MallOrderController { ...@@ -44,7 +47,6 @@ public class MallOrderController {
public JsonResult<MallOrder> immediatePurchase(@RequestHeader String token, public JsonResult<MallOrder> immediatePurchase(@RequestHeader String token,
@RequestBody ImmediatePurchaseCommand cmd) { @RequestBody ImmediatePurchaseCommand cmd) {
Integer currentCustomerId = SessionUtils.getCustomerId();
mallOrderService.immediatePurchase(cmd); mallOrderService.immediatePurchase(cmd);
MallOrder mallOrder = mallOrderService.getMallOrderAggregate(cmd.getExecutionResult()); MallOrder mallOrder = mallOrderService.getMallOrderAggregate(cmd.getExecutionResult());
return JsonResult.success(mallOrder); return JsonResult.success(mallOrder);
......
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