修复数据错误!

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/OmsPreItemController.java

@@ -1,6 +1,7 @@
 package com.hwrj.cloud.admin.controller;
 
 import com.hwrj.cloud.admin.dao.OmsPreItemDao;
+import com.hwrj.cloud.admin.dto.param.PreItemWebPageParm;
 import com.hwrj.cloud.admin.model.OmsPreItem;
 import com.hwrj.cloud.admin.service.OmsPreItemService;
 import com.hwrj.cloud.common.api.CommonPage;
@@ -32,9 +33,9 @@ public class OmsPreItemController {
     @GetMapping(value = "/web/list")
     @ApiOperation("后台后去意向详情")
     @ResponseBody
-    public CommonResult weblist(@RequestParam(defaultValue = "1") int pageNO, @RequestParam(defaultValue = "10") int pageSize){
+    public CommonResult weblist(PreItemWebPageParm preItemWebPageParm){
 
-        List<OmsPreItem> omsPreItemListOwn = omsPreItemService.weblist(pageSize, pageNO);
+        List<OmsPreItem> omsPreItemListOwn = omsPreItemService.weblist(preItemWebPageParm);
 
         return CommonResult.success(CommonPage.restPage(omsPreItemListOwn));
     }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/UmsCompanyController.java

@@ -2,6 +2,7 @@ package com.hwrj.cloud.admin.controller;
 
 
 import com.hwrj.cloud.admin.dto.UmsCompanyDto;
+import com.hwrj.cloud.admin.dto.param.CompanyWebPageParam;
 import com.hwrj.cloud.admin.dto.param.SelectVo;
 import com.hwrj.cloud.admin.excelEntity.UmsCompanyInfoExcel;
 import com.hwrj.cloud.admin.model.UmsAdmin;
@@ -74,10 +75,9 @@ public class UmsCompanyController {
     @ApiOperation(value = "获取供应商列表")
     @GetMapping("/dt/list")
     @ResponseBody
-    public CommonResult list(@RequestParam(value = "pageSize")int pageSize,
-                             @RequestParam(value = "pageNo")int pageNo){
+    public CommonResult list(CompanyWebPageParam companyWebPageParam){
 
-        Map<String,Object> obj= umsCompanyService.getCompanyInfoList(pageSize, pageNo);
+        Map<String,Object> obj= umsCompanyService.getCompanyInfoList(companyWebPageParam);
         return CommonResult.success(obj);
     }
 

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/UmsMemberOriginController.java

@@ -1,6 +1,7 @@
 package com.hwrj.cloud.admin.controller;
 
 import com.hwrj.cloud.admin.dto.UmsMemberOriginParam;
+import com.hwrj.cloud.admin.dto.param.MemberWebPageParam;
 import com.hwrj.cloud.admin.dto.param.SelectVo;
 import com.hwrj.cloud.admin.excelEntity.UmsMemberOriginExcel;
 import com.hwrj.cloud.admin.listener.ImportExcelEventListener;
@@ -91,8 +92,8 @@ public class UmsMemberOriginController {
             @ApiImplicitParam(name = "origin",value = "生产地信息",required = true,paramType = "UmsMemberOriginProductParam")
     })
     @PostMapping("/list")
-    public CommonResult list(@RequestBody UmsMemberOriginParam origin){
-        origin.setCompId(CurrUserUtil.getCompId());
+    public CommonResult list(@RequestBody MemberWebPageParam origin){
+        origin.setCompId(CurrUserUtil.getCompIdInfo());
         List<UmsMemberOriginParam> list = umsMemberOriginService.list(origin);
         return CommonResult.success(CommonPage.restPage(list));
     }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/OmsPreItemDao.java

@@ -1,6 +1,7 @@
 package com.hwrj.cloud.admin.dao;
 
 import com.hwrj.cloud.admin.annotation.DataPermission;
+import com.hwrj.cloud.admin.dto.param.PreItemWebPageParm;
 import com.hwrj.cloud.admin.model.OmsPreItem;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,5 +18,5 @@ public interface OmsPreItemDao {
     public int deletePreItemDao(@Param("id")Long id);
 
 
-    List<OmsPreItem> weblist(@Param("compId")long compId);
+    List<OmsPreItem> weblist(PreItemWebPageParm preItemWebPageParm);
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/PmsBrandDao.java

@@ -1,5 +1,6 @@
 package com.hwrj.cloud.admin.dao;
 
+import org.apache.ibatis.annotations.Param;
 import org.mapstruct.Mapper;
 
 import java.util.List;
@@ -8,5 +9,5 @@ import java.util.List;
 public interface PmsBrandDao {
     long insertCheck(String name);
 
-    long deleteCheck(List<Long> ids);
+    long deleteCheck(@Param("ids") List<Long> ids);
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/UmsMemberOriginDao.java

@@ -1,6 +1,7 @@
 package com.hwrj.cloud.admin.dao;
 
 import com.hwrj.cloud.admin.dto.UmsMemberOriginParam;
+import com.hwrj.cloud.admin.dto.param.MemberWebPageParam;
 import com.hwrj.cloud.admin.dto.param.SelectVo;
 import com.hwrj.cloud.admin.model.UmsMemberOrigin;
 import org.apache.ibatis.annotations.Param;
@@ -23,7 +24,10 @@ public interface UmsMemberOriginDao {
      */
     int isExist(UmsMemberOrigin umsMemberOrigin);
 
-    List<UmsMemberOriginParam> list(UmsMemberOriginParam origin);
+    List<UmsMemberOriginParam> pageList(MemberWebPageParam memberWebPageParam);
+
+    List<UmsMemberOriginParam> list(UmsMemberOriginParam umsMemberOriginParam);
+
 
     UmsMemberOriginParam findById(long id);
 

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/param/CompanyWebPageParam.java

@@ -0,0 +1,11 @@
+package com.hwrj.cloud.admin.dto.param;
+
+import lombok.Data;
+
+@Data
+public class CompanyWebPageParam {
+    private int pageNo = 1;
+    private int pageSize = 5;
+    private String keyword;
+
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/param/MemberWebPageParam.java

@@ -0,0 +1,27 @@
+package com.hwrj.cloud.admin.dto.param;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class MemberWebPageParam {
+    private int pageNo = 1;
+    private int pageSize = 5;
+    /**
+     * 键盘输入
+     */
+    private String keyword;
+    /**
+     * 供应商id
+     */
+    private Long compId;
+    /**
+     * 生产地名称
+     */
+    private String originName;
+    /**
+     * 建立日期
+     */
+    private String foundDate;
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/param/PreItemWebPageParm.java

@@ -0,0 +1,15 @@
+package com.hwrj.cloud.admin.dto.param;
+
+import lombok.Data;
+
+@Data
+public class PreItemWebPageParm {
+    private int pageNo = 1;
+    private int pageSize = 5;
+    /**
+     * 商品名称
+     */
+    private String productName;
+
+    private Long compId;
+}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/OmsPreItemService.java

@@ -2,6 +2,7 @@ package com.hwrj.cloud.admin.service;
 
 import com.hwrj.cloud.admin.annotation.DataPermission;
 import com.hwrj.cloud.admin.dao.OmsPreItemDao;
+import com.hwrj.cloud.admin.dto.param.PreItemWebPageParm;
 import com.hwrj.cloud.admin.model.OmsPreItem;
 
 import java.util.List;
@@ -19,5 +20,5 @@ public interface OmsPreItemService {
      */
     public void delete(Long id);
 
-    List<OmsPreItem> weblist(int pageSize, int pageNO);
+    List<OmsPreItem> weblist(PreItemWebPageParm preItemWebPageParm);
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/UmsCompanyService.java

@@ -1,6 +1,7 @@
 package com.hwrj.cloud.admin.service;
 
 import com.hwrj.cloud.admin.dto.UmsCompanyDto;
+import com.hwrj.cloud.admin.dto.param.CompanyWebPageParam;
 import com.hwrj.cloud.admin.dto.param.SelectVo;
 import com.hwrj.cloud.admin.excelEntity.UmsCompanyInfoExcel;
 import com.hwrj.cloud.admin.model.UmsAdmin;
@@ -45,7 +46,7 @@ public interface UmsCompanyService {
      * excel导入供应商
      *
      */
-    public Map<String,Object> getCompanyInfoList(int pageSize, int pageNo);
+    public Map<String,Object> getCompanyInfoList(CompanyWebPageParam companyWebPageParam);
 
 
     /**

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/UmsMemberOriginService.java

@@ -1,6 +1,7 @@
 package com.hwrj.cloud.admin.service;
 
 import com.hwrj.cloud.admin.dto.UmsMemberOriginParam;
+import com.hwrj.cloud.admin.dto.param.MemberWebPageParam;
 import com.hwrj.cloud.admin.dto.param.SelectVo;
 import com.hwrj.cloud.admin.excelEntity.UmsMemberOriginExcel;
 
@@ -17,6 +18,9 @@ public interface UmsMemberOriginService {
 
     List<UmsMemberOriginParam> list(UmsMemberOriginParam origin);
 
+    List<UmsMemberOriginParam> list(MemberWebPageParam origin);
+
+
     int save(UmsMemberOriginParam origin);
 
     int update(UmsMemberOriginParam origin);

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

@@ -2,6 +2,7 @@ package com.hwrj.cloud.admin.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.hwrj.cloud.admin.dao.OmsPreItemDao;
+import com.hwrj.cloud.admin.dto.param.PreItemWebPageParm;
 import com.hwrj.cloud.admin.model.OmsPreItem;
 import com.hwrj.cloud.admin.service.OmsPreItemService;
 import com.hwrj.cloud.admin.util.CurrUserUtil;
@@ -33,10 +34,11 @@ public class OmsPreItemServiceImpl implements OmsPreItemService {
         omsPreItemDao.deletePreItemDao(id);
     }
     @Override
-    public List<OmsPreItem> weblist(int pageSize, int pageNo){
-        PageHelper.startPage(pageNo,pageSize);
-        long compId = CurrUserUtil.getCompId();
-        List<OmsPreItem> list = omsPreItemDao.weblist(compId);
+    public List<OmsPreItem> weblist(PreItemWebPageParm preItemWebPageParm){
+        PageHelper.startPage(preItemWebPageParm.getPageNo(),preItemWebPageParm.getPageSize());
+        Long compId = CurrUserUtil.getCompIdInfo();
+        preItemWebPageParm.setCompId(compId);
+        List<OmsPreItem> list = omsPreItemDao.weblist(preItemWebPageParm);
         return list;
     }
 

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsCompanyInfoServiceImpl.java

@@ -7,6 +7,7 @@ import com.github.pagehelper.PageInfo;
 import com.hwrj.cloud.admin.dao.UmsCompanyInfoDao;
 import com.hwrj.cloud.admin.dao.UmsCompanyShopDao;
 import com.hwrj.cloud.admin.dto.UmsCompanyDto;
+import com.hwrj.cloud.admin.dto.param.CompanyWebPageParam;
 import com.hwrj.cloud.admin.dto.param.SelectVo;
 import com.hwrj.cloud.admin.excelEntity.UmsCompanyInfoExcel;
 import com.hwrj.cloud.admin.mapper.UmsCompanyFileMapper;
@@ -177,12 +178,16 @@ public class UmsCompanyInfoServiceImpl implements UmsCompanyService {
     }
 
     @Override
-    public Map<String, Object> getCompanyInfoList(int pageSize, int pageNo) {
+    public Map<String, Object> getCompanyInfoList(CompanyWebPageParam companyWebPageParam) {
         Map<String, Object> hasp = new HashMap<>();
-        PageHelper.startPage(pageNo, pageSize);
+        PageHelper.startPage(companyWebPageParam.getPageNo(), companyWebPageParam.getPageSize());
         UmsCompanyInfoExample example = new UmsCompanyInfoExample();
         UmsCompanyInfoExample.Criteria criteria = example.createCriteria();
         criteria.andCompStatusEqualTo(0);
+        String keyword = companyWebPageParam.getKeyword();
+        if(!org.springframework.util.StringUtils.isEmpty(keyword)){
+            criteria.andCompNameLike("%"+keyword+"%");
+        }
         example.setOrderByClause("create_time desc");
         List<UmsCompanyInfo> companyInfos = umsCompanyInfoMapper.selectByExample(example);
         CommonPage<UmsCompanyInfo> umsCompanyInfoCommonPage = CommonPage.restPage(companyInfos);

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsMemberOriginServiceImpl.java

@@ -3,6 +3,7 @@ package com.hwrj.cloud.admin.service.impl;
 import com.hwrj.cloud.admin.dao.UmsMemberOriginDao;
 import com.hwrj.cloud.admin.dao.UmsMemberOriginProductDao;
 import com.hwrj.cloud.admin.dto.UmsMemberOriginParam;
+import com.hwrj.cloud.admin.dto.param.MemberWebPageParam;
 import com.hwrj.cloud.admin.dto.param.SelectVo;
 import com.hwrj.cloud.admin.excelEntity.UmsMemberOriginExcel;
 import com.hwrj.cloud.admin.mapper.UmsCompanyInfoMapper;
@@ -132,6 +133,12 @@ public class UmsMemberOriginServiceImpl implements UmsMemberOriginService {
             }
     }
 
+    @Override
+    public List<UmsMemberOriginParam> list(MemberWebPageParam memberWebPageParam) {
+        List<UmsMemberOriginParam> list = umsMemberOriginDao.pageList(memberWebPageParam);
+        return list;
+    }
+
     @Override
     public List<UmsMemberOriginParam> list(UmsMemberOriginParam origin) {
         List<UmsMemberOriginParam> list = umsMemberOriginDao.list(origin);

forest-admin/admin-server/src/main/resources/dao/OmsPreItemDao.xml

@@ -32,7 +32,7 @@
         delete from ums_pre_item where id = #{id}
     </delete>
 
-    <select id="weblist" resultType="com.hwrj.cloud.admin.model.OmsPreItem">
+    <select id="weblist" resultType="com.hwrj.cloud.admin.model.OmsPreItem" parameterType="com.hwrj.cloud.admin.dto.param.PreItemWebPageParm">
             SELECT
                 a.id AS id,
                 a.product_id AS productId,
@@ -62,6 +62,10 @@
             <if test="compId !=null">
                 and a.comp_id = #{compId}
             </if>
+            <if test="productName !=null and productName!=''">
+                and a.product_name LIKE concat("%",#{productName},"%")
+            </if>
+                ORDER BY a.create_date DESC
     </select>
 
 

forest-admin/admin-server/src/main/resources/dao/PmsBrandDao.xml

@@ -14,7 +14,7 @@
         AND a.`name` =  #{name}
     </select>
 
-    <delete id="deleteCheck">
+    <select id="deleteCheck" resultType="java.lang.Long">
         SELECT
         COUNT(0)
         FROM
@@ -25,5 +25,5 @@
         <foreach collection="ids" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
-    </delete>
+    </select>
 </mapper>

forest-admin/admin-server/src/main/resources/dao/UmsMemberOriginDao.xml

@@ -64,6 +64,22 @@
         AND origin_name = #{originName}
     </select>
 
+    <select id="pageList" parameterType="com.hwrj.cloud.admin.dto.param.MemberWebPageParam" resultMap="ResultOriginProduct">
+        select <include refid="Base_Column_List" />,<include refid="Blob_Column_List" />
+        from ums_member_origin
+        WHERE state = 0
+        <if test="compId != null">
+            AND comp_id = #{compId,jdbcType=BIGINT}
+        </if>
+        <if test="keyword != null and keyword != ''">
+            AND origin_name like concat('%',#{keyword},'%')
+        </if>
+        <if test="foundDate != null and foundDate != ''">
+            AND found_date = #{foundDate,jdbcType=VARCHAR}
+        </if>
+        ORDER BY create_time desc
+    </select>
+
     <select id="list" parameterType="com.hwrj.cloud.admin.dto.UmsMemberOriginParam" resultMap="ResultOriginProduct">
         select <include refid="Base_Column_List" />,<include refid="Blob_Column_List" />
         from ums_member_origin

sql/菜单列表备份.sql

@@ -0,0 +1,63 @@
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : 172.16.90.253_3306
+Source Server Version : 50730
+Source Host           : 172.16.90.253:3306
+Source Database       : forest-cloud-mall
+
+Target Server Type    : MYSQL
+Target Server Version : 50730
+File Encoding         : 65001
+
+Date: 2020-10-13 10:50:14
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for ums_menu
+-- ----------------------------
+DROP TABLE IF EXISTS `ums_menu`;
+CREATE TABLE `ums_menu` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `parent_id` bigint(20) DEFAULT NULL COMMENT '父级ID',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `title` varchar(100) DEFAULT NULL COMMENT '菜单名称',
+  `level` int(4) DEFAULT NULL COMMENT '菜单级数',
+  `sort` int(4) DEFAULT NULL COMMENT '菜单排序',
+  `name` varchar(100) DEFAULT NULL COMMENT '前端名称',
+  `icon` varchar(200) DEFAULT NULL COMMENT '前端图标',
+  `hidden` int(1) DEFAULT NULL COMMENT '前端隐藏 0 不隐藏 1 隐藏',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='后台菜单表';
+
+-- ----------------------------
+-- Records of ums_menu
+-- ----------------------------
+INSERT INTO `ums_menu` VALUES ('1', '0', '2020-02-02 14:50:36', '商品', '0', '0', 'pms', 'product', '0');
+INSERT INTO `ums_menu` VALUES ('2', '1', '2020-02-02 14:51:50', '商品列表', '1', '0', 'product', 'product-list', '0');
+INSERT INTO `ums_menu` VALUES ('3', '1', '2020-02-02 14:52:44', '添加商品', '1', '0', 'addProduct', 'product-add', '0');
+INSERT INTO `ums_menu` VALUES ('4', '1', '2020-02-02 14:53:51', '商品分类', '1', '0', 'productCate', 'product-cate', '0');
+INSERT INTO `ums_menu` VALUES ('5', '1', '2020-02-02 14:54:51', '商品类型', '1', '0', 'productAttr', 'product-attr', '0');
+INSERT INTO `ums_menu` VALUES ('6', '1', '2020-02-02 14:56:29', '品牌管理', '1', '0', 'brand', 'product-brand', '0');
+INSERT INTO `ums_menu` VALUES ('7', '0', '2020-02-02 16:54:07', '订单', '0', '0', 'oms', 'order', '0');
+INSERT INTO `ums_menu` VALUES ('8', '7', '2020-02-02 16:55:18', '订单列表', '1', '0', 'order', 'product-list', '0');
+INSERT INTO `ums_menu` VALUES ('9', '7', '2020-02-02 16:56:46', '订单设置', '1', '0', 'orderSetting', 'order-setting', '0');
+INSERT INTO `ums_menu` VALUES ('10', '7', '2020-02-02 16:57:39', '退货申请处理', '1', '0', 'returnApply', 'order-return', '0');
+INSERT INTO `ums_menu` VALUES ('11', '7', '2020-02-02 16:59:40', '退货原因设置', '1', '0', 'returnReason', 'order-return-reason', '0');
+INSERT INTO `ums_menu` VALUES ('12', '0', '2020-02-04 16:18:00', '营销', '0', '0', 'sms', 'sms', '0');
+INSERT INTO `ums_menu` VALUES ('13', '12', '2020-02-04 16:19:22', '秒杀活动列表', '1', '0', 'flash', 'sms-flash', '1');
+INSERT INTO `ums_menu` VALUES ('14', '12', '2020-02-04 16:20:16', '优惠券列表', '1', '0', 'coupon', 'sms-coupon', '1');
+INSERT INTO `ums_menu` VALUES ('16', '12', '2020-02-07 16:22:38', '品牌推荐', '1', '0', 'homeBrand', 'product-brand', '1');
+INSERT INTO `ums_menu` VALUES ('17', '12', '2020-02-07 16:23:14', '新品推荐', '1', '0', 'homeNew', 'sms-new', '1');
+INSERT INTO `ums_menu` VALUES ('18', '12', '2020-02-07 16:26:38', '人气推荐', '1', '0', 'homeHot', 'sms-hot', '1');
+INSERT INTO `ums_menu` VALUES ('19', '12', '2020-02-07 16:28:16', '专题推荐', '1', '0', 'homeSubject', 'sms-subject', '0');
+INSERT INTO `ums_menu` VALUES ('20', '12', '2020-02-07 16:28:42', '广告列表', '1', '0', 'homeAdvertise', 'sms-ad', '0');
+INSERT INTO `ums_menu` VALUES ('21', '0', '2020-02-07 16:29:13', '权限', '0', '0', 'ums', 'ums', '0');
+INSERT INTO `ums_menu` VALUES ('22', '21', '2020-02-07 16:29:51', '用户列表', '1', '0', 'admin', 'ums-admin', '0');
+INSERT INTO `ums_menu` VALUES ('23', '21', '2020-02-07 16:30:13', '角色列表', '1', '0', 'role', 'ums-role', '0');
+INSERT INTO `ums_menu` VALUES ('24', '21', '2020-02-07 16:30:53', '菜单列表', '1', '0', 'menu', 'ums-menu', '0');
+INSERT INTO `ums_menu` VALUES ('25', '21', '2020-02-07 16:31:13', '资源列表', '1', '0', 'resource', 'ums-resource', '0');
+INSERT INTO `ums_menu` VALUES ('26', '21', '2020-09-25 16:00:02', '供应商管理', '1', '0', 'company', 'sms-new', '0');
+INSERT INTO `ums_menu` VALUES ('30', '21', '2020-09-29 14:03:20', '生产地管理', '1', '0', 'origin', 'tree', '0');