新增手机端有意向下单时间,和web段有意向列表查询,商品接口修改

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

@@ -1,7 +1,9 @@
 package com.hwrj.cloud.admin.controller;
 
+import com.hwrj.cloud.admin.dao.OmsPreItemDao;
 import com.hwrj.cloud.admin.model.OmsPreItem;
 import com.hwrj.cloud.admin.service.OmsPreItemService;
+import com.hwrj.cloud.common.api.CommonPage;
 import com.hwrj.cloud.common.api.CommonResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -9,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 @RestController
@@ -26,6 +29,17 @@ public class OmsPreItemController {
         return CommonResult.success(omsPreItems);
     }
 
+    @GetMapping(value = "/web/list")
+    @ApiOperation("后台后去意向详情")
+    @ResponseBody
+    public CommonResult weblist(@RequestParam(defaultValue = "1") int pageNO, @RequestParam(defaultValue = "10") int pageSize){
+
+        List<OmsPreItem> omsPreItemListOwn = omsPreItemService.weblist(pageSize, pageNO);
+
+        return CommonResult.success(CommonPage.restPage(omsPreItemListOwn));
+    }
+
+
     @ApiOperation(value = "删除商品意向")
     @DeleteMapping
     public CommonResult delete(@RequestParam(value = "id",required = true)Long id){

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

@@ -27,8 +27,8 @@ public class PmsProductBigDataController {
 
     @ApiOperation("产品列表查询")
     @GetMapping(value = "/product/list")
-    public CommonResult<CommonPage<BigDataListVo>> bigDataList(BigDataListParam bigDataListParam) throws IOException {
-        List<BigDataListVo> list = productService.bigDataList(bigDataListParam);
+    public CommonResult<CommonPage<BigDataListInfoVo>> bigDataList(BigDataListParam bigDataListParam) throws IOException {
+        List<BigDataListInfoVo> list = productService.bigDataList(bigDataListParam);
         return CommonResult.success(CommonPage.restPage(list));
     }
 

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

@@ -9,6 +9,7 @@ import com.hwrj.cloud.admin.common.PmsProductOutput;
 import com.hwrj.cloud.admin.dao.PmsProductExcelDao;
 import com.hwrj.cloud.admin.dto.param.*;
 import com.hwrj.cloud.admin.listener.PmsProductExcelListener;
+import com.hwrj.cloud.admin.util.CurrUserUtil;
 import com.hwrj.cloud.common.api.CommonPage;
 import com.hwrj.cloud.common.api.CommonResult;
 import com.hwrj.cloud.admin.dto.PmsProductQueryParam;
@@ -19,6 +20,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.StringUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -64,6 +66,7 @@ public class PmsProductController {
     @RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
     @ResponseBody
     public CommonResult update(@PathVariable Long id, @RequestBody com.hwrj.cloud.admin.dto.PmsProductParam productParam, BindingResult bindingResult) {
+
         int count = productService.update(id, productParam);
         if (count > 0) {
             return CommonResult.success(count);
@@ -75,8 +78,8 @@ public class PmsProductController {
     @ApiOperation("根据供应商选择生产地")
     @GetMapping(value = "/plOfPro/select")
     @ResponseBody
-    public CommonResult plOfProSelect(@RequestParam("compId")  Long compId) {
-        List<SelectVo> plOfProSelect = productService.plOfProSelect(compId);
+    public CommonResult plOfProSelect() {
+        List<SelectVo> plOfProSelect = productService.plOfProSelect(CurrUserUtil.getCompId());
         return CommonResult.success(plOfProSelect);
     }
 

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

@@ -1,6 +1,7 @@
 package com.hwrj.cloud.admin.controller;
 
 import cn.hutool.core.collection.CollUtil;
+import com.hwrj.cloud.admin.model.UmsResource;
 import com.hwrj.cloud.common.api.CommonPage;
 import com.hwrj.cloud.common.api.CommonResult;
 import com.hwrj.cloud.admin.dto.UmsAdminLoginParam;
@@ -105,6 +106,11 @@ public class UmsAdminController {
         data.put("username", umsAdmin.getUsername());
         data.put("menus", roleService.getMenuList(umsAdmin.getId()));
         data.put("icon", umsAdmin.getIcon());
+        List<UmsResource> resourceList = adminService.getResourceList(umsAdmin.getId());
+        if (CollUtil.isNotEmpty(resourceList)) {
+            List<String> roles = resourceList.stream().map(UmsResource::getUrl).collect(Collectors.toList());
+            data.put("resource", roles);
+        }
         List<UmsRole> roleList = adminService.getRoleList(umsAdmin.getId());
         if (CollUtil.isNotEmpty(roleList)) {
             List<String> roles = roleList.stream().map(UmsRole::getName).collect(Collectors.toList());

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

@@ -17,4 +17,5 @@ public interface OmsPreItemDao {
     public int deletePreItemDao(@Param("id")Long id);
 
 
+    List<OmsPreItem> weblist(@Param("compId")long compId);
 }

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

@@ -9,7 +9,7 @@ import java.util.List;
 public interface PmsProductExcelDao {
     void saveData(@Param("list") List<PmsProductParam> list);
 
-    List<BigDataListVo> bigDataList(BigDataListParam bigDataListParam);
+    List<BigDataListInfoVo> bigDataList(BigDataListParam bigDataListParam);
 
     BigDataListInfoVo bigDatainfo(@Param("id")Long id);
 

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

@@ -19,6 +19,10 @@ public class BigDataListInfoVo {
     private String brandName;
     /**价格**/
     private BigDecimal price;
+    /**
+     * 供应商id
+     */
+    private String firmId;
     /**
      * 供应商
      **/

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

@@ -1,6 +1,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.model.OmsPreItem;
 
 import java.util.List;
@@ -17,4 +18,6 @@ public interface OmsPreItemService {
      * 删除意向信息
      */
     public void delete(Long id);
+
+    List<OmsPreItem> weblist(int pageSize, int pageNO);
 }

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

@@ -83,7 +83,7 @@ public interface PmsProductService {
      */
     PmsProductOutput getProductByProductId(Long productId);
 
-    List<BigDataListVo> bigDataList(BigDataListParam bigDataListParam);
+    List<BigDataListInfoVo> bigDataList(BigDataListParam bigDataListParam);
 
     BigDataListInfoVo bigDatainfo(Long id);
 

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

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.hwrj.cloud.admin.dao.OmsPreItemDao;
 import com.hwrj.cloud.admin.model.OmsPreItem;
 import com.hwrj.cloud.admin.service.OmsPreItemService;
+import com.hwrj.cloud.admin.util.CurrUserUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,4 +31,12 @@ 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);
+        return list;
+    }
+
 }

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

@@ -19,6 +19,7 @@ import com.hwrj.cloud.admin.dto.PmsProductResult;
 import com.hwrj.cloud.admin.mapper.*;
 import com.hwrj.cloud.admin.model.*;
 import com.hwrj.cloud.admin.service.PmsProductService;
+import com.hwrj.cloud.admin.util.CurrUserUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -82,6 +83,11 @@ public class PmsProductServiceImpl implements PmsProductService {
         //创建商品
         PmsProduct product = productParam;
         product.setId(null);
+        long compId = CurrUserUtil.getCompId();
+        if(StringUtils.isEmpty(compId)){
+            throw new RuntimeException("没有绑定供应商无法新增!");
+        }
+        productParam.setCompId(compId);
         productMapper.insertSelective(product);
         //根据促销类型设置价格：会员价格、阶梯价格、满减价格
         Long productId = product.getId();
@@ -150,14 +156,26 @@ public class PmsProductServiceImpl implements PmsProductService {
         updateInfo.setPrefrenceAreaProductRelationList(relationInputs);
         return updateInfo;
     }
-
+    public void check(PmsProductParam productParam){
+        long compId = CurrUserUtil.getCompId();
+        if(StringUtils.isEmpty(compId)){
+            throw new RuntimeException("没有绑定供应商无法修改!");
+        }
+        Long  productcompId = productParam.getCompId();
+        if(!productcompId.equals(compId)){
+            throw new RuntimeException("你不能修改别的供应商数据!");
+        }
+    }
     @Override
     @Transactional
     public int update(Long id, PmsProductParam productParam) {
+        //检验供应商
+        check(productParam);
         int count;
         //更新商品信息
         PmsProduct product = productParam;
         product.setId(id);
+        product.setCompId(CurrUserUtil.getCompId());
         productMapper.updateByPrimaryKeySelective(product);
         //会员价格
         PmsMemberPriceExample pmsMemberPriceExample = new PmsMemberPriceExample();
@@ -234,10 +252,15 @@ public class PmsProductServiceImpl implements PmsProductService {
 
     @Override
     public List<PmsProduct> list(PmsProductQueryParam productQueryParam, Integer pageSize, Integer pageNum) {
+
+        long compId = CurrUserUtil.getCompId();
         PageHelper.startPage(pageNum, pageSize);
         PmsProductExample productExample = new PmsProductExample();
         PmsProductExample.Criteria criteria = productExample.createCriteria();
         criteria.andDeleteStatusEqualTo(0);
+        if(!StringUtils.isEmpty(compId)){
+            criteria.andCompIdEqualTo(compId);
+        }
         if (productQueryParam.getPublishStatus() != null) {
             criteria.andPublishStatusEqualTo(productQueryParam.getPublishStatus());
         }
@@ -310,6 +333,7 @@ public class PmsProductServiceImpl implements PmsProductService {
 
     @Override
     public int updateDeleteStatus(List<Long> ids, Integer deleteStatus) {
+
         PmsProduct record = new PmsProduct();
         record.setDeleteStatus(deleteStatus);
         PmsProductExample example = new PmsProductExample();
@@ -372,7 +396,7 @@ public class PmsProductServiceImpl implements PmsProductService {
     private PmsProductExcelDao productExcelDao;
 
     @Override
-    public List<BigDataListVo> bigDataList(BigDataListParam bigDataListParam) {
+    public List<BigDataListInfoVo> bigDataList(BigDataListParam bigDataListParam) {
         PageHelper.startPage(bigDataListParam.getPageNum(), bigDataListParam.getPageSize());
         return productExcelDao.bigDataList(bigDataListParam);
     }

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

@@ -26,13 +26,42 @@
     </resultMap>
     <select id="searchOmsPreItemDao" resultMap="BaseResultMap">
         select * from oms_pre_item
-
-
-
-
     </select>
+
     <delete id="deletePreItemDao" parameterType="java.lang.Long"  >
         delete from ums_pre_item where id = #{id}
     </delete>
 
+    <select id="weblist" resultType="com.hwrj.cloud.admin.model.OmsPreItem">
+            SELECT
+                a.id AS id,
+                a.product_id AS productId,
+                a.member_id AS memberId,
+                a.comp_id AS compId,
+                a.push_id AS pushId,
+                a.origin_id AS originId,
+                a.origin_name AS originName,
+                a.comp_name AS compName,
+                a.price AS price,
+                a.product_pic AS productPic,
+                a.product_name AS productName,
+                a.product_sub_title AS productSubTitle,
+                a.product_sku_code AS productSkuCode,
+                a.member_nickname AS memberNickname,
+                a.create_date AS createDate,
+                a.modify_date AS modifyDate,
+                a.delete_status AS deleteStatus,
+                a.product_category_id AS productCategoryId,
+                a.product_brand AS productBrand,
+                a.product_sn AS productSn,
+                a.product_attr AS productAttr
+            FROM
+                oms_pre_item a
+            WHERE
+                1 = 1
+            <if test="compId !=null">
+                and a.comp_id = #{compId}
+            </if>
+    </select>
+
 </mapper>

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

@@ -118,14 +118,16 @@
          </trim>
         </foreach>
     </insert>
-    <select id="bigDataList" resultType="com.hwrj.cloud.admin.dto.param.BigDataListVo">
+    <select id="bigDataList" resultType="com.hwrj.cloud.admin.dto.param.BigDataListInfoVo">
         SELECT
         a.id,
         a.`name` AS 'name',
         a.pic AS pic,
         a.brand_name AS brandName,
         a.price AS price,
-        b.comp_name AS umsCompanyInfo
+        b.comp_name AS umsCompanyInfo,
+        a.spec as spec,
+        a.quality_guarantee_period as qualityGuaranteePeriod
         FROM
         pms_product a
         LEFT JOIN ums_company_info b ON a.comp_id = b.id
@@ -149,6 +151,7 @@
         <result column="spec" property="spec"/>
         <result column="qualityGuaranteePeriod" property="qualityGuaranteePeriod"/>
         <result column="placeOfProduction" property="placeOfProduction"/>
+        <result column="firmId" property="firmId"/>
         <result column="umsCompanyInfo" property="umsCompanyInfo"/>
         <result column="description" property="description"/>
         <collection property="buyUrls" javaType="java.util.List"
@@ -169,6 +172,7 @@
             a.spec AS spec,
             a.quality_guarantee_period AS qualityGuaranteePeriod,
             d.origin_name AS placeOfProduction,
+            a.ums_company_info_id AS firmId,
             c.comp_name AS umsCompanyInfo,
             a.description AS description,
             b.shop_type AS shopType,

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

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -71,6 +72,7 @@ public class OmsPreItemServiceImpl implements OmsPreItemService {
         }
 
         if (omsPreItem!= null){
+            omsPreItem.setCreateDate(new Date());
             int i = omsPreItemMapper.insertSelective(omsPreItem);
         }else {
             throw new RuntimeException("添加预购失败");