From f04d604a7447fb42afee46d11b8e29c76ae5f02f Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 25 Jun 2021 14:46:08 +0800 Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop --- gc-core/src/main/java/com/xzx/gc/common/request/MyResponseBodyAdvice.java | 4 + gc-shop/src/main/java/com/xzx/gc/shop/mapper/AccountInfoMapper.java | 10 +++ gc-shop/src/main/resources/mapper/shop/AccountInfo.xml | 9 +++ gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsOrderDto.java | 27 +++++++++ gc-shop/src/main/resources/mapper/shop/UserInfoMapper.xml | 5 + gc-shop/src/main/java/com/xzx/gc/shop/controller/ApiGoodsController.java | 13 ++++ gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java | 36 +++++++++-- gc-shop/src/main/resources/mapper/shop/AddressInfoMapper.xml | 5 + gc-shop/src/main/java/com/xzx/gc/shop/mapper/UserInfoMapper.java | 11 +++ gc-shop/src/main/java/com/xzx/gc/shop/mapper/AddressInfoMapper.java | 7 ++ 10 files changed, 119 insertions(+), 8 deletions(-) diff --git a/gc-core/src/main/java/com/xzx/gc/common/request/MyResponseBodyAdvice.java b/gc-core/src/main/java/com/xzx/gc/common/request/MyResponseBodyAdvice.java index 38702af..780263b 100644 --- a/gc-core/src/main/java/com/xzx/gc/common/request/MyResponseBodyAdvice.java +++ b/gc-core/src/main/java/com/xzx/gc/common/request/MyResponseBodyAdvice.java @@ -10,6 +10,7 @@ import com.xzx.gc.common.utils.SecurityUtil; import com.xzx.gc.common.utils.SpringUtil; import com.xzx.gc.entity.VersionInfo; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.MethodParameter; import org.springframework.http.MediaType; @@ -24,6 +25,7 @@ * @author * @desc 返回数据加密 */ +@Slf4j @ControllerAdvice public class MyResponseBodyAdvice implements ResponseBodyAdvice { @@ -47,7 +49,9 @@ String authKey = serverHttpRequest.getHeaders().get("authKey").get(0); String s = JSONUtil.toJsonStr(body); if (!url.contains("/admin")) { + log.info("这是进入了body"); Object versionService = SpringUtil.getBean("versionService"); + log.info("这是进入了body:{}", versionService); VersionInfo versionInfo = ReflectUtil.invoke(versionService, "find"); JSONObject jsonObject = JSONUtil.parseObj(s); if (versionInfo != null) { diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/controller/ApiGoodsController.java b/gc-shop/src/main/java/com/xzx/gc/shop/controller/ApiGoodsController.java index 4addc19..f758151 100644 --- a/gc-shop/src/main/java/com/xzx/gc/shop/controller/ApiGoodsController.java +++ b/gc-shop/src/main/java/com/xzx/gc/shop/controller/ApiGoodsController.java @@ -2,7 +2,11 @@ import com.github.pagehelper.PageInfo; +import com.xzx.gc.common.Result; +import com.xzx.gc.common.request.BaseController; import com.xzx.gc.model.JsonResult; +import com.xzx.gc.service.BaseAccountService; +import com.xzx.gc.shop.dto.AddGoodsOrderDto; import com.xzx.gc.shop.dto.XcxGoodsListDto; import com.xzx.gc.shop.service.GoodsService; import com.xzx.gc.shop.vo.GoodsCategoryVo; @@ -22,7 +26,7 @@ @RestController @Api(tags = {"积分商城--API商品管理"}) @Slf4j -public class ApiGoodsController { +public class ApiGoodsController extends BaseController { @Autowired private GoodsService goodsService; @@ -54,4 +58,11 @@ return JsonResult.success(goodsService.findGoodsDetails(id)); } + @PostMapping(value = "/goods/order/add") + public Result<String> addOrder(@RequestBody AddGoodsOrderDto addGoodsOrderDto, HttpServletRequest request) { + String userId = getUserId(request); + addGoodsOrderDto.setUserId(userId); + return null; + } + } diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsOrderDto.java b/gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsOrderDto.java new file mode 100644 index 0000000..aa6ce27 --- /dev/null +++ b/gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsOrderDto.java @@ -0,0 +1,27 @@ +package com.xzx.gc.shop.dto; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "AddGoodsOrderDto", description = "小程序商城下单接口参数接收类") +public class AddGoodsOrderDto { + + @ApiModelProperty(value = "地址ID") + private Long addressId; + + @ApiModelProperty(value = "样式ID") + private Long styleId; + + @ApiModelProperty(value = "规格ID") + private Long skuId; + + @ApiModelProperty(value = "数量") + private Integer cnt; + + @ApiModelProperty(hidden = true) + private String userId; + +} diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/mapper/AccountInfoMapper.java b/gc-shop/src/main/java/com/xzx/gc/shop/mapper/AccountInfoMapper.java new file mode 100644 index 0000000..1a8db23 --- /dev/null +++ b/gc-shop/src/main/java/com/xzx/gc/shop/mapper/AccountInfoMapper.java @@ -0,0 +1,10 @@ +package com.xzx.gc.shop.mapper; + +import com.xzx.gc.entity.AccountInfo; +import com.xzx.gc.util.GcMapper; +import org.apache.ibatis.annotations.Param; + +public interface AccountInfoMapper extends GcMapper<AccountInfo> { + + AccountInfo selectAccountInfoByUserId(@Param("userId") String userId); +} diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/mapper/AddressInfoMapper.java b/gc-shop/src/main/java/com/xzx/gc/shop/mapper/AddressInfoMapper.java new file mode 100644 index 0000000..7adb446 --- /dev/null +++ b/gc-shop/src/main/java/com/xzx/gc/shop/mapper/AddressInfoMapper.java @@ -0,0 +1,7 @@ +package com.xzx.gc.shop.mapper; + +import com.xzx.gc.entity.AddressInfo; +import com.xzx.gc.util.GcMapper; + +public interface AddressInfoMapper extends GcMapper<AddressInfo> { +} diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/mapper/UserInfoMapper.java b/gc-shop/src/main/java/com/xzx/gc/shop/mapper/UserInfoMapper.java new file mode 100644 index 0000000..d8fd628 --- /dev/null +++ b/gc-shop/src/main/java/com/xzx/gc/shop/mapper/UserInfoMapper.java @@ -0,0 +1,11 @@ +package com.xzx.gc.shop.mapper; + +import com.xzx.gc.entity.UserInfo; +import com.xzx.gc.util.GcMapper; + +/** + * @author wzy + * @date 2021-06-25 + **/ +public interface UserInfoMapper extends GcMapper<UserInfo> { +} diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java index 5495a97..93eb34e 100644 --- a/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java +++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java @@ -7,20 +7,17 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.xzx.gc.entity.ScoreExpressInfo; -import com.xzx.gc.entity.ScoreGoodsStyle; -import com.xzx.gc.entity.ScoreOrder; -import com.xzx.gc.entity.ScoreOrderDetails; +import com.xzx.gc.entity.*; +import com.xzx.gc.shop.dto.AddGoodsOrderDto; import com.xzx.gc.shop.dto.DeliverGoodsDto; import com.xzx.gc.shop.dto.InsureOrderDto; import com.xzx.gc.shop.dto.QueryOrderListDto; -import com.xzx.gc.shop.mapper.ScoreExpressInfoMapper; -import com.xzx.gc.shop.mapper.ScoreOrderDetailsMapper; -import com.xzx.gc.shop.mapper.ScoreOrderMapper; +import com.xzx.gc.shop.mapper.*; import com.xzx.gc.shop.vo.ExpressInfoVo; import com.xzx.gc.shop.vo.QueryOrderListVo; import com.xzx.gc.shop.vo.ViewOrderVo; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import tk.mybatis.mapper.entity.Example; @@ -44,6 +41,21 @@ @Resource ScoreOrderDetailsMapper scoreOrderDetailsMapper; + + @Resource + private AddressInfoMapper addressInfoMapper; + + @Autowired + private AccountInfoMapper accountInfoMapper; + + @Autowired + private ScoreGoodsStyleMapper scoreGoodsStyleMapper; + + @Autowired + private ScoreGoodsSkuMapper scoreGoodsSkuMapper; + + @Autowired + private ScoreGoodsMapper scoreGoodsMapper; public Map<String, Object> queryOrderList(QueryOrderListDto model) { String name = model.getName(); @@ -131,4 +143,14 @@ scoreOrderMapper.updateByPrimaryKeySelective(scoreOrder); return scoreOrder.getId(); } + + public void addOrder(AddGoodsOrderDto addGoodsOrderDto) { + ScoreGoodsStyle style = scoreGoodsStyleMapper.selectByPrimaryKey(addGoodsOrderDto.getStyleId()); + ScoreGoodsSku sku = scoreGoodsSkuMapper.selectByPrimaryKey(addGoodsOrderDto.getSkuId()); + ScoreGoods goods = scoreGoodsMapper.selectByPrimaryKey(style.getGoodsId()); + + + AddressInfo addressInfo = addressInfoMapper.selectByPrimaryKey(addGoodsOrderDto.getAddressId()); + AccountInfo accountInfo = accountInfoMapper.selectAccountInfoByUserId(addGoodsOrderDto.getUserId()); + } } diff --git a/gc-shop/src/main/resources/mapper/shop/AccountInfo.xml b/gc-shop/src/main/resources/mapper/shop/AccountInfo.xml new file mode 100644 index 0000000..39a94aa --- /dev/null +++ b/gc-shop/src/main/resources/mapper/shop/AccountInfo.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.xzx.gc.shop.mapper.AccountInfoMapper"> + + + <select id="selectAccountInfoByUserId" resultType="com.xzx.gc.entity.AccountInfo"> + select * from xzx_account_info where user_id=#{userId} + </select> +</mapper> \ No newline at end of file diff --git a/gc-shop/src/main/resources/mapper/shop/AddressInfoMapper.xml b/gc-shop/src/main/resources/mapper/shop/AddressInfoMapper.xml new file mode 100644 index 0000000..29686bb --- /dev/null +++ b/gc-shop/src/main/resources/mapper/shop/AddressInfoMapper.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.xzx.gc.shop.mapper.AccountInfoMapper"> + +</mapper> \ No newline at end of file diff --git a/gc-shop/src/main/resources/mapper/shop/UserInfoMapper.xml b/gc-shop/src/main/resources/mapper/shop/UserInfoMapper.xml new file mode 100644 index 0000000..f946868 --- /dev/null +++ b/gc-shop/src/main/resources/mapper/shop/UserInfoMapper.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.xzx.gc.shop.mapper.UserInfoMapper"> + +</mapper> \ No newline at end of file -- Gitblit v1.9.1