网关和全局配置

forest-common/forest-common.iml

@@ -29,10 +29,6 @@
     <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:1.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.13.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.14.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.6" level="project" />
     <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:1.3.2" level="project" />
@@ -71,6 +67,10 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.3" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" />
     <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.5.7" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.1.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.2.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.14.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-core:4.0.3" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.11" level="project" />

forest-gateway/src/main/java/com/hwrj/cloud/gateway/MallGatewayApplication.java

@@ -3,15 +3,12 @@ package com.hwrj.cloud.gateway;
 import com.hwrj.cloud.gateway.config.IgnoreUrlsConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 
-/**
- * @author mtcarpenter
- * @github https://github.com/mtcarpenter/spring-cloud-learning
- * @desc 微信公众号：山间木匠
- */
 
-@SpringBootApplication
+
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 @EnableConfigurationProperties(IgnoreUrlsConfig.class)
 public class MallGatewayApplication {
     public static void main(String[] args) {

forest-gateway/src/main/java/com/hwrj/cloud/gateway/filter/AuthGlobalFilter.java

@@ -22,11 +22,6 @@ import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 
 
-/**
- * @author mtcarpenter
- * @github https://github.com/mtcarpenter/mall-cloud-alibaba
- * @desc 微信公众号：山间木匠
- */
 @Component
 @Slf4j
 public class AuthGlobalFilter implements GlobalFilter, Ordered {

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/controller/OmePreItemController.java

@@ -6,6 +6,7 @@ import com.hwrj.cloud.common.api.CommonResult;
 import com.hwrj.cloud.portal.model.OmsPreItem;
 import com.hwrj.cloud.portal.model.UmsMember;
 import com.hwrj.cloud.portal.service.OmsPreItemService;
+import com.hwrj.cloud.portal.service.UmsMemberService;
 import com.hwrj.cloud.portal.util.MemberUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,19 +21,21 @@ import java.util.List;
 @Api(tags = "OmePreItemController", description = "预购信息处理")
 @RequestMapping("/pre")
 public class OmePreItemController {
-    @Autowired
-    private HttpServletRequest request;
 
     @Autowired
     private MemberUtil memberUtil;
     @Autowired
     private OmsPreItemService omsPreItemService;
+
+    @Autowired
+    private UmsMemberService umsMemberService;
     @PutMapping(value = "/add")
     @ApiOperation("添加有意向商品")
     @ResponseBody
     public CommonResult add(@RequestBody OmsPreItem omsPreItem){
-        UmsMember umsMember = memberUtil.getRedisUmsMember(request);
-        omsPreItem.setMemberId(umsMember.getId());
+        UmsMember currentMember = umsMemberService.getCurrentMember();
+        omsPreItem.setMemberId(currentMember.getId());
+        omsPreItem.setMemberNickname(currentMember.getNickname());
         omsPreItemService.addOmsPreItem(omsPreItem);
         return CommonResult.success(null);
 
@@ -52,9 +55,9 @@ public class OmePreItemController {
     @ApiOperation("获取有意向详情")
     @ResponseBody
     public CommonResult getOwn(@RequestParam(defaultValue = "10") int pageSize,
-                               @RequestParam(defaultValue = "1") int pageNO){
-        UmsMember umsMember = memberUtil.getRedisUmsMember(request);
-        List<OmsPreItem> omsPreItemListOwn = omsPreItemService.getOmsPreItemListOwn(umsMember.getId(), pageSize, pageNO);
+                               @RequestParam(defaultValue = "1") int pageNO,HttpServletRequest request){
+        UmsMember currentMember = umsMemberService.getCurrentMember();
+        List<OmsPreItem> omsPreItemListOwn = omsPreItemService.getOmsPreItemListOwn(currentMember.getId(), pageSize, pageNO);
 
 
 
@@ -65,9 +68,10 @@ public class OmePreItemController {
     @ApiOperation("获取有意向详情")
     @ResponseBody
     public CommonResult getOtherToOwn(@RequestParam(defaultValue = "10") int pageSize,
-                               @RequestParam(defaultValue = "1") int pageNO){
-        UmsMember umsMember = memberUtil.getRedisUmsMember(request);
-        List<OmsPreItem> omsPreItemListOwn = omsPreItemService.getOmsPreItemListOther(umsMember.getId(), pageSize, pageNO);
+                               @RequestParam(defaultValue = "1") int pageNO,HttpServletRequest request){
+        UmsMember currentMember = umsMemberService.getCurrentMember();
+
+        List<OmsPreItem> omsPreItemListOwn = omsPreItemService.getOmsPreItemListOther(currentMember.getId(), pageSize, pageNO);
 
 
 

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/dao/UmsMemberDao.java

@@ -0,0 +1,9 @@
+package com.hwrj.cloud.portal.dao;
+
+import io.lettuce.core.dynamic.annotation.Param;
+
+import java.util.Map;
+
+public interface UmsMemberDao {
+    public Map<String,Object> getOwnData(@Param("memberId")Long memberId);
+}

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/service/impl/OmsPreItemServiceImpl.java

@@ -2,11 +2,13 @@ package com.hwrj.cloud.portal.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.hwrj.cloud.portal.domain.PmsPortalProductDetail;
+import com.hwrj.cloud.portal.domain.UmsCompanyInfoDto;
 import com.hwrj.cloud.portal.mapper.OmsPreItemMapper;
-import com.hwrj.cloud.portal.model.OmsPreItem;
-import com.hwrj.cloud.portal.model.OmsPreItemExample;
-import com.hwrj.cloud.portal.model.UmsMember;
+import com.hwrj.cloud.portal.model.*;
 import com.hwrj.cloud.portal.service.OmsPreItemService;
+import com.hwrj.cloud.portal.service.PmsPortalProductService;
+import com.hwrj.cloud.portal.service.UmsCompanyInfoService;
 import com.hwrj.cloud.portal.service.UmsMemberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -17,13 +19,40 @@ import java.util.List;
 @Service
 public class OmsPreItemServiceImpl implements OmsPreItemService {
 
-    @Autowired
-    private UmsMemberService memberService;
     @Autowired
     private OmsPreItemMapper omsPreItemMapper;
 
+    @Autowired
+    private UmsCompanyInfoService umsCompanyInfoService;
+
+    @Autowired
+    private PmsPortalProductService pmsPortalProductService;
+
     @Override
     public void addOmsPreItem(OmsPreItem omsPreItem) {
+        Long productId = omsPreItem.getProductId();
+        if (omsPreItem.getProductId() == null){
+            throw new RuntimeException("非法操作");
+        }
+
+        PmsPortalProductDetail detail = pmsPortalProductService.detail(productId);
+        PmsProduct product = detail.getProduct();
+        PmsBrand brand = detail.getBrand();
+        UmsCompanyInfoDto companyInfo = detail.getCompanyInfo();
+        List<PmsSkuStock> skuStockList = detail.getSkuStockList();
+        if (product == null){
+            throw  new RuntimeException("抢购商品已经下架");
+        }
+        omsPreItem.setProductName(product.getName());
+        omsPreItem.setPushId(product.getCreateUser());
+        if (companyInfo != null){
+            omsPreItem.setCompanyId(companyInfo.getId());
+            omsPreItem.setCompanyName(companyInfo.getCompName());
+        }
+        if (brand != null){
+            omsPreItem.setProductBrand(brand.getName());
+        }
+
         if (omsPreItem!= null){
             int i = omsPreItemMapper.insertSelective(omsPreItem);
         }else {

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/service/impl/UmsMemberServiceImpl.java

@@ -3,6 +3,7 @@ package com.hwrj.cloud.portal.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.hwrj.cloud.common.exception.Asserts;
+import com.hwrj.cloud.portal.dao.UmsMemberDao;
 import com.hwrj.cloud.portal.domain.UmsMemberPlaformDo;
 import com.hwrj.cloud.portal.mapper.UmsMemberLevelMapper;
 import com.hwrj.cloud.portal.mapper.UmsMemberMapper;
@@ -54,6 +55,9 @@ public class UmsMemberServiceImpl implements UmsMemberService {
     @Autowired
     private UmsMemberPlatformMapper umsMemberPlatformMapper;
 
+    @Autowired
+    private UmsMemberDao umsMemberDao;
+
     @Value("${redis.key.authCode}")
     private String REDIS_KEY_PREFIX_AUTH_CODE;
     @Value("${redis.expire.authCode}")
@@ -201,8 +205,11 @@ public class UmsMemberServiceImpl implements UmsMemberService {
                 throw  new RuntimeException("登录失败");
             }
             map.put("wxUsers",platforms.get(0));
+            Map<String, Object> ownData = umsMemberDao.getOwnData(umsMember.getId());
+            map.put("pre",ownData);
         }
 
+
         return map;
     }
 

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/util/MemberUtil.java

@@ -12,11 +12,6 @@ import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;
 
-/**
- * @author mtcarpenter
- * @github https://github.com/mtcarpenter/mall-cloud-alibaba
- * @desc 微信公众号：山间木匠
- */
 @Slf4j
 @Component
 public class MemberUtil {

forest-portal/portal-server/src/main/resources/dao/UmsOwnDataDao.xml

@@ -0,0 +1,15 @@
+<?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.hwrj.cloud.portal.dao.UmsMemberDao">
+    <select id="getOwnData" parameterType="java.lang.Long" resultType="java.util.Map">
+        SELECT
+            count( 0 ) AS want,
+            ( SELECT count(0) FROM oms_pre_item WHERE push_id = #{memberId} )  as own
+        FROM
+            `oms_pre_item`
+        WHERE
+            member_id = #{memberId}
+    </select>
+
+
+</mapper>