福禄小程序接口

zzjs-admin/src/main/java/com/miaxis/app/controller/fulu/AppletFuluCommodityInfoController.java

@@ -0,0 +1,43 @@
+package com.miaxis.app.controller.fulu;
+
+import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.fulu.domain.FuluCommodityInfo;
+import com.miaxis.fulu.service.IFuluCommodityInfoService;
+import com.miaxis.fulu.vo.FuluCommodityInfoVo;
+import io.swagger.annotations.*;
+import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 【福禄商品】Controller
+ * @author wwl
+ * @version 1.0
+ * @date 2021/6/25 11:50
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping(Constants.STUDENT_PREFIX+"/applet/fulu")
+@Api(tags={"【小程序-福禄商品】"})
+public class AppletFuluCommodityInfoController extends BaseController {
+
+    private final IFuluCommodityInfoService fuluCommodityInfoService;
+
+    /**
+     * 查询福禄商品列表
+     */
+    @GetMapping("/list")
+    @ApiOperation("查询福禄商品列表")
+    public Response list(){
+        return fuluCommodityInfoService.queryFuluCommodityInfoList();
+    }
+
+
+}

zzjs-service/src/main/java/com/miaxis/fulu/mapper/FuluCommodityInfoMapper.java

@@ -23,5 +23,16 @@ public interface FuluCommodityInfoMapper extends BaseMapper<FuluCommodityInfo> {
      */
     List<FuluCommodityInfoVo> selectFuluCommodityInfoList(FuluCommodityInfo fuluCommodityInfo);
 
+    /**
+     * 获取福禄商品详细信息
+     * @param id
+     * @return
+     */
     FuluCommodityInfoVo getFuLuById(@Param("id")Long id);
+
+    /**
+     * applet
+     * @return
+     */
+    List<FuluCommodityInfoVo> getFuluDataList();
 }

zzjs-service/src/main/java/com/miaxis/fulu/service/IFuluCommodityInfoService.java

@@ -38,4 +38,12 @@ public interface IFuluCommodityInfoService extends IService<FuluCommodityInfo> {
     Response removeFuLuByIds(Long[] ids);
 
 
+    /**
+     * applet
+     * 查询福禄商品列表
+     * @return
+     */
+    Response queryFuluCommodityInfoList();
+
+
 }

zzjs-service/src/main/java/com/miaxis/fulu/service/impl/FuluCommodityInfoServiceImpl.java

@@ -1,18 +1,27 @@
 package com.miaxis.fulu.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.entity.SysDictData;
 import com.miaxis.customer.domain.CustomerInfo;
 import com.miaxis.fulu.domain.FuluCommodityInfo;
 import com.miaxis.fulu.mapper.FuluCommodityInfoMapper;
 import com.miaxis.fulu.service.IFuluCommodityInfoService;
+import com.miaxis.fulu.vo.FuluCommodityInfoAppletVo;
 import com.miaxis.fulu.vo.FuluCommodityInfoVo;
+import com.miaxis.system.mapper.SysDictDataMapper;
+import com.miaxis.system.service.ISysDictDataService;
+import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author wwl
@@ -20,10 +29,12 @@ import java.util.List;
  * @date 2021/6/24 15:44
  */
 @Service
+@AllArgsConstructor
 public class FuluCommodityInfoServiceImpl extends ServiceImpl<FuluCommodityInfoMapper, FuluCommodityInfo> implements IFuluCommodityInfoService {
 
-    @Autowired
-    private FuluCommodityInfoMapper fuluCommodityInfoMapper;
+    private final FuluCommodityInfoMapper fuluCommodityInfoMapper;
+
+    private final SysDictDataMapper sysDictDataMapper;
 
     /**
      * 查询福禄商品列表
@@ -59,4 +70,24 @@ public class FuluCommodityInfoServiceImpl extends ServiceImpl<FuluCommodityInfoM
         }
         return Response.success();
     }
+
+    /**
+     * applet
+     * 查询福禄商品列表
+     * @return
+     */
+    @Override
+    public Response queryFuluCommodityInfoList() {
+        List<FuluCommodityInfoAppletVo> infoAppletVo = new ArrayList<>();
+        List<SysDictData> fuluGoodsTypeList = sysDictDataMapper.selectDictDataByType("fulu_goods_type");
+        List<FuluCommodityInfoVo> commodityInfos = fuluCommodityInfoMapper.getFuluDataList();
+
+        for (SysDictData sysDictData : fuluGoodsTypeList) {
+            FuluCommodityInfoAppletVo infoAppletVo1 = new FuluCommodityInfoAppletVo();
+            infoAppletVo1.setTypeName(sysDictData.getDictLabel());
+            infoAppletVo1.setList(commodityInfos.stream().filter(m -> m.getFuluGoodsType().toString().equals(sysDictData.getDictValue())).collect(Collectors.toList()));
+            infoAppletVo.add(infoAppletVo1);
+        }
+        return Response.success(infoAppletVo);
+    }
 }

zzjs-service/src/main/java/com/miaxis/fulu/vo/FuluCommodityInfoAppletVo.java

@@ -0,0 +1,30 @@
+package com.miaxis.fulu.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import com.miaxis.fulu.domain.FuluCommodityInfo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ *  福禄商品对象applet返回参
+ * @author wwl
+ * @version 1.0
+ * @date 2021/6/25 14:15
+ */
+@Data
+@ApiModel(value = "FuluCommodityInfoAppletVo", description = "福禄商品对象applet返回参")
+public class FuluCommodityInfoAppletVo{
+
+    @ApiModelProperty(value = "福禄商品分类名称")
+    private String typeName;
+
+    @ApiModelProperty(value = "数据集合")
+    private List<FuluCommodityInfoVo> list;
+
+}

zzjs-service/src/main/java/com/miaxis/fulu/vo/FuluCommodityInfoVo.java

@@ -16,7 +16,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel(value = "FuluCommodityInfoVo", description = "福禄商品对象返回参")
-public class FuluCommodityInfoVo extends BaseBusinessEntity {
+public class FuluCommodityInfoVo {
 
     @TableId(value = "id")
     private Long id;
@@ -44,6 +44,9 @@ public class FuluCommodityInfoVo extends BaseBusinessEntity {
     @ApiModelProperty(value = "福禄商品分类名称（对应字典表）")
     private String fuluGoodsType;
 
+    @ApiModelProperty(value = "福禄商品分类名称")
+    private String fuluGoodsTypeName;
+
     @TableField("status")
     @ApiModelProperty(value = "状态（0正常 1停用）")
     private String status;

zzjs-service/src/main/resources/mapper/fulu/FuluCommodityInfoMapper.xml

@@ -29,6 +29,7 @@
         ci.`remark`,
         f.file_url AS iconUrl,
         ci.product_ids,
+        ci.fulu_goods_type,
         dd.dict_label as fuluGoodsTypeName,
         ci.create_time,
         ci.update_time,
@@ -61,4 +62,19 @@
         where ci.id = #{id}
     </select>
 
+    <select id="getFuluDataList" resultType="com.miaxis.fulu.vo.FuluCommodityInfoVo">
+        select
+        ci.id,
+        ci.`name`,
+        ci.introduction,
+        ci.`remark`,
+        f.file_url AS iconUrl,
+        ci.product_ids,
+        ci.fulu_goods_type,
+        ci.`status`
+        from fulu_commodity_info ci
+        LEFT JOIN file_info f on f.file_id = ci.icon_id
+        where ci.status = '0'
+    </select>
+
 </mapper>