修复bug

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

@@ -67,8 +67,8 @@ public class OmePreItemController {
     public CommonResult getOwn(@RequestParam(defaultValue = "10") int pageSize,
                                @RequestParam(defaultValue = "1") int pageNO,HttpServletRequest request){
         Map<String,Object> map = memberService.getCurrentWxUser();
-        UmsMemberPlatform umsMemberPlatform = (UmsMemberPlatform) map.get("wxUsers");
-        List<OmsPreItemDao> omsPreItemListOwn = omsPreItemService.getOmsPreItemListOwn(umsMemberPlatform.getId(), pageSize, pageNO);
+        UmsMemberPlatform wxUsers = memberService.getWxUser();
+        List<OmsPreItemDao> omsPreItemListOwn = omsPreItemService.getOmsPreItemListOwn(wxUsers.getId(), pageSize, pageNO);
         return CommonResult.success(CommonPage.restPage(omsPreItemListOwn));
     }
 

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

@@ -51,7 +51,7 @@ public class PortalProductPublishController {
         return CommonResult.success();
     }
 
-    @ApiOperation("修改产品")
+    @ApiOperation("产品列表")
     @GetMapping("list")
     public CommonResult listProd(@RequestParam(value = "pageNo",required = false,defaultValue = "0")int pageNo,@RequestParam(value = "pageSize",required = false,defaultValue = "10")int pageSize){
 

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

@@ -64,6 +64,13 @@ public interface UmsMemberService {
      */
     public Map<String,Object> getCurrentWxUser();
 
+    /**
+     * 获取当前微信登录用户
+     * @return
+     */
+    public UmsMemberPlatform getWxUser();
+
+
     /**
      * 根据会员id修改会员积分
      */
@@ -94,4 +101,5 @@ public interface UmsMemberService {
     String refreshToken(String token);
 
     Long getMemberId();
+
 }

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

@@ -65,8 +65,8 @@ public class PortalProductPulishServiceImpl implements PortalProductPulishServic
 //        productParam.setCompId(compId);
 
         Map<String, Object> map = memberService.getCurrentWxUser();
-        UmsMemberPlatform umsMemberPlatform = (UmsMemberPlatform) map.get("wxUsers");
-        if (umsMemberPlatform == null) {
+        UmsMemberPlatform wxUsers = memberService.getWxUser();
+        if (wxUsers == null) {
             Asserts.fail("登录异常");
         }
 //        UmsCompanyShare umsCompanyShare = (UmsCompanyShare) map.get("company");
@@ -75,7 +75,7 @@ public class PortalProductPulishServiceImpl implements PortalProductPulishServic
 //        }
 //        productVo.setCompId(umsCompanyShare.getCompId());
 //        productVo.setCompName(umsCompanyShare.getCompName());
-        productVo.setCreateId(umsMemberPlatform.getId());
+        productVo.setCreateId(wxUsers.getId());
         productVo.setCreateType(1);
         productVo.setCreateTime(new Date());
         productVo.setDeleteStatus(0);
@@ -147,14 +147,13 @@ public class PortalProductPulishServiceImpl implements PortalProductPulishServic
 
     @Override
     public List<PmsProduct> list(Integer pageSize, Integer pageNo) {
-        Long memberId = memberService.getMemberId();
-        if (memberId == null) {
-            Asserts.fail("请先登录");
-        }
+        UmsMemberPlatform wxUsers = memberService.getWxUser();
         PmsProductExample example = new PmsProductExample();
         PmsProductExample.Criteria criteria = example.createCriteria();
-        criteria.andCreateIdEqualTo(memberId);
+        criteria.andCreateIdEqualTo(wxUsers.getId());
         criteria.andCreateTypeEqualTo(1);
+        criteria.andDeleteStatusEqualTo(0);
+        example.setOrderByClause("create_time desc");
         PageHelper.startPage(pageNo, pageSize);
         List<PmsProduct> pmsProducts = productMapper.selectByExample(example);
         return pmsProducts;

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

@@ -190,41 +190,66 @@ public class UmsMemberServiceImpl implements UmsMemberService {
 
     @Autowired
     private UmsCompanyShareMapper umsCompanyShareMapper;
+
     @Override
-    public Map<String,Object> getCurrentWxUser() {
+    public Map<String, Object> getCurrentWxUser() {
         SecurityContext ctx = SecurityContextHolder.getContext();
         Authentication auth = ctx.getAuthentication();
         MemberDetails memberDetails = (MemberDetails) auth.getPrincipal();
         UmsMember umsMember = memberDetails.getUmsMember();
-        Map<String,Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
 
-        if (umsMember!=null){
-            map.put("user",umsMember);
+        if (umsMember != null) {
+            map.put("user", umsMember);
             UmsMemberPlatformExample example = new UmsMemberPlatformExample();
             UmsMemberPlatformExample.Criteria criteria = example.createCriteria();
             criteria.andMemberIdEqualTo(umsMember.getId());
             List<UmsMemberPlatform> platforms = umsMemberPlatformMapper.selectByExample(example);
-            if (platforms==null||platforms.size()<1){
+            if (platforms == null || platforms.size() < 1) {
 
-                throw  new RuntimeException("登录失败");
+                throw new RuntimeException("登录失败");
             }
             UmsMemberPlatform umsMemberPlatform = platforms.get(0);
-            map.put("wxUsers",umsMemberPlatform);
-            Map<String, Object> ownData = umsMemberDao.getOwnData(umsMember.getId(),umsMemberPlatform.getId());
-            map.put("pre",ownData);
+            map.put("wxUsers", umsMemberPlatform);
+            Map<String, Object> ownData = umsMemberDao.getOwnData(umsMember.getId(), umsMemberPlatform.getId());
+            map.put("pre", ownData);
             getCompany(umsMember, map);
         }
         return map;
     }
 
+    @Override
+    public UmsMemberPlatform getWxUser() {
+        SecurityContext ctx = SecurityContextHolder.getContext();
+        Authentication auth = ctx.getAuthentication();
+        MemberDetails memberDetails = (MemberDetails) auth.getPrincipal();
+        UmsMember umsMember = memberDetails.getUmsMember();
+        Map<String, Object> map = new HashMap<>();
+        UmsMemberPlatform umsMemberPlatform = null;
+        if (umsMember != null) {
+            map.put("user", umsMember);
+            UmsMemberPlatformExample example = new UmsMemberPlatformExample();
+            UmsMemberPlatformExample.Criteria criteria = example.createCriteria();
+            criteria.andMemberIdEqualTo(umsMember.getId());
+            List<UmsMemberPlatform> platforms = umsMemberPlatformMapper.selectByExample(example);
+            if (platforms == null || platforms.size() < 1) {
+
+                throw new RuntimeException("登录失败");
+            }
+            umsMemberPlatform = platforms.get(0);
+
+        }
+        return umsMemberPlatform;
+    }
+
     private void getCompany(UmsMember umsMember, Map<String, Object> map) {
-        UmsCompanyShareExample example=new UmsCompanyShareExample();
+        UmsCompanyShareExample example = new UmsCompanyShareExample();
         UmsCompanyShareExample.Criteria criteria = example.createCriteria();
         criteria.andMemberIdEqualTo(umsMember.getId());
         criteria.andStatusEqualTo(0);
         List<UmsCompanyShare> umsCompanyShares = umsCompanyShareMapper.selectByExample(example);
-        if(umsCompanyShares.size()>0){
-            map.put("company",umsCompanyShares.get(0));
+        if (umsCompanyShares.size() > 0) {
+            map.put("company", umsCompanyShares.get(0));
         }
     }
 
@@ -247,7 +272,6 @@ public class UmsMemberServiceImpl implements UmsMemberService {
     }
 
 
-
     @Override
     public String login(String username, String password) {
         String token = null;
@@ -260,7 +284,7 @@ public class UmsMemberServiceImpl implements UmsMemberService {
             UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
             SecurityContextHolder.getContext().setAuthentication(authentication);
             token = jwtTokenUtil.generateToken(userDetails);
-            memberCacheService.setToken(token,username);
+            memberCacheService.setToken(token, username);
         } catch (AuthenticationException e) {
             LOGGER.warn("登录异常:{}", e.getMessage());
         }
@@ -269,21 +293,21 @@ public class UmsMemberServiceImpl implements UmsMemberService {
 
     @Override
     public String loginPhone(String phone, String code) {
-        if (StringUtils.isEmpty(code)){
+        if (StringUtils.isEmpty(code)) {
             throw new RuntimeException("验证码错误");
         }
         String token = null;
         //密码需要客户端加密后传递
         try {
-            UserDetails userDetails =new MemberDetails(getByPhone(phone)) ;
+            UserDetails userDetails = new MemberDetails(getByPhone(phone));
             String loginCode = memberCacheService.getLoginCode(phone);
-            if (!code.equals(loginCode)){
+            if (!code.equals(loginCode)) {
                 throw new BadCredentialsException("验证码不正确");
             }
             UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
             SecurityContextHolder.getContext().setAuthentication(authentication);
             token = jwtTokenUtil.generateToken(userDetails);
-            memberCacheService.setToken(token,userDetails.getUsername());
+            memberCacheService.setToken(token, userDetails.getUsername());
         } catch (AuthenticationException e) {
             LOGGER.warn("登录异常:{}", e.getMessage());
         }

sql/forest-mall-cloud/更新sql.sql

@@ -1,203 +0,0 @@
-#删除产品数据
-DELETE FROM pms_product WHERE create_time >='2020-10-9 00:00:00';
-
-#供应商
-DELETE FROM ums_company_info WHERE create_time >='2020-10-9 00:00:00';
-#供应商文件
-DELETE FROM ums_company_file WHERE create_time >='2020-10-9 00:00:00';
-#供应商商店
-DELETE FROM ums_company_shop WHERE create_time >='2020-10-9 00:00:00';
-
-#生产地
-DELETE FROM ums_member_origin WHERE create_time >='2020-10-9 00:00:00';
-#生产地产出物
-DELETE FROM ums_member_origin_product WHERE create_time >='2020-10-9 00:00:00';
-
-# 更新商品大类
-UPDATE pms_product a
-LEFT JOIN pms_product_category b ON a.product_big_category_name = b.`name`
-SET a.product_big_category_id = b.id
-WHERE
-	b.parent_id = 0
-AND a.create_time >= '2020-10-9 00:00:00';
-
-# 更新商品小类
-UPDATE pms_product a
-LEFT JOIN pms_product_category c ON a.product_category_name = c.`name`
-SET a.product_category_id = c.id
-WHERE
-	c.parent_id != 0
-AND a.create_time >= '2020-10-9 00:00:00';
-
-# 更新商品大类小类
-UPDATE pms_product a
-LEFT JOIN pms_product_category b ON a.product_big_category_name = b.`name`
-LEFT JOIN pms_product_category c ON a.product_category_name = c.`name`
-
-SET a.product_big_category_id = b.id,
- a.product_category_id = c.id
-WHERE
-	b.parent_id = 0
-AND c.parent_id != 0
-AND a.create_time >= '2020-10-9 00:00:00';
-
-# 品牌表新增字段
-
-ALTER TABLE pms_brand ADD COLUMN `create_id` BIGINT (20) DEFAULT NULL COMMENT '创建人' AFTER `brand_story`;
-
-ALTER TABLE pms_brand ADD COLUMN `create_time` datetime DEFAULT NULL COMMENT '创建时间' AFTER `create_id`;
-
-ALTER TABLE pms_brand ADD COLUMN `update_id` BIGINT (20) DEFAULT NULL COMMENT '更新人' AFTER `create_time`;
-
-ALTER TABLE pms_brand ADD COLUMN `update_time` datetime DEFAULT NULL COMMENT '更新时间' AFTER `update_id`;
-
-
-# 品牌表新增唯一索引
-ALTER TABLE `pms_brand` ADD UNIQUE (`name`)
-
-
-# 产品索引
-ALTER TABLE `oms_pre_item` ADD INDEX idx_product_id ( `product_id` );
-
-# 产品购买人id索引
-ALTER TABLE `oms_pre_item` ADD INDEX idx_member_id ( `member_id` );
-
-# 产品供应商id索引
-ALTER TABLE `oms_pre_item` ADD INDEX idx_comp_id ( `comp_id` );
-
-# 产品发布人id索引
-ALTER TABLE `oms_pre_item` ADD INDEX idx_push_id ( `push_id` );
-
-# 生产地id索引
-ALTER TABLE `oms_pre_item` ADD INDEX idx_origin_id ( `origin_id` );
-
-
-# 产品品牌id索引
-ALTER TABLE `pms_product` ADD INDEX idx_brand_id ( `brand_id` );
-
-# 产品产品大类标识索引
-ALTER TABLE `pms_product` ADD INDEX idx_product_big_category_id ( `product_big_category_id` );
-
-# 产品产品类别标识索引
-ALTER TABLE `pms_product` ADD INDEX idx_product_category_id ( `product_category_id` );
-
-# 产品生产地id索引
-ALTER TABLE `pms_product` ADD INDEX idx_place_of_production_id( `place_of_production_id` );
-
-# 删除重复供应商
-SELECT DISTINCT
-	aa.comp_id
-FROM
-	pms_product aa;
-
-DELETE
-FROM
-	ums_company_info
-WHERE
-	id NOT IN (
-
-	)
-## 清楚多余生产地
-#供应商
-DELETE FROM ums_company_info WHERE id = 298;
-
-#删除产品数据
-DELETE FROM pms_product WHERE comp_id = 298;
-
-#供应商文件
-DELETE FROM ums_company_file WHERE comp_id = 298;
-#供应商商店
-DELETE FROM ums_company_shop WHERE comp_id = 298;
-
-#生产地产出物
-DELETE FROM ums_member_origin_product WHERE fk_origin_id in (select a.id from ums_member_origin a where a.comp_id = 298);
-
-#生产地
-DELETE FROM ums_member_origin WHERE comp_id = 298;
-
-#意向表
-DELETE FROM oms_pre_item WHERE comp_id = 298;
-
-
-# 清楚多余文件
-SELECT DISTINCT
-	a.comp_id
-FROM
-	pms_product a
-WHERE
-	a.delete_status = 0;
-
-#供应商文件
-DELETE
-FROM
-	ums_company_file
-WHERE
-	comp_id NOT IN (
-		SELECT DISTINCT
-			a.comp_id
-		FROM
-			pms_product a
-		WHERE
-			a.delete_status = 0
-	);
-
-#供应商商店
-DELETE
-FROM
-	ums_company_shop
-WHERE
-	comp_id NOT IN (
-		SELECT DISTINCT
-			a.comp_id
-		FROM
-			pms_product a
-		WHERE
-			a.delete_status = 0
-	);
-
-#生产地产出物
-DELETE
-FROM
-	ums_member_origin_product
-WHERE
-	fk_origin_id IN (
-		SELECT
-			a.id
-		FROM
-			ums_member_origin a
-		WHERE
-			a.comp_id NOT IN (
-				SELECT DISTINCT
-					a.comp_id
-				FROM
-					pms_product a
-				WHERE
-					a.delete_status = 0
-			)
-	);
-
-#生产地
-DELETE
-FROM
-	ums_member_origin
-WHERE
-	comp_id NOT IN (
-		SELECT DISTINCT
-			a.comp_id
-		FROM
-			pms_product a
-		WHERE
-			a.delete_status = 0
-	);
-
-# 品牌表新增字段
-ALTER TABLE pms_brand ADD COLUMN `comp_id` BIGINT (20) DEFAULT NULL COMMENT '供应商id' AFTER `id`;
-
-ALTER TABLE pms_brand ADD COLUMN `comp_name` VARCHAR (100) DEFAULT NULL COMMENT '供应商名称' AFTER `comp_id`;
-# 更新语句
-UPDATE pms_brand a
-JOIN pms_product b
-SET a.comp_id = b.comp_id,
- a.comp_name = b.comp_name
-WHERE
-	a.id = b.brand_id