新增客户添加通过运营商获取所有该运营商的所有产品

modules/admin/src/main/java/com/fire/admin/mapper/FireProductMapper.java

@@ -9,6 +9,8 @@ import com.fire.dto.FireProductInfo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @author: liuliu
  * @ClassName: FireProductMapper
@@ -28,4 +30,14 @@ public interface FireProductMapper extends BaseMapper<FireProductInfo> {
     */
     IPage<FireProductInfoVo> selectFireProductInfo(Page page, @Param("query") FireProductInfoDto fireProductInfoDto);
 
+    
+    /**
+    * @Description:  TODO  获取所有的产品信息，用于客户添加产品
+    * @Param: [operator]
+    * @return: java.util.List<com.fire.admin.vo.FireProductInfoVo>
+    * @Author: liuliu
+    * @Date: 2021/5/28 17:43
+    */
+    List<FireProductInfoVo> selectProductAll(Integer operator);
+    
 }

modules/admin/src/main/java/com/fire/admin/rest/FireProductController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+
 /**
  * @author: liuliu
  * @ClassName: FireProductController
@@ -58,15 +59,15 @@ public class FireProductController {
 
     /**
      * @Description: TODO  获取产品详情
-     * @Param: 产品id]
+     * @Param: 产品id
      * @return: com.fire.dto.response.BaseRestResponse
      * @Author: liuliu
      * @Date: 2021/5/26 11:10
      */
     @ApiOperation(value = "获取产品详情")
-    @GetMapping("/{packageId}")
-    public BaseRestResponse getProductInfoDetail(@PathVariable String packageId) {
-        return new BaseRestResponse<>(fireProductService.getProductInfoDetail(packageId));
+    @GetMapping("/{productId}")
+    public BaseRestResponse getProductInfoDetail(@PathVariable("productId") Integer productId) {
+        return new BaseRestResponse<>(fireProductService.getProductInfoDetail(productId));
     }
 
 
@@ -84,4 +85,17 @@ public class FireProductController {
     }
 
 
+    /**
+     * @Description:  TODO 获取所有的产品,用于客户和通道添加
+     * @Param:
+     * @return:
+     * @Author: liuliu
+     * @Date: 2021/5/28 17:51
+     */
+    @ApiOperation(value = "获取所有产品，用于通道和客户产品的添加")
+    @GetMapping("/all/{operator}")
+    public BaseRestResponse makeProductAll( @PathVariable("operator") Integer operator ) {
+        return new BaseRestResponse<>(fireProductService.getProductAll(operator));
+    }
+
 }

modules/admin/src/main/java/com/fire/admin/service/FireProductService.java

@@ -7,6 +7,8 @@ import com.fire.admin.dto.FireProductInfoDto;
 import com.fire.admin.vo.FireProductInfoVo;
 import com.fire.dto.FireProductInfo;
 
+import java.util.List;
+
 /**
  * @author: liuliu
  * @ClassName: FireProductService
@@ -40,7 +42,7 @@ public interface FireProductService extends IService<FireProductInfo> {
     * @Author: liuliu
     * @Date: 2021/5/18 16:34
     */
-    FireProductInfoVo getProductInfoDetail(String packageId);
+    FireProductInfoVo getProductInfoDetail(Integer productId);
     
     
     /**
@@ -50,6 +52,16 @@ public interface FireProductService extends IService<FireProductInfo> {
     * @Author: liuliu
     * @Date: 2021/5/18 16:59
     */
-    int updateProductInfo(FireProductInfoDto fireProductInfoDto);
+    boolean updateProductInfo(FireProductInfoDto fireProductInfoDto);
+    
+    
     
+    /**
+    * @Description:  TODO 获取所有的产品,用于客户和通道添加
+    * @Param: 
+    * @return: 
+    * @Author: liuliu
+    * @Date: 2021/5/28 17:48
+    */
+    List<FireProductInfoVo> getProductAll(Integer operator);
 }

modules/admin/src/main/java/com/fire/admin/service/impl/FireProductServiceImpl.java

@@ -2,9 +2,7 @@ package com.fire.admin.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fire.admin.dto.FireProductInfoDto;
@@ -19,7 +17,6 @@ import com.fire.dto.enums.Status;
 import com.fire.utils.date.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -75,8 +72,7 @@ public class FireProductServiceImpl extends ServiceImpl<FireProductMapper, FireP
                     .createTime(DateUtils.strformatDatetime(LocalDateTime.now()))
                     .areaNum(EnumUtils.convert(fireProductInfoDto.getAreaName()))
                     .areaName(fireProductInfoDto.getAreaName())
-                    //.creator(SecurityUtil.getUser().getUsername())
-                    .creator("T")
+                    .creator(SecurityUtil.getUser().getUsername())
                     .operator(fireProductInfoDto.getOperator()).build();
 
             log.info("新增产品，产品适用于客户和通道。产品信息为：【{}】", productInfo.toString());
@@ -99,10 +95,11 @@ public class FireProductServiceImpl extends ServiceImpl<FireProductMapper, FireP
      * @Date: 2021/5/18 16:33
      */
     @Override
-    public FireProductInfoVo getProductInfoDetail(String packageId) {
-        FireProductInfo fireProductInfo = this.baseMapper.selectById(packageId);
+    public FireProductInfoVo getProductInfoDetail(Integer productId) {
 
+        FireProductInfo fireProductInfo = baseMapper.selectById(productId);
         FireProductInfoVo productInfoVo = FireProductInfoVo.builder()
+                .productId(productId)
                 .packageId(fireProductInfo.getPackageId())
                 .productName(fireProductInfo.getProductName())
                 .productType(fireProductInfo.getProductType())
@@ -126,10 +123,16 @@ public class FireProductServiceImpl extends ServiceImpl<FireProductMapper, FireP
      * @Date: 2021/5/18 17:02
      */
     @Override
-    public int updateProductInfo(FireProductInfoDto fireProductInfoDto) {
+    public boolean updateProductInfo(FireProductInfoDto fireProductInfoDto) {
 
+        String packageId = fireProductInfoDto.getPackageId();
+        if(!fireProductInfoDto.getAreaName().equals("全国")){
+            packageId=packageId.concat("_").concat(EnumUtils.convert(fireProductInfoDto.getAreaName()));
+        }
+        
         FireProductInfo productInfo = FireProductInfo.builder()
-                .packageId(fireProductInfoDto.getPackageId())
+                .productId(fireProductInfoDto.getProductId())
+                .packageId(packageId)
                 .productName(fireProductInfoDto.getProductName())
                 .productType(fireProductInfoDto.getProductType())
                 .productPrice(fireProductInfoDto.getProductPrice())
@@ -141,11 +144,24 @@ public class FireProductServiceImpl extends ServiceImpl<FireProductMapper, FireP
                 .operator(fireProductInfoDto.getOperator()).build();
 
         log.info("产品修改的对象为：【{}】", productInfo.toString());
-        int count = baseMapper.updateById(productInfo);
-        if (count > 0) {
+       boolean flag=this.saveOrUpdate(productInfo);
+        if (flag ) {
             //  TODO 发送消息到topic
         }
-        return count;
+        return flag;
+    }
+
+
+    /**
+     * @Description:  TODO 获取所有的产品,用于客户和通道添加
+     * @Param:
+     * @return:
+     * @Author: liuliu
+     * @Date: 2021/5/28 17:49
+     */
+    @Override
+    public List<FireProductInfoVo> getProductAll(Integer operator) {
+        return baseMapper.selectProductAll(operator);
     }
 
 

modules/admin/src/main/java/com/fire/admin/vo/FireProductInfoVo.java

@@ -2,8 +2,10 @@ package com.fire.admin.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -17,6 +19,8 @@ import java.math.BigInteger;
 @Data
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class FireProductInfoVo   {
 
 

modules/admin/src/main/resources/mapper/FireProductMapper.xml

@@ -73,4 +73,21 @@
     </select>
 
 
+
+    <select id="selectProductAll" resultMap="ResultMap">
+        SELECT
+        package_id,
+        product_name,
+        product_price
+        FROM
+        flow_product_info
+        <where>
+            <if test="operator != null and operator != '' or operator ==0">
+                and operator =#{query.operator}
+            </if>
+        </where>
+      and   is_delete=0
+    </select>
+
+
 </mapper>